Commit graph

25429 commits

Author SHA1 Message Date
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
Michael
d34052b332 Make quoted announces look better / more announce improvements 2019-12-04 07:02:39 +00:00
Tobias Diekershoff
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
Hypolite Petovan
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
Philipp
b152d0557b
Merge pull request #7895 from annando/accordion-jot-nets
[Frio] Optical indicator for connector accordion added
2019-12-03 08:41:13 +01:00
Philipp
0641212187
Merge pull request #7896 from annando/ago-difference
Only show the difference between posting and receive date on difference
2019-12-03 08:40:21 +01:00
Michael
3d701dd459 Only show the difference between posting and receive date when there is a difference 2019-12-03 07:23:01 +00:00
Michael
8130a4d9b2 The padding is only meant for the jot settings 2019-12-03 06:07:36 +00:00
Michael
9d9e6cf27d Optical indicator for connector accordion added 2019-12-03 06:05:44 +00:00
Hypolite Petovan
75d31341c2
Merge pull request #7894 from annando/mutuals-followers
Group selection: Respect "pubmail" and ignore atchived or blocked contacts
2019-12-02 23:06:06 -05:00
Michael
fd706cf9a7 Group selection: Respect "pubmail" and ignore atchived or blocked contacts 2019-12-02 23:04:11 +00:00
Hypolite Petovan
9c9b4d1967
Merge pull request #7893 from annando/api-attachments
API: Improve attachment removal functionality for the status text
2019-12-02 16:29:48 -05:00
Michael
164e6b350d API: Improve attachment removal functionality for the status text 2019-12-02 21:19:47 +00:00
Philipp
6531819971
Merge pull request #7884 from MrPetovan/bug/7834-ignore-reload
Restore post reload after (un)ignore
2019-12-02 09:40:31 +01:00
Hypolite Petovan
632095a7ec
Merge pull request #7886 from nupplaphil/task/disable_drone
Disable drone except "develop" branch
2019-12-01 08:14:35 -05:00
Hypolite Petovan
01b81f7bba
Merge pull request #7885 from nupplaphil/bug/7881_allowed_themes
Themes are now saved just once
2019-12-01 08:12:20 -05:00
nupplaPhil
453b94f9b7
Disable drone for every branch except develop 2019-12-01 08:54:21 +01:00
nupplaPhil
309c36f289
Revert "enable trigger & disable travis codecov"
This reverts commit 98de833d
2019-12-01 08:54:20 +01:00
nupplaPhil
7ebd5e6b15
Themese are now saved just once 2019-12-01 08:43:50 +01:00
Hypolite Petovan
249bcee686
Merge pull request #7882 from hoergen/Plusminus
Made Connectors on new composer popup more visible
2019-11-30 23:18:26 -05:00
Hypolite Petovan
d01d69b9e7 Update doignore() in main.js to match new Item\Ignore return type
- Remove superfluous jQuery selectors
2019-11-30 23:16:34 -05:00
Hypolite Petovan
c3d88aca39 Update the return value of Item\Ignore to integer
- Array is unnecessary
2019-11-30 23:15:58 -05:00
Hypolite Petovan
d3c45f9186 Update type hint of System::jsonExit parameter to mixed
- Output isn't necessarily an array
2019-11-30 23:15:28 -05:00
Tobias Diekershoff
8e3428764b
Merge pull request #7883 from MrPetovan/bug/acl-fixes
Various ACL/jot fixes
2019-11-30 20:50:06 +01:00