Hypolite Petovan
903290a764
Revert "Word Wrap for long words in comments"
2018-10-09 15:09:51 -04:00
Hypolite Petovan
257beec485
Merge pull request #5861 from JonnyTischbein/issue_return_url
...
Replace goaway location SESSION var return_url with page as string value
2018-10-09 14:46:14 -04:00
Jonny Tischbein
29033bdf05
goaway to network if deleted item + remove goaway for filerm
2018-10-09 20:44:30 +02:00
Jonny Tischbein
d18421f760
Return to item if not owned by user or canceld
2018-10-09 20:40:25 +02:00
Jonny Tischbein
d8780b1640
Replace goaway location SESSION var return_url with page as string value
2018-10-09 20:10:34 +02:00
Hypolite Petovan
23be68e74d
Merge pull request #5860 from JonnyTischbein/issue_comment_wrap
...
[frio] Word Wrap for long words in comments
2018-10-09 11:17:11 -04:00
Jonny Tischbein
c0fc3c9845
frio set working css property + adding fix for vier
2018-10-09 17:12:28 +02:00
Jonny Tischbein
05d27e48aa
word-wrap for comments in frio style.css
2018-10-09 16:47:28 +02:00
Tobias Diekershoff
9305821b9d
Merge pull request #5856 from annando/ap-fixes
...
AP fixes: LD-signature, wrong owner for completed threads, account removal
2018-10-09 07:13:49 +02:00
Michael
d5bc14c28d
Merge remote-tracking branch 'upstream/develop' into ap-fixes
2018-10-09 05:06:20 +00:00
Michael
b5d73f840c
AP fixes: LD-signature, wrong owner for completed thres, account removal
2018-10-09 05:04:24 +00:00
Hypolite Petovan
4472cf2289
Merge pull request #5855 from annando/ap-avatar
...
AP: Avoid an empty avatar field
2018-10-08 00:06:41 -04:00
Michael
4047952703
AP: Avoid an empty avatar field
2018-10-08 03:28:49 +00:00
Hypolite Petovan
3bccaccede
Merge pull request #5848 from nupplaphil/friendica-5847
...
friendica-5847 Console Cache List command doesn't work
2018-10-07 17:47:51 -04:00
Hypolite Petovan
28b4fdb1c3
Merge pull request #5854 from annando/ap-parser
...
We now parse a compacted JSON
2018-10-07 17:42:03 -04:00
Michael
30ad6d60fd
Duplicated line removed
2018-10-07 20:51:39 +00:00
Michael
46f77f3486
Detect the object type
2018-10-07 20:36:15 +00:00
Philipp Holzer
7da6da6666
Bugfixings for getAllKeys()
2018-10-07 22:14:05 +02:00
Michael
93866b477a
Several fixes
2018-10-07 19:42:04 +00:00
Michael
bd6ba98e8d
Some more cleanup
2018-10-07 18:41:45 +00:00
Michael
1efca1b75d
owner is now actor
2018-10-07 17:35:43 +00:00
Michael
616c4a89bd
The new parsing is now active
2018-10-07 17:17:06 +00:00
Hypolite Petovan
ebe87bb16d
Merge pull request #5853 from JonnyTischbein/issue_login_redirect-fixed
...
Return to previous page after login
2018-10-07 11:59:17 -04:00
Michael
36c31e4091
Switching to parsing the JSON-LD
2018-10-07 15:34:51 +00:00
Jonny Tischbein
28456de249
Save return_url before login. Add login mask to many sites if not logged in.
2018-10-07 16:34:08 +02:00
Michael
3a74f3364d
Switch to parsing compacted JSON data
2018-10-07 13:37:05 +00:00
Hypolite Petovan
772d735f12
Merge pull request #5845 from annando/ap-suggest
...
Preparation for suggestions under AP
2018-10-07 08:58:21 -04:00
Philipp Holzer
8491f8660f
Bugfixing Memcached
2018-10-07 10:38:45 +02:00
Philipp Holzer
1ec5c6b284
friendica-5847 Console Cache List command doesn't work
...
- filterPrefix => filterArrayKeysByPrefix()
- Logging failed Executions of getAllKeys and get from Memcached
2018-10-07 10:35:37 +02:00
Hypolite Petovan
571e37f4d4
Merge pull request #5844 from nupplaphil/mode_followup
...
Changing Friendica\App\Mode from static methods to public methods
2018-10-06 22:38:54 -04:00
Philipp Holzer
3f0f3b6ae6
friendica-5847 Console Cache List command doesn't work
...
- Added $prefix to all CacheDriver
- Moved hostname magic to CacheDriver
- Added test for getAllKeys()
2018-10-07 00:27:54 +02:00
Michael
f8b74033a4
Avoid a notice
2018-10-06 18:44:42 +00:00
Michael
192c6c8d4f
Preparation for suggestions under AP
2018-10-06 18:42:26 +00:00
Philipp Holzer
a2fb49a2b4
Removing debugging echo
...
Updating Tests
2018-10-06 19:11:00 +02:00
Tobias Diekershoff
1551570b7f
Merge pull request #5843 from annando/guid-like
...
Transmit the Diaspora GUID with activities (Like, Dislike, ...)
2018-10-06 16:49:16 +02:00
Philipp Holzer
31148e25cf
Changing Friendica\App\Mode from static methods to public methods
...
- Changing from static methods to public methods
- Adding dev-composer-dependency Mockery for static method mocking (f.e. Config, DBA)
- Adding ModeTest with Mocking
- removing bootstrap from phpunit.xml because of double loading tests\bootstrap.php
2018-10-06 16:27:20 +02:00
Michael
389a651005
Transmit the Diaspora GUID with activities (Like, Dislike, ...)
2018-10-06 14:02:23 +00:00
Hypolite Petovan
2341ce353d
Merge pull request #5842 from annando/ap-distribution
...
Improved AP distribution / Only process trusted content
2018-10-06 09:35:44 -04:00
Michael
a413ce15aa
"name" must be plaintext
2018-10-06 13:28:17 +00:00
Michael
6b374c32a2
Improved AP distribution / Only process trusted content
2018-10-06 13:16:52 +00:00
Hypolite Petovan
58c6ef2bc0
Merge pull request #5841 from JonnyTischbein/issue_profile_edit_sexual_marital
...
Fix (short) profile editing showing 'e' for martial and sexual preferences
2018-10-06 07:13:04 -04:00
Tobias Diekershoff
8860c1055e
Merge pull request #5840 from annando/like-owner
...
Ensure that the owner of an activity is always the author
2018-10-06 11:48:52 +02:00
Michael
acf31ab64b
Additional check to ensure that the owner of an activity is always the author
2018-10-06 09:38:51 +00:00
Jonny Tischbein
17019772a4
Fix (short) profile editing showing 'e' for martial and sexual preference
2018-10-06 11:37:15 +02:00
Tobias Diekershoff
5014779052
Merge pull request #5839 from annando/like-owner
...
The owner of a "like" should be the author
2018-10-06 11:09:42 +02:00
Michael Vogel
c7bbe08a48
Merge pull request #5838 from tobiasd/20181006-lng
...
CS, DE and PL translation update
2018-10-06 11:04:52 +02:00
Michael
510032444f
The owner of a "like" should be the author
2018-10-06 08:51:52 +00:00
Tobias Diekershoff
632dd93145
DE translation update
2018-10-06 10:12:37 +02:00
Tobias Diekershoff
f361947044
CS translation update THX Aditoo
2018-10-06 10:03:04 +02:00
Tobias Diekershoff
4a7aad3ec8
PL translation update THX waldis
2018-10-06 10:02:14 +02:00
