keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
22464 commits 4 branches 0 tags 179 MiB
Commit graph

2704 commits

Author SHA1 Message Date
Hypolite Petovan
d0228b9b97 Refactor Worker/Notifier part 2 
- Move self-removal in a sub-method in Worker/Notifier
 2019-01-21 09:27:06 -05:00
Hypolite Petovan
507c215c76 Refactor Worker/Notifier part 1 
- Rename variables
- Remove orphan, duplicate and one-use intermediary variables
- Initialize potentially missing variables
- Replace obsolete Addon::callHooks call
- Simplify Notifier::activityPubDelivery() signature
 2019-01-21 09:27:05 -05:00
Jeroen De Meerleer
ff180fb0f1 Updated towards code review 2019-01-21 09:12:38 -05:00
fabrixxm
b2211d31b9 Fix StorageManager::move() 2019-01-21 09:12:37 -05:00
Jeroen De Meerleer
a224308d42 4 spaces to tab 2019-01-21 09:12:37 -05:00
Jeroen De Meerleer
0906c3532c Added post-update script 
Please review first. I don't want to test changes that are not going pass the review.
 2019-01-21 09:12:37 -05:00
fabrixxm
8addcf9844 Fix storage backend class names 
This should be tested on all supported PHP versions
 2019-01-21 09:12:32 -05:00
Hypolite Petovan
578a391393 Add missing methods to Storage\SystemResource 
Part of #6263
 2019-01-21 09:12:31 -05:00
fabrixxm
bbbc15a5eb Method getPhoto of Photo model should return false on error 
Instead of red circle image, which breaks proxy module
 2019-01-21 09:12:31 -05:00
fabrixxm
4e38bc8a0d Use DBA::exists() in Photo::exists() 2019-01-21 09:12:31 -05:00
fabrixxm
2f935a1fbf Fix unregister storage backend 2019-01-21 09:12:30 -05:00
fabrixxm
f2b29f6591 Fix moving stored data 2019-01-21 09:12:30 -05:00
fabrixxm
55292c954b Remove resourceid parameter from Photo::exists() 2019-01-21 09:12:29 -05:00
fabrixxm
8c75c26361 Use Model\Photo as much as possible 
Most important is to use `Photo::delete()` to have backend
to remove data.
 2019-01-21 09:12:28 -05:00
fabrixxm
d549787bc1 Remove empty line before code 2019-01-21 09:11:41 -05:00
fabrixxm
15a3fc05d3 Photo model: set edited and updated on update, fix exists(), docs 2019-01-21 09:11:40 -05:00
fabrixxm
36f30533b7 Code standards 2019-01-21 09:11:40 -05:00
fabrixxm
5fdc9097a2 Rewrite Proxy module 2019-01-21 09:11:40 -05:00
fabrixxm
a46cbfca3d Fix Module\Photo exit with error 2019-01-21 09:11:39 -05:00
fabrixxm
fdc6608af8 Add storage options form in admin/site page 2019-01-21 09:11:39 -05:00
fabrixxm
f7b6fef197 Code standards 2019-01-21 09:11:35 -05:00
fabrixxm
682456c7d1 Add move function to storage manager and console command 2019-01-21 09:11:35 -05:00
fabrixxm
4d9d62bcdb Add 'storage' console command 
- list registered backend
- set backend
 2019-01-21 09:11:34 -05:00
fabrixxm
6a0ed7c298 Add storage backend manager class 2019-01-21 09:11:34 -05:00
fabrixxm
e5c2d4e2f8 Add Database storage backend 
This storage store files data in a separate database table
 2019-01-21 09:11:33 -05:00
fabrixxm
6e85a18678 Storage: throw StorageException on errors 2019-01-21 09:10:47 -05:00
fabrixxm
7df3f117ac Photo model: fix docs, don't update "created" field 
in store() if photo exists, don't update "created" timestamp
 2019-01-21 09:10:47 -05:00
fabrixxm
6f59c82978 Code standards 2019-01-21 09:10:46 -05:00
fabrixxm
69fcdaf9ab Photo model: set updated field in update() 2019-01-21 09:10:45 -05:00
fabrixxm
3e13799e70 Add update() to Photo model 
Edit mod/photos.php to use Photo model
 2019-01-21 09:10:45 -05:00
fabrixxm
b0acf4284d Code standards 2019-01-21 09:02:58 -05:00
fabrixxm
cbb5124d59 Code standards 2019-01-21 09:02:57 -05:00
fabrixxm
ea0cd6c919 Filesystem storage: add "index.html" files in dirs 2019-01-21 09:02:57 -05:00
fabrixxm
76579e02cc profile_photo: use Photo model function to get photo and image 2019-01-21 09:02:57 -05:00
fabrixxm
234c110d38 Model/Photo: use self select functions, reuse backend, fix quotes, add delete() 2019-01-21 09:01:52 -05:00
fabrixxm
75daf96590 Revert "Catch HTTPExceptions in App::runFrontend()" 
This reverts commit 58bd75f8f35f89fc275d5cd8e3ef40b9b18cb149.
 2019-01-21 08:59:59 -05:00
fabrixxm
07d358adc1 More code standard 2019-01-21 08:57:30 -05:00
fabrixxm
9317a1c054 Address code standards issues 2019-01-21 08:57:30 -05:00
fabrixxm
12dd7b552f Add Filesystem storage backend and store photo via backend 2019-01-21 08:57:29 -05:00
fabrixxm
0ada604c7d Return default profile photo if no profile photo is set 2019-01-21 08:57:29 -05:00
fabrixxm
9b2e3fa916 Add IStorage interface 
storage classes should implement this interface
 2019-01-21 08:57:29 -05:00
fabrixxm
3b3c4e8cc7 Pluggable storage backends: first steps 
- add backend related columns in photo table
- add system resource storage class
- add code to load image data from backend class
- return "nosign" image as photo meta with SystemResource backend
 2019-01-21 08:57:28 -05:00
fabrixxm
89eaf508f1 Catch HTTPExceptions in App::runFrontend() 
Set correct http response header, display error message using "404.tpl"
 2019-01-21 08:49:17 -05:00
fabrixxm
b96dbcd4cb Move Photo module, update Photo model 2019-01-21 08:40:47 -05:00
Unknown
5db9d2fe66 Some more alignation 2019-01-21 08:40:46 -05:00
Unknown
bc553a2c49 Translated string will never match what's saved in DB if not english 
Rare jongens die Amerikanen ;)
 2019-01-21 08:40:46 -05:00
Unknown
c44ca31aec Why got this even approved? 2019-01-21 08:40:46 -05:00
Unknown
24dbb69421 Added EMPTY key + updated to hypolite's suggestions 2019-01-21 08:40:45 -05:00
Jeroen De Meerleer
4d81158dd1 Translated gender etc. in profile view 2019-01-21 08:40:45 -05:00
Jeroen De Meerleer
1d8c64cfec Added original keys to maritial status 2019-01-21 08:40:44 -05:00
Jeroen De Meerleer
b70d762574 Added original keys to sexual preference 2019-01-21 08:40:43 -05:00
Jeroen De Meerleer
ab49a613c9 Added original keys to gender 2019-01-21 08:40:43 -05:00
Michael
70c183b495 AP Bugfix: We hadn't transmitted an tag url at all ... 2019-01-20 23:13:55 +00:00
Michael
e2427eb9da We only need to fetch the content once 2019-01-20 22:56:33 +00:00
Michael
9e7c59481f Improved ID detection 2019-01-20 22:19:53 +00:00
Michael
e5d694f7fa AP: Only reshare stuff that is AP content 2019-01-20 21:52:43 +00:00
Hypolite Petovan
89cb1b276d Move rawContent before theme initialization 2019-01-19 22:03:49 -05:00
Hypolite Petovan
af7b852d04 Insert theme init after module init but before post/content 2019-01-19 21:52:43 -05:00
Tobias Diekershoff
892a395eb7
Merge pull request #6471 from annando/ap-bcc 
Transmit via BCC if contact is hidden, don't store announces
 2019-01-19 18:23:44 +01:00
Michael
809e556009 Transmit via BCC if contact is hidden, don't store announces 2019-01-19 16:44:15 +00:00
Hypolite Petovan
6aebece494
Merge pull request #6470 from rabuzarus/20190118_-_some_more_magic_links 
use magic links for common/all friends and the directory
 2019-01-19 10:06:35 -05:00
rabuzarus
7b78ba3929 Bugfix - use magicLinks also for common/all friends and the directory 2019-01-19 15:12:46 +01:00
Michael
103b92fc48 Avoid that forum posts are received via the Diaspora protocol first 2019-01-19 12:30:16 +00:00
Michael
2a0e18c7dd Bugfix: Theme functions hadn't been executed anymore 2019-01-18 20:08:35 +00:00
rabuzarus
528d175baa Bugfix - provide magic links for remote user in magicLink() 2019-01-18 17:50:21 +01:00
Michael
c8bfa0c661 Bugfix: Private posts of contacts hadn't been displayed on the contact's page 2019-01-18 06:22:15 +00:00
Hypolite Petovan
9efe140b54
Merge pull request #6460 from annando/relaying 
Simplyfies AP relaying, fixes relaying of public contacts
 2019-01-17 19:09:33 -05:00
Michael
d813d72b1a Simplyfies AP relaying, fixes relaying of public contacts 2019-01-17 23:06:27 +00:00
Tobias Diekershoff
09a44b3039
Merge pull request #6456 from annando/long-url 
This fixes a problem when the URL is too long
 2019-01-17 07:44:15 +01:00
Michael
98d44ce7c7 The "]" had been at the wrong place 2019-01-17 05:32:06 +00:00
Michael
ce37e981cb This fixes a problem when the URL is too long 2019-01-16 22:34:57 +00:00
Michael
fe0339dabe Fixing a bug, adding some logging 2019-01-16 22:19:41 +00:00
Michael
c359c162a7 Issue 6282: Update the contact data regularly (including the network) 2019-01-16 21:39:56 +00:00
Michael
ae2a8b796c Avoid a notice in HTTP signature check, preparation for authentication 2019-01-15 06:31:12 +00:00
Michael
9bec202232 Adding the date to signed get requests as well 2019-01-14 16:33:23 +00:00
Michael
2f2184cf12 Date check added for HTTP signatures 2019-01-14 16:03:13 +00:00
Hypolite Petovan
90e25faf44
Merge pull request #6447 from annando/peertube 
Enable communication with Peertube
 2019-01-14 08:40:42 -05:00
Hypolite Petovan
990bbea19d
Merge pull request #6446 from annando/approve 
Now storing the "manually approve" data / fix update routine
 2019-01-14 08:38:08 -05:00
Michael
aa4aaf1971 Enable communication with Peertube 2019-01-14 12:10:11 +00:00
Michael
5554448162 Now storing the "manually approve" data / fix update routine 2019-01-14 06:36:08 +00:00
Hypolite Petovan
795268eb7a Fix undefined offset notices in Protocol\Email 2019-01-14 00:05:51 -05:00
Michael
c1dec50248 Avoiding some notices 2019-01-13 18:03:13 +00:00
Michael
8b5b66838d Issue 6438: Avoid fatal error 2019-01-13 16:00:27 +00:00
Hypolite Petovan
72516191ef
Merge pull request #6435 from annando/nextcloud 
Making Friendica compatible to Nextcloud Social
 2019-01-13 07:57:37 -05:00
Michael
236c7718d3 Fixing some notice again 2019-01-13 09:44:04 +00:00
Michael
d113ccd93c Making Friendica compatible to Nextcloud Social 2019-01-13 09:38:01 +00:00
Michael
297a549590 Issue 6282: Update the forum status of contacts 2019-01-12 16:09:27 +00:00
Hypolite Petovan
c4038e7af1
Merge pull request #6432 from annando/deleted-pending 
Don't show deleted contacts, changed "pending" behaviour
 2019-01-12 09:08:31 -05:00
Michael
28f14c7d60 Don't show deleted contacts, changed "pending" behaviour 2019-01-12 13:28:14 +00:00
Michael Vogel
2fbf1d54e2
Merge pull request #6428 from MrPetovan/bug/5148-get-cookies-from-safari-2 
Add variable query parameter to stylesheet URL for iOS Safari
 2019-01-12 09:33:35 +01:00
Michael Vogel
cd3ab5ddc9
Merge pull request #6426 from MrPetovan/bug/6425-fix-infinite-scroll-url 
Fix infinite scroll base URL
 2019-01-12 09:25:06 +01:00
Hypolite Petovan
a9b8eb4d56 Refactor Theme::getStylesheetPath to return faster if theme style.php doesn't exist 2019-01-12 02:26:16 -05:00
Hypolite Petovan
abf20368b0 Rework Profile::getThemeUid to ignore query parameter and include $a->profile_uid 
- Use new version in frio default.php file
- Use new version in Theme::getStylesheetPath
 2019-01-12 02:23:01 -05:00
Hypolite Petovan
6d1bc974a0 Add time parameter for iOS Safari to stylesheet URL 2019-01-11 20:49:16 -05:00
Hypolite Petovan
f6092ebebb Add App->mobileDetect property 2019-01-11 20:48:29 -05:00
Hypolite Petovan
ffcd9fb78d
Revert "Change stylesheet path name for mobile browsers" 2019-01-11 20:01:42 -05:00
Hypolite Petovan
c5632a061f Fix output of Pager->getBaseQueryString 2019-01-11 19:30:33 -05:00
Hypolite Petovan
eaea24f98b Remove Pager->ensureQueryParameter 2019-01-11 19:29:55 -05:00
Hypolite Petovan
ec8b313c2d Replace Pager->ensureQueryParameter by Strings::ensureQueryParameter 2019-01-11 19:29:39 -05:00
Hypolite Petovan
a20fa6a3a9 Add ensureQueryParameter method to Util\Strings 2019-01-11 19:27:56 -05:00
Michael
e3576fa0bd Don't accept private answers to public parents 2019-01-10 22:51:03 +00:00
Tobias Diekershoff
59f701d5a9
Merge pull request #6419 from annando/unfollow 
Unfollow should now work with Pleroma again
 2019-01-10 11:08:23 +01:00
Tobias Diekershoff
6bc865ff4d
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules 
Add password rules
 2019-01-10 10:37:32 +01:00
Michael
1a702359f1 Unfollow should now work with Pleroma again 2019-01-10 07:24:12 +00:00
Hypolite Petovan
cd48b7a68e
Merge pull request #6415 from annando/pending 
Don't show deleted contacts, set new AP contacts as "pending" until accepted
 2019-01-09 18:40:30 -05:00
Michael
defc89fa9a Fixing the Accepting of contact requests 2019-01-09 22:30:26 +00:00
Michael Vogel
4f5fb40202
Merge pull request #6414 from MrPetovan/bug/4609-add-support-hubzilla-forum-link 
Add support for Hubzilla forum mentions (starting with !)
 2019-01-09 20:25:28 +01:00
Michael
6ae6a8a983 Don't show deleted contacts, set new AP contacts as "pending" until they are accepted 2019-01-09 13:23:11 +00:00
Hypolite Petovan
b7b7b1b664 Add support for Hubzilla forum mentions (starting with !) 2019-01-08 20:56:01 -05:00
Hypolite Petovan
3b80f335fa
Merge pull request #6412 from annando/issue-6149 
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
 2019-01-08 09:17:05 -05:00
Michael
8c6df8f156 Issue 6149: Making OWA (hopefully) compatible with Hubzilla 2019-01-08 11:17:05 +00:00
Hypolite Petovan
e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
Hypolite Petovan
4bf2701912
Merge pull request #6400 from annando/issue-6394 
Issue 6394: The contact location has to be BBEncoded
 2019-01-06 16:37:43 -05:00
Michael
7e19506435 Issue 6394: The contact location has to be BBEncoded 2019-01-06 21:04:10 +00:00
Michael Vogel
b7bf335e94
Merge pull request #6380 from MrPetovan/bug/5148-get-cookies-from-safari 
Change stylesheet path name for mobile browsers
 2019-01-06 20:37:33 +01:00
Michael
9a4fc0f8bd Issue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems 2019-01-06 07:43:11 +00:00
Michael
3022abe74c Reset the "forum" and "prv" field 2019-01-05 23:02:58 +00:00
Michael
e88734e218 Periodically update contacts / update the contact type 2019-01-05 22:04:32 +00:00
Hypolite Petovan
cb635fb3cb Change stylesheet path name for mobile browsers 2019-01-04 20:18:31 -05:00
Hypolite Petovan
fc87c51bb4
Merge pull request #6377 from annando/ostatus-notice 
Prevent a notice ... again
 2019-01-04 11:28:31 -05:00
Michael
d8d5031935 Prevent a notice ... again 2019-01-04 15:34:53 +00:00
Hypolite Petovan
5e1ceb57de Escape global namespaced get_app() calls 
- Add deprecated status
 2019-01-03 21:27:36 -05:00
Hypolite Petovan
e86b8ef782 Use nickname instead of email for Login Name 2019-01-03 20:42:29 -05:00
rabuzarus
67a8f9dbd4 Bugfix - the remote user also has magicLinks again 2019-01-02 17:47:53 +01:00
Hypolite Petovan
61664ee659 Update usages of User::updatePassword 
- Add password rules in mod/settings display
 2019-01-01 01:15:52 -05:00
Hypolite Petovan
58adb5b431 Add password checks in User::updatePassword 2019-01-01 01:15:51 -05:00
Hypolite Petovan
909c9d0309 Increase auto-generated passwords to 12 chars + leading capital 2019-01-01 01:14:45 -05:00
Hypolite Petovan
961f737f36 Use User::updatePasswordHashed directly when re-hashing a password 2019-01-01 01:14:44 -05:00
Tobias Diekershoff
e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications 
Clear private message notifications
 2018-12-31 08:21:55 +01:00
Tobias Diekershoff
034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings 
Fix site theme settings modal form
 2018-12-30 10:35:44 +01:00
Hypolite Petovan
3095d4aa70 Add parent to private message notifications 
- Fix item id for Diaspora private message notification
 2018-12-30 01:10:10 -05:00
Hypolite Petovan
5abc22f6c5 Replace q() with DBA methods, fix code style 
- Remove unused variables
- Fix doc block
- Fix indentation
 2018-12-30 01:08:51 -05:00
Hypolite Petovan
979230da27 Allow theme setting in module 
- Restore theme name caching
 2018-12-29 15:40:04 -05:00
Hypolite Petovan
166b8ad440
Merge pull request #6342 from annando/notices 
Warning and notice fixed
 2018-12-29 12:16:37 -05:00
Tobias Diekershoff
7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array 
Remove util/ folder
 2018-12-29 11:43:55 +01:00
Michael
fd6c64f9c1 Warning and notice fixed 2018-12-29 09:53:31 +00:00
Hypolite Petovan
37c7a18d00 Replace latin-1 by latin1 in charset detection 
- Simplify conditional for charset conversion
 2018-12-29 00:43:00 -05:00
Michael Vogel
94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile 
Rework mod/match and mod/msearch
 2018-12-27 18:04:06 +01:00
Hypolite Petovan
fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array 2018-12-27 01:47:53 -05:00
Hypolite Petovan
620395378e Normalize uses of Strings::formatNetworkName to $network_link 
- Unescape HTML template variable $network_link
 2018-12-26 11:11:38 -05:00
Hypolite Petovan
5b74f066f2 Fix formatting in Util\Strings 2018-12-26 11:02:50 -05:00
Michael
f274357ad6 Issue-6329: Prevent double encoding 2018-12-26 11:21:42 +00:00
Hypolite Petovan
761e94d134 Remove redundant htmlentities/htmlspecialchars 2018-12-25 11:37:57 -05:00
Hypolite Petovan
56d612b2f0
Merge pull request #6323 from annando/issue-6316 
Issue 6316: Do not double encode / Avoid notice
 2018-12-25 11:26:54 -05:00
Michael
ccb9be8f28 Issue 6316: Do not double encode / Avoid notice 2018-12-25 12:12:59 +00:00
Hypolite Petovan
a8b0aa8c8d Normalize expected format for event fields summary, desc and location 
- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events
 2018-12-24 23:00:35 -05:00
Hypolite Petovan
c9c9fc3a96 Code cleanup in events 
- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json
 2018-12-24 23:00:35 -05:00
Hypolite Petovan
acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Michael
c43bd890a5 The "Follow" activity shouldn't be send to Diaspora 2018-12-24 14:50:21 +00:00
Hypolite Petovan
1938ec3ebe Rework mod/match 
- Replace classic pager with a start index
- Remove q() calls
- Ensure template is still loaded even with no results.
- Improve Minimal Pager display of next link
 2018-12-24 00:56:14 -05:00