bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
23332 commits 4 branches 62 tags 178 MiB
Commit graph

23332 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Hypolite Petovan 3de1fc3097
Hotfix for App->registerStylesheet 
- Wrong condition for strpos()
- Follow-up to #6953
 2019-03-31 06:00:20 -04: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
Hypolite Petovan ef0545645a
Merge pull request #6942 from annando/worker-fast-commands 
Command based pre fetching of worker tasks
 2019-03-27 09:28:15 -04:00
Philipp 2d522f872d
Merge pull request #6940 from annando/fix-notif 
Notifications do work now again
 2019-03-26 23:26:10 +01:00
Philipp 1f3b9ab451
Merge pull request #6939 from annando/ap-delivery-failure 
Archive inboxes after 5 days of delivery failures
 2019-03-26 23:25:55 +01:00
Michael 83ff2b0382 We don't need to escape values anymore 2019-03-26 21:58:03 +00:00
Michael 2e0697c70e Notifications do work now again 2019-03-26 21:55:48 +00:00
Michael 87cdbfcee4 Updated database.sql 2019-03-26 21:38:15 +00:00
Michael 55325f191b Merge remote-tracking branch 'upstream/develop' into ap-delivery-failure 2019-03-26 21:36:46 +00:00
Hypolite Petovan 753b1e0f25
Merge pull request #6935 from nupplaphil/issue/missing_basepath 
Fixing basepath issue
 2019-03-26 08:23:50 -04:00
Michael Vogel 15e9d8dcdb
Merge pull request #6931 from MrPetovan/task/6903-collapse-connector-list 
Collapse connector list
 2019-03-26 08:27:40 +01:00
Philipp Holzer 040504dca9
fixing config value setting 2019-03-26 08:13:49 +01:00
Philipp Holzer 9ec29f1e8e
straight the config value check 2019-03-26 08:00:41 +01:00
Philipp 22f884484a
Merge pull request #6933 from MrPetovan/bug/smilies-wrong-escape 
Fix wrong code block escaping in Smilies
 2019-03-26 07:25:41 +01:00
Michael fe0c516c3f Added field for "shared" inbox 2019-03-26 05:14:47 +00:00
Michael Vogel 16af6610d9
Merge pull request #6937 from MrPetovan/bug/6927-set-manifest-backend 
Add manifest module to backend module list
 2019-03-26 06:01:37 +01:00
Hypolite Petovan 34208bf966 Add manifest module to backend module list 2019-03-25 22:08:01 -04:00
Hypolite Petovan 9210767518 Add cover code block encoding edge case in smilies replacement tests 2019-03-25 21:52:35 -04:00
Michael 18f3ff7b8e Unarchive inboxes on profile update 2019-03-25 22:43:00 +00:00