Commit graph

23349 commits

Author SHA1 Message Date
Philipp 9e8134f949
Merge pull request #6973 from tobiasd/20190405-pleroma
beautification of pleroma stats
2019-04-05 07:20:34 +02:00
Tobias Diekershoff 1db0a29291 beautification of pleroma stats 2019-04-05 06:39:34 +02:00
Hypolite Petovan 26c2290fed
Merge pull request #6972 from annando/queue-to-worker
Use deferred workers instead of the queue mechanism
2019-04-04 17:29:16 -04:00
Michael e3caf0f4f5 Use deferred workers instead of the queue mechanism 2019-04-04 20:51:12 +00:00
Michael Vogel c439cb656a
Merge pull request #6957 from MrPetovan/bug/6943-add-tombstone
Send AP Tombstone activity on deleted profiles
2019-04-04 22:27:49 +02:00
Hypolite Petovan c713c2bf62
Merge pull request #6955 from tobiasd/20190331-vier
vier mobile enhancements
2019-04-04 14:22:34 -04:00
Hypolite Petovan 5b12bccb45 Move user tombstone activity data to ActivityPub\Transmitter 2019-04-04 07:38:40 -04:00
Hypolite Petovan a5828734f7
Merge pull request #6968 from annando/set-newest-resharer
Set the newest resharer as owner of a thread
2019-04-03 16:03:14 -04:00
Michael d73b6015d8 Set the newest resharer as owner of a thread 2019-04-03 18:51:50 +00:00
Hypolite Petovan d607d81183
Merge pull request #6966 from annando/ap-announce
AP: Incoming announces are now stored as activities
2019-04-02 19:35:56 -04:00
Michael e66e2adf5f AP: Incoming announces are now stored as activities 2019-04-02 21:10:49 +00:00
Hypolite Petovan 76ecf67066
Merge pull request #6964 from JeroenED/task/frio-sharestring-onchange
Changed keyup to oninput
2019-04-02 10:03:01 -04:00
Jeroen De Meerleer 008b66ac2c Changed keyup to oninput 2019-04-02 15:13:44 +02:00
Hypolite Petovan e4fa1a1102
Merge pull request #6963 from tobiasd/20190402-lng
CS, DE, PL translation updates
2019-04-02 07:15:07 -04:00
Tobias Diekershoff 9fba09a5a3 DE translation update 2019-04-02 10:14:04 +02:00
Tobias Diekershoff a69cb03f8c PL translation update THX waldis 2019-04-02 10:10:16 +02:00
Tobias Diekershoff bffffd45bf CS translation update THX Aditoo 2019-04-02 10:09:10 +02:00
Tobias Diekershoff 48afc0fbed
Merge pull request #6962 from annando/display-reshare
Display if an item is reshared
2019-04-02 09:23:53 +02:00
Michael a0fddca407 Display if an item is reshared 2019-04-02 05:38:42 +00:00
Hypolite Petovan b73caa83fc
Merge pull request #6960 from annando/add-announce-diaspora
Add "announce" activity for incoming Diaspora reshares
2019-04-01 21:24:00 -04:00
Michael 455616b52c Add "announce" activity for incoming Diaspora reshares 2019-04-01 22:07:23 +00:00
Hypolite Petovan d51b9226a6
Replace deprecated System::baseURL with App->getBaseUrl in Module\Profile 2019-04-01 05:05:52 -04:00
Hypolite Petovan da710999e0 Added unavailable local profile AP issue to CHANGELOG 2019-04-01 03:17:25 -04:00
Hypolite Petovan e911302fe9 Add tombstone object for AP response on deleted profile
- Responds with 404 status code with all other non-success cases
2019-04-01 03:15:41 -04:00
Tobias Diekershoff 9f49ce8857
Merge pull request #6956 from MrPetovan/task/sanitize-path-item
Sanitize theme/addon path items
2019-04-01 06:38:14 +02:00
Hypolite Petovan cc64471e4c Sanitize addon path items 2019-03-31 21:53:08 -04:00
Hypolite Petovan b529c03a20 Sanitize theme path items
- Sanitize theme style/color/scheme path items
2019-03-31 21:52:48 -04:00
Hypolite Petovan 6aac84dc8e Add Theme::getAllowedList method 2019-03-31 21:41:38 -04:00
Hypolite Petovan 6f94e51ba6 Add Strings::sanitizeFilePathItem method 2019-03-31 21:39:19 -04:00
Tobias Diekershoff 820e2a89f9 add search to user menu as well 2019-03-31 15:20:23 +02:00
Hypolite Petovan 3de1fc3097
Hotfix for App->registerStylesheet
- Wrong condition for strpos()
- Follow-up to #6953
2019-03-31 06:00:20 -04:00
Tobias Diekershoff 843b9f71c1 be consistent with messages and admin links as both are in the nav bar and the user menu 2019-03-31 11:24:17 +02:00
Tobias Diekershoff 174e71cc36 mobile view: show events and admin, but hide pm link 2019-03-31 11:18:41 +02:00
Tobias Diekershoff afd751ee74 add link to admin panel as well, but keep icon as it is really handy 2019-03-31 11:17:59 +02:00
Philipp e5cc35cb45
Merge pull request #6953 from tobiasd/20190330-csspath
check if BasePath is empty to prevent mangeled up CSS path
2019-03-31 10:12:40 +02:00
Tobias Diekershoff 16f44a8237 dont check but only copy if BasePath is present 2019-03-31 08:53:25 +02:00
Hypolite Petovan f196368146
Merge pull request #6954 from nupplaphil/task/upgrade_hardening
ConfigFile upgrade hardening
2019-03-30 18:30:08 -04:00
Philipp Holzer 363d6b72ae
wrong indent 2019-03-30 19:10:19 +01:00
Philipp Holzer 0a447cb61b
wrong indent 2019-03-30 19:08:47 +01:00
Philipp Holzer 24f5a8c3a1
add tests 2019-03-30 18:57:54 +01:00
Philipp Holzer e0b1f4f251
Hardening ConfigUpgrade 2019-03-30 18:54:22 +01:00
Tobias Diekershoff bb8216cbc8 check if BasePath is empty to prevent mangeled up CSS path 2019-03-30 11:13:27 +01:00
Michael Vogel 1c2a77c47f
Merge pull request #6949 from MrPetovan/bug/6947-frio-fix-fake-form
[frio] Switch comment box closing event listener from click to mousedown
2019-03-29 07:25:45 +01:00
Hypolite Petovan 3f640169f7 Switch comment box closing event listener from click to mousedown
- Fix event race condition in Chrome 73 (https://github.com/friendica/friendica/issues/6947)
2019-03-28 22:32:31 -04:00
Tobias Diekershoff 2f20ba4aa7
Merge pull request #6945 from annando/announce
Preparation to be able to store "announce" activities
2019-03-28 07:55:41 +01:00
Michael cbe574f6f6 Preparation to be able to store "announce" activities 2019-03-28 05:45:50 +00:00
Michael Vogel ed4a9f8b8a
Merge pull request #6925 from MrPetovan/task/6778-add-storage-move-to-cron
6778 Part 2: Add storage move cron job (redux)
2019-03-28 05:58:56 +01:00
Hypolite Petovan a3829e8fc7
Merge pull request #6944 from annando/item-follow
Store the follow activity in the "item-activity" table
2019-03-27 18:41:19 -04:00
Michael 2df2f623e1 Store the follow activity in the "item-activity" table 2019-03-27 21:46:32 +00:00
Hypolite Petovan 09e03c9213
Merge branch 'develop' into task/6778-add-storage-move-to-cron 2019-03-27 14:13:42 -04:00