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

25552 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hypolite Petovan
a4cc22e8fb
Merge pull request #7922 from annando/reshare-delivery 
Do reshares as native as possible
 2019-12-08 17:17:34 -05:00
Michael
b8f81d5e7d Relocate check for announce 2019-12-08 22:04:32 +00:00
Michael
1b0d2f2a4a Merge remote-tracking branch 'upstream/develop' into reshare-delivery 2019-12-08 21:56:51 +00:00
Philipp
3746dd6fa8
Merge pull request #7921 from annando/notica 
Fix a notice
 2019-12-08 22:50:19 +01:00
Michael
38db4d2132 Fix a notice 2019-12-08 21:41:26 +00:00
Michael
fb64010d7a Missing "use" 2019-12-08 21:40:06 +00:00
Michael
aa047278cc Reversed annouce check to have priority for AP 2019-12-08 09:01:06 +00:00
Michael
7ccbe3ee29 Transmit reshares and announce natively via Diaspora and AP whenever possible 2019-12-08 08:59:21 +00:00
Michael
ca0a961ad2 Merge remote-tracking branch 'upstream/develop' into reshare-delivery 2019-12-08 08:49:47 +00:00
Hypolite Petovan
da7c06764f
Merge pull request #7919 from annando/mail-update 
Mail contacts: Update public via user contact / display owner's posts
 2019-12-08 00:39:16 -05:00
Michael
6728c58535 Mail contacts: Update public via user contact / display owner's posts 2019-12-08 05:19:15 +00:00
Hypolite Petovan
2b12cd473d
Merge pull request #7915 from annando/issue-7914 
Fixes issue 7914: Reshares got crumbled
 2019-12-07 16:53:50 -05:00
Hypolite Petovan
916af997c6
Merge pull request #7917 from annando/no-mention-on-private 
Fix: Don't automatically mention a post creator on private posts
 2019-12-07 16:52:37 -05:00
Michael
484b99f7cf Fix: Don't automatically mention a post creator on private posts 2019-12-07 21:42:55 +00:00
Michael
23cdc9cec8 Fixes issue 7914: Reshares got crumbled 2019-12-07 21:05:14 +00:00
Michael Vogel
1de81716b3
Merge pull request #7913 from MrPetovan/bug/7902-acl-fixes 
Allow contacts and groups with same ID in ACL selector
 2019-12-07 13:17:43 +01:00
Hypolite Petovan
74cc9d00fa Allow contacts and groups with same ID in ACL selector 2019-12-07 05:50:15 -05:00
Hypolite Petovan
f8569ac3c4
Merge pull request #7911 from annando/acl 
ACL: Contact list is now sorted, forums reappeared
 2019-12-06 04:11:36 -05:00
Michael
b1fa0e8e26 ACL: Contact list is now sorted, forums reappeared 2019-12-06 07:25:21 +00:00
Michael
41f8796ffc Delivery of reshares 2019-12-06 06:39:50 +00:00
Tobias Diekershoff
03e2b04e8f
Merge pull request #7910 from annando/notice 
Fix a notice about an undefined "attach" index
 2019-12-06 07:27:16 +01:00
Michael
4b2acb74d5 Fix a notice about an undefined "attach" index 2019-12-06 04:34:20 +00:00
Michael Vogel
f5a28e8bbf
Merge pull request #7909 from MrPetovan/bug/7902-acl-fixes 
Restore correct test for hidewall in ACL::getFullSelectorHTML
 2019-12-06 05:16:08 +01:00
Hypolite Petovan
7cfe05f849 Restore correct test for hidewall in ACL::getFullSelectorHTML 2019-12-05 20:05:47 -05:00
Hypolite Petovan
6ffe3c449c
Merge pull request #7908 from nupplaphil/bug/run_xgettext_version 
Fix run_xgettext.sh FRIENDICA_VERSION
 2019-12-05 19:45:00 -05:00
nupplaPhil
3d92989c15
fix run_xgettext.sh FRIENDICA_VERSION 2019-12-05 23:25:03 +01:00
Hypolite Petovan
0d744be732
Merge pull request #7906 from nupplaphil/task/add_numeric 
[frio] Add numeric field_input
 2019-12-05 16:57:51 -05:00
nupplaPhil
7056639b62
Add numeric field_input to frio 2019-12-05 22:56:00 +01:00
Hypolite Petovan
8ff3ae485d
Merge pull request #7905 from nupplaphil/task/numeric_two_factor 
Make Two Factor Field numeric
 2019-12-05 16:19:23 -05:00
nupplaPhil
144d4d9cf5
add non-leecher link 2019-12-05 22:10:04 +01:00
nupplaPhil
c28f1fec51
General usage of type in input fields 2019-12-05 21:42:33 +01:00
nupplaPhil
47505aceec
double quoted field & use number 2019-12-05 21:13:49 +01:00
nupplaPhil
da3e293e91
Adding doc for new field-type 2019-12-05 20:48:00 +01:00
nupplaPhil
e6da666885
Make Two Factor Field numeric 2019-12-05 20:19:25 +01:00
Hypolite Petovan
0f476498f3
Merge pull request #7903 from annando/add-share-data 
Add data for shared posts from the original
 2019-12-05 08:43:47 -05:00
Michael
043df55bc5 Make tests happy 2019-12-05 06:46:00 +00:00
Michael
4e77321be8 Replaced all preg calls in the calls with the new function 2019-12-05 06:42:10 +00:00
Michael
eeb8bee1b7 Use the new function to fetch shared information 2019-12-05 06:16:27 +00:00
Michael
e435102089 Added logging, fixed indentation, call it from DFRN as well 2019-12-05 05:28:28 +00:00
Michael
abf841ff79 Handle resharing of items with title via the API 2019-12-05 05:24:29 +00:00
Michael
838a233bfc Handling reshares of Friendica posts with titles via Diaspora 2019-12-05 05:11:14 +00:00
Michael
b9619ee89a Put the title in the body 2019-12-04 23:49:07 +00:00
Michael
22c66e1811 Add data for shared posts from the original 2019-12-04 22:57:09 +00:00
Hypolite Petovan
4403aeeda5
Merge pull request #7901 from annando/disable-smart-threading 
Changed the option to enable the smart threading with the option to disable this
 2019-12-04 15:25:53 -05:00
Michael Vogel
9cf1aea8c9 Changed the option to enable the smart threading with the option to disable this 2019-12-04 21:21:20 +01:00
Tobias Diekershoff
9a4240c3b2
Merge pull request #7898 from annando/ap-announce 
Make quoted announces look better / more announce improvements
 2019-12-04 11:24:42 +01:00
Michael
8f4f3e00e2 Return more data in the announce object 2019-12-04 09:36:46 +00:00
Michael
276d6fddd1 Function renamed - we don't return an object 2019-12-04 09:15:03 +00:00
Michael
ef3664e6d4 Check if reshared item is an AP item 2019-12-04 08:08:48 +00:00
Michael
abed3ba906 Remove unused function 2019-12-04 07:13:29 +00:00