ca0a961ad2
Merge remote-tracking branch 'upstream/develop' into reshare-delivery
2019-12-08 08:49:47 +00:00
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
6728c58535
Mail contacts: Update public via user contact / display owner's posts
2019-12-08 05:19:15 +00:00
2b12cd473d
Merge pull request #7915 from annando/issue-7914
...
Fixes issue 7914: Reshares got crumbled
2019-12-07 16:53:50 -05:00
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
484b99f7cf
Fix: Don't automatically mention a post creator on private posts
2019-12-07 21:42:55 +00:00
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
74cc9d00fa
Allow contacts and groups with same ID in ACL selector
2019-12-07 05:50:15 -05:00
f8569ac3c4
Merge pull request #7911 from annando/acl
...
ACL: Contact list is now sorted, forums reappeared
2019-12-06 04:11:36 -05:00
b1fa0e8e26
ACL: Contact list is now sorted, forums reappeared
2019-12-06 07:25:21 +00:00
41f8796ffc
Delivery of reshares
2019-12-06 06:39:50 +00:00
03e2b04e8f
Merge pull request #7910 from annando/notice
...
Fix a notice about an undefined "attach" index
2019-12-06 07:27:16 +01:00
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
7cfe05f849
Restore correct test for hidewall in ACL::getFullSelectorHTML
2019-12-05 20:05:47 -05:00
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
c45b6d309b
regenerate messages.po
2019-12-05 23:29:18 +01:00
3d92989c15
fix run_xgettext.sh FRIENDICA_VERSION
2019-12-05 23:25:03 +01:00
afb93ab0fe
move Hook doc
2019-12-05 23:19:27 +01:00
96555a7385
Refactor "Authentication" class with four main methods:
...
- withSession() - for auto authentication with Session/Cookie variables
- withOpenId() - for authentication with an OpenID account
- withPassword() - for authentication with Password
- setForUser() - for setting the user auth context of the current session
Refactor "Session" class - contains now "native" Session Management methods
2019-12-05 23:02:51 +01:00
18a3d18ba6
Move Authentication methods to class "Authentication"
2019-12-05 23:02:50 +01:00
5bb63e59e0
Move App::internalRedirect to BaseUrl::redirect
2019-12-05 23:02:50 +01:00
0d744be732
Merge pull request #7906 from nupplaphil/task/add_numeric
...
[frio] Add numeric field_input
2019-12-05 16:57:51 -05:00
7056639b62
Add numeric field_input to frio
2019-12-05 22:56:00 +01:00
8ff3ae485d
Merge pull request #7905 from nupplaphil/task/numeric_two_factor
...
Make Two Factor Field numeric
2019-12-05 16:19:23 -05:00
144d4d9cf5
add non-leecher link
2019-12-05 22:10:04 +01:00
c28f1fec51
General usage of type in input fields
2019-12-05 21:42:33 +01:00
47505aceec
double quoted field & use number
2019-12-05 21:13:49 +01:00
da3e293e91
Adding doc for new field-type
2019-12-05 20:48:00 +01:00
e6da666885
Make Two Factor Field numeric
2019-12-05 20:19:25 +01:00
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
043df55bc5
Make tests happy
2019-12-05 06:46:00 +00:00
4e77321be8
Replaced all preg calls in the calls with the new function
2019-12-05 06:42:10 +00:00
eeb8bee1b7
Use the new function to fetch shared information
2019-12-05 06:16:27 +00:00
e435102089
Added logging, fixed indentation, call it from DFRN as well
2019-12-05 05:28:28 +00:00
abf841ff79
Handle resharing of items with title via the API
2019-12-05 05:24:29 +00:00
838a233bfc
Handling reshares of Friendica posts with titles via Diaspora
2019-12-05 05:11:14 +00:00
b9619ee89a
Put the title in the body
2019-12-04 23:49:07 +00:00
22c66e1811
Add data for shared posts from the original
2019-12-04 22:57:09 +00:00
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
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
8f4f3e00e2
Return more data in the announce object
2019-12-04 09:36:46 +00:00
276d6fddd1
Function renamed - we don't return an object
2019-12-04 09:15:03 +00:00
ef3664e6d4
Check if reshared item is an AP item
2019-12-04 08:08:48 +00:00
abed3ba906
Remove unused function
2019-12-04 07:13:29 +00:00
d34052b332
Make quoted announces look better / more announce improvements
2019-12-04 07:02:39 +00:00
d5c017c275
Merge pull request #7897 from MrPetovan/bug/warnings
...
Fix warnings about unexpected parameter array values type in ACL::getFullSelectorHTML
2019-12-04 07:15:58 +01:00
f989c331a3
Fix warnings about unexpected parameter array values type in ACL::getFullSelectorHTML
...
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-560503744
2019-12-03 06:59:51 -05:00
