Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 21:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
29968 commits 3 branches 64 tags 246 MiB
Commit graph

29968 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Vogel
56a77f5275
Merge pull request #9882 from MrPetovan/bug/po2php-plural-conversion 
Remove ternary operators from converted .po plural condition
 2021-01-31 11:43:25 +01:00
Michael Vogel
2d687b1052
Merge pull request #9892 from MrPetovan/task/9872-item-pin 
Move GET pinned/{id} to POST item/{id}/pin
 2021-01-31 11:35:40 +01:00
Hypolite Petovan
188f7b0eb0 Move GET pinned/{id} to POST item/{id}/pin 2021-01-30 18:42:23 -05:00
Hypolite Petovan
b3b2bc96ba Rename dopin() to doPIn 2021-01-30 18:12:01 -05:00
Hypolite Petovan
9885c1f128
Merge pull request #9890 from annando/post-content 
New table "post-content"
 2021-01-30 18:01:13 -05:00
Michael
30cc806c60 Added database.sql 2021-01-30 22:43:50 +00:00
Michael
41061a7ec1 Avoid "Duplicate entry" 2021-01-30 22:39:06 +00:00
Michael
c3398511b4 New table "post-content" 2021-01-30 22:03:53 +00:00
Hypolite Petovan
acaf2f768e
Merge pull request #9884 from annando/update-in-maintenance 
Setting "maintenance" for pre and post updates
 2021-01-30 11:22:37 -05:00
Hypolite Petovan
6111a8b0c1
Merge pull request #9883 from tobiasd/20210130-supportchannels 
Updating support channel information in the docs (DE/EN)
 2021-01-30 11:20:31 -05:00
Tobias Diekershoff
97d8d17952 less space 2021-01-30 15:47:12 +01:00
Michael
8eb3bddc2a Reduce the parameter chaos by splitting the update function 2021-01-30 13:31:59 +00:00
Tobias Diekershoff
da0b837ad8 removed old information from DE FAQ pointing to dead pages 2021-01-30 08:59:34 +01:00
Michael
90f1175cf5 Setting "maintenance" for pre and post updates 2021-01-30 07:50:20 +00:00
Tobias Diekershoff
b938da9d6b clenup 2021-01-30 08:03:57 +01:00
Tobias Diekershoff
04d55976f9 adopted the support channel locations for the starting page of the EN and DE help pages 2021-01-30 07:58:35 +01:00
Tobias Diekershoff
d362f8f282 DE FAQ: moved info about support channels to the FAQ top 
DE FAQ: adopted the links from the EN FAQ version
 2021-01-30 07:53:26 +01:00
Tobias Diekershoff
eb4a93fa8a unhinde location of the support channels so that they are visible when looking at the FAQ 2021-01-30 07:50:03 +01:00
Hypolite Petovan
dda99c2595
Merge pull request #9880 from annando/non-numeric 
Avoid non numeric parameter
 2021-01-29 20:08:38 -05:00
Hypolite Petovan
bcd3a274f1 Update plural condition in strings.php after converter update 2021-01-29 20:02:54 -05:00
Hypolite Petovan
3bb10b82a1 Remove ternary operators from converted .po plural condition 
- Thanks @sunchaserinfo for most of the work
 2021-01-29 20:01:14 -05:00
Michael
722083f9ed Avoid non numeric parameter 2021-01-29 23:41:42 +00:00
Hypolite Petovan
43f0f6bbdc
Merge pull request #9877 from annando/application-json 
Accept "application/json" as application type for ActivityPub
 2021-01-29 10:14:16 -05:00
Hypolite Petovan
315f39de2f
Merge pull request #9876 from annando/thr-parent 
Set thr-parent when importing mails
 2021-01-29 10:12:49 -05:00
Hypolite Petovan
0a3aaa5e83
Merge pull request #9874 from annando/psid 
Prevent permissionset foreign key constraint
 2021-01-29 10:11:38 -05:00
Michael
b22d7452a3 Accept "application/json" as application type for ActivityPub 2021-01-29 11:15:47 +00:00
Michael
ae684b4938 Set thr-parent when importing mails 2021-01-29 10:39:55 +00:00
Michael
56db5a29c4 Prevent permissionset foreign key constraint 2021-01-29 06:26:51 +00:00
Hypolite Petovan
9a4128a5c8
Merge pull request #9873 from annando/post-user 
New "post-user" structure, new update  functionality
 2021-01-28 19:32:17 -05:00
Michael
8deabf5c2e Providing more test data 2021-01-28 23:17:58 +00:00
Michael
57ed388f9a Updated database.sql 2021-01-28 22:52:05 +00:00
Michael
9a9674d5fb New "post-user" structure, new update functionality 2021-01-28 22:45:54 +00:00
Michael Vogel
199f72ee3c
Merge pull request #9823 from MrPetovan/task/9677-2fa-remember-device 
Add "Remember this device" feature to two factor authentication
 2021-01-27 22:32:08 +01:00
Hypolite Petovan
a7791bebc2
Merge pull request #9870 from annando/uri-id 
"uri-id" instead of "uri" or "id"
 2021-01-27 11:45:19 -05:00
Michael
ef0400fc19 "uri-id" instead of "uri" or "id" 2021-01-27 10:01:42 +00:00
Hypolite Petovan
c546b8b760
Merge pull request #9865 from Extarys/frio-pwa 
PWA: Improve manifest file
 2021-01-25 12:38:00 -05:00
Extarys
d5a066400d style: tab to space 2021-01-25 12:02:49 -05:00
Extarys
68a2c4c885 pwa: add fields 2021-01-25 11:46:27 -05:00
Hypolite Petovan
ed525220b9
Merge pull request #9864 from tobiasd/20210125-credits 
correction of contributor name
 2021-01-25 04:11:33 -05:00
Hypolite Petovan
a3555824ad
Merge pull request #9863 from Extarys/frio-pwa 
Follow W3C Web App Manifest (PWA)
 2021-01-25 03:27:30 -05:00
Tobias Diekershoff
bb519319e1 correction of contributor name 
Adopting the correct name of joenepraat, see https://todon.nl/@joenepraat/105482704513745199
 2021-01-25 09:07:09 +01:00
Extarys
5d1d7dfbe5 style: R::GET alignment, cause it's beautiful 2021-01-25 00:04:56 -05:00
Extarys
00e4c012f9 frio: change manifest to webmanifest 2021-01-24 23:48:22 -05:00
Extarys
b2d0d9200e add route for webmanifest 2021-01-24 23:47:59 -05:00
Extarys
aad6481824 formating head 2021-01-24 23:24:15 -05:00
Hypolite Petovan
577912bd39
Merge pull request #9862 from foss-/patch-1 
FAQ "Find Help" section cleanup
 2021-01-24 21:45:13 -05:00
foss-
0338e89611
omit space in find help listing 2021-01-25 02:33:21 +01:00
foss-
e52d5bcca0
XMPP URI and markdown are no friends (yet) 
https://github.com/github/markup/issues/202
https://github.com/gjtorikian/html-pipeline/pull/307
https://github.com/github/opensource.guide/pull/807
amazing that this is still not working in 2021
 2021-01-25 02:32:10 +01:00
foss-
0f9184c390
XMPP URI link 2021-01-25 01:56:22 +01:00
foss-
a51cea9025
XMPP link 
- [XMPP](xmpp://support@forum.friendi.ca?join)
 2021-01-25 01:50:28 +01:00