clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
22,727 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

2849 Commits

Author SHA1 Message Date
Philipp Holzer 7634663970
Adding an explicit FriendicaProcessor 2019-01-24 08:13:44 +01:00
Hypolite Petovan 46315f6946 Fix missing use statement in Module\Inbox 2019-01-23 21:22:39 -05:00
Hypolite Petovan 8a554fef2d Fix missing library include in Database\DBstructure 2019-01-23 21:22:26 -05:00
Michael 3392c7a8be Fixed "created" origin 2019-01-24 00:34:14 +00:00
Michael 7e31cebb67 Parameters redone 2019-01-23 22:04:14 +00:00
Michael 0fdab4ed10 Fix for several fatal errors 2019-01-23 21:54:20 +00:00
Hypolite Petovan 004818ca1b Fix indentation in Module\Inbox 2019-01-23 09:07:02 -05:00
Hypolite Petovan 0d9209a74b Add AP Inbox logging back with config 2019-01-23 09:07:01 -05:00
Hypolite Petovan c897969589 Fix wrong variable name in Worker\Delivery 2019-01-23 09:07:00 -05:00
Hypolite Petovan a6786ac814 Update array notation in Protocol\DFRN 2019-01-23 09:07:00 -05:00
Hypolite Petovan df706484cd User DOMDocument object call instead of static in Content\OEmbed 2019-01-23 09:07:00 -05:00
Hypolite Petovan ddad9721c0 Fix query return type in Widget\TagCloud 2019-01-23 09:06:59 -05:00
Hypolite Petovan 49c9b6f9ff Fix possibly undefined variables 2019-01-23 09:06:59 -05:00
Hypolite Petovan f8c782380f Remove unused code/use statements 2019-01-23 09:06:58 -05:00
Hypolite Petovan 64847e7cc8 Fix types in doc blocks/prototypes 2019-01-23 09:06:58 -05:00
Hypolite Petovan 5ea033db33 Remove unused variable in Model\Item 2019-01-23 09:06:58 -05:00
Hypolite Petovan d5ce74672e Fix method scope in Model\Attach 2019-01-23 09:06:57 -05:00
Hypolite Petovan 0c19c4c75d Fix missing reference to 'data' key in Util\Crypto 
- Fix doc blocks
 2019-01-23 09:06:57 -05:00
Michael Vogel 48e0b943a3
Merge pull request #6336 from MrPetovan/bug/6334-get-app-namespace 
Move mod/register to Module\Register
 2019-01-23 07:40:58 +01:00
Hypolite Petovan 1ee1d7ef4e Add new PostUpdate function to initialize delivery data 2019-01-23 00:02:00 -05:00
Hypolite Petovan cef6757c92 Replace REGISTER_* constants by Module\Register::* ones 2019-01-22 22:24:15 -05:00
Hypolite Petovan 0ccb6afdb5 Add Register module in src/ 
- Update REGISTER_* constants definition
- Update register template variable name
 2019-01-22 22:22:04 -05:00
Hypolite Petovan 0cc1a07cfa Fix default value of contact parameter of OStatus::import in mod/salmon 2019-01-22 08:53:53 -05:00
Hypolite Petovan 5d4bafb116 Fix two additional uses of uid in Worker\Notifier 2019-01-22 08:31:39 -05:00
Hypolite Petovan 282bc01994 Fix using wrong uid for APDelivery in Worker\Notifier 2019-01-22 01:59:30 -05:00
Hypolite Petovan 604262a70e Extract title determination from OStatus::entryHeader logic 2019-01-22 01:59:22 -05:00
Hypolite Petovan aa3532cd3b Fix wrong class constant in Model\APContact 2019-01-22 01:57:46 -05:00
Michael Vogel 85ff976f83
Merge pull request #6483 from MrPetovan/bug/fixes-after-2019-03-develop-rebase 
Fixes after 2019 03 develop rebase
 2019-01-21 21:52:22 +01:00
rabuzarus eabe192efc bugfix Contact.php - there is no column 'deleted' in the 'profile' table 2019-01-21 21:13:13 +01:00
Hypolite Petovan b161bd1dfa Improve get_responses() prototype 2019-01-21 11:37:05 -05:00
Hypolite Petovan ce177f22c8 Fix doc blocks and return value type 2019-01-21 11:36:01 -05:00
Hypolite Petovan 504945f9df Improve page flags doc block in Model\User 2019-01-21 11:12:53 -05:00
Hypolite Petovan d1c1c772fd Fix missing use statement in Content\Nav 2019-01-21 11:12:53 -05:00
Hypolite Petovan 41edcd1028 Fix bad rebase in Model/Contact 2019-01-21 11:12:52 -05:00
Hypolite Petovan 3c50a11ff1 Fix wrong operators in Model\Item and Model\Contact 2019-01-21 11:12:51 -05:00
Hypolite Petovan 25b8628762 Fix missing new in throw calls in Core\StorageManager 2019-01-21 11:12:51 -05:00
Hypolite Petovan 722284ca8e Fix unused $kw variable in Protocol\Diaspora 2019-01-21 11:12:51 -05:00
Hypolite Petovan 28397fc5fc Fix method parameter type in Model\Attach 2019-01-21 11:12:50 -05:00
Hypolite Petovan 78931afa6f Fix error message in Console\GlobalCommunityBlock 2019-01-21 11:12:50 -05:00
Hypolite Petovan 57ab858486 Fix calls to DBA::select missing parameters 2019-01-21 11:12:50 -05:00
Hypolite Petovan e7be87df93 Fix missing $ in front of variable names 2019-01-21 11:12:49 -05:00
Hypolite Petovan 7f2dc40601 Fix potential bugs without expected behavior change 
- Fix uninitialized variables
- Fix potentially not set variables
- Fix wrong parameter default value
- Fix method scope
- Fix missing return value
 2019-01-21 11:04:19 -05:00
Hypolite Petovan c280fc6484 Show followers for pages, followed for users in ContactBlock widget 2019-01-21 10:56:28 -05:00
Hypolite Petovan 3d839bb176 Move Contact::ACCOUNT_TYPE_* constants to User::ACCOUNT_TYPE_* 
- Keep Contact::TYPE_* constants for comparison with contact.contact-type
 2019-01-21 10:56:27 -05:00
Hypolite Petovan ad9c67663d Move Contact::Page_* constants to User::PAGE_FLAGS_* 2019-01-21 10:55:37 -05:00
Hypolite Petovan 11a4a57bfe Update HTML::contactBlock and Profile::load with new ContactBlock widget 2019-01-21 10:55:36 -05:00
Hypolite Petovan 1f98fdfda6 Add new Widget\ContactBlock 2019-01-21 10:54:42 -05:00
Philipp Holzer 1b802548b2 revert phpdoc change 2019-01-21 10:54:41 -05:00
Philipp Holzer 9e0be97703 Bugfixing legacy loglevel 2019-01-21 10:54:41 -05:00
Philipp Holzer c38782731f changing failed auth to warning 2019-01-21 10:54:41 -05:00
Philipp Holzer 282507922a Reset map function name 2019-01-21 10:54:41 -05:00
Philipp Holzer b5afd2a21d change regex for fail2ban 2019-01-21 10:54:40 -05:00
Philipp Holzer aa15c0e094 Bugfixing Monolog 
- Default Loglevel for logs set to 'info'
- Default config level is set to 'notice'
- using 'notice' for auth-failures
- Bugfixing wrong usage of legacy 'log()'
 2019-01-21 10:54:39 -05:00
Hypolite Petovan dbc6eb5422 Remove unused code in mod/ 
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
 2019-01-21 10:53:32 -05:00
Hypolite Petovan 4a95ca280d Remove unused code 
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
- Remove duplicate array keys
 2019-01-21 10:48:40 -05:00
Hypolite Petovan d1c6ec9718 Update namespaces declaration in include/ 
- Remove unused use statements
- Add required use statements
 2019-01-21 10:44:45 -05:00
Hypolite Petovan 14e4ab544a Update namespace use calls in mod/ 2019-01-21 10:44:21 -05:00
Hypolite Petovan cb3f09ae4f Refactor namespaces 
- Remove unused use statements
- Add required use statements
- Escape global classes
 2019-01-21 10:43:42 -05:00
Hypolite Petovan 070aa016e0 Update more PHPDoc, including in include/ 2019-01-21 10:39:28 -05:00
Hypolite Petovan af9067a381 Update PHPDoc in mod/ 2019-01-21 10:39:27 -05:00
Hypolite Petovan 3282ce5389 Fix PHPDoc comments project-wide 2019-01-21 10:35:51 -05:00
Philipp Holzer 2e602afd3e Add Monolog 2019-01-21 10:10:40 -05:00
fabrixxm 518f28a7bf Small fixes 
- Avoid an intermediate variable
- Use `rawContent()` in `Attach` module
- Small typo
 2019-01-21 10:08:09 -05:00
Hypolite Petovan 2f49c4a058 Revert "Add monolog" 2019-01-21 10:08:09 -05:00
fabrixxm 24d7ffa3fe Update "storage" console command 
add support to move data in 'attach' table
 2019-01-21 10:00:48 -05:00
fabrixxm c3c0332536 return default mimetype for unknown extensions 2019-01-21 10:00:47 -05:00
fabrixxm e561fb3a0b Fix undefined var in module Proxy 2019-01-21 10:00:47 -05:00
Philipp Holzer 6e48df2163 Refactor Loglevels 2019-01-21 10:00:46 -05:00
fabrixxm b640024b51 Item model, fix deletion of all attachments 
Item model delete all attachments on item deletion, but it should check
if same attachment isn't used somewhere else.
 2019-01-21 10:00:45 -05:00
fabrixxm 906b7841d4 Fix Attach model store() and storeFile() 2019-01-21 10:00:45 -05:00
fabrixxm 15b0a7a4d8 Photo model. Small fix to update() 
pass `$old_fields` param to `DBA::update()`
 2019-01-21 10:00:45 -05:00
fabrixxm b7b3086263 Attach: store, update, delete. Model and views 2019-01-21 10:00:44 -05:00
fabrixxm fc2b804ccc Move mod/attach to src, add Attach model, update attach table to use storage backends 2019-01-21 10:00:44 -05:00
Philipp Holzer df230126c9 skipStackFramesCount to 1 to skip static method 2019-01-21 09:59:11 -05:00
Philipp Holzer 45bde8fef1 Adding more information in case of warning (or dev) 2019-01-21 09:59:11 -05:00
Philipp Holzer 6150c2fa9c Bugfixing 2019-01-21 09:59:11 -05:00
Philipp Holzer 7f7ed16dc2 Log format 2019-01-21 09:59:09 -05:00
Philipp Holzer 8f9c0fe149 Adding Develop and normal Logging instances 2019-01-21 09:59:08 -05:00
Philipp Holzer fe8f0e0045 Add Monolog 2019-01-21 09:58:05 -05:00
Jeroen De meerleer 2bfc3d1a0c begone 2019-01-21 09:50:59 -05:00
Jeroen De Meerleer 33f7fd72ca Enable logged in users to force a certain language 2019-01-21 09:50:58 -05:00
Jeroen De Meerleer b440b4c338 Updated towards code standards 2019-01-21 09:50:58 -05:00
Jeroen De meerleer e0777b6bc9 forcing language by parameter 2019-01-21 09:50:58 -05:00
Hypolite Petovan 55e54bb950 Replace deprecated Addon::callHooks with Hook::callAll 
- Update documentation
 2019-01-21 09:50:56 -05:00
Hypolite Petovan 895b3abf32 Remove/replace killme() with *exit() 2019-01-21 09:49:17 -05:00
Hypolite Petovan 16fabb4e04 Replace misuses ItemDeliveryData::FIELD_LIST with LEGACY_FIELD_LIST 2019-01-21 09:39:15 -05:00
Hypolite Petovan 38734f17b9 Honor item delivery data legacy fields 2019-01-21 09:39:15 -05:00
Hypolite Petovan 85eb6affdf Unit test fix 2019-01-21 09:39:14 -05:00
Hypolite Petovan ff1f6564f9 Remove delivery queue done incrementation for mail delivery 2019-01-21 09:39:14 -05:00
Hypolite Petovan 6538a8eaca Add delivery queue display in frio and vier 
- Add new $item.owner_self and $item.delivery keys for display
- Add new sub/delivery_count.tpl template
 2019-01-21 09:39:13 -05:00
Hypolite Petovan 1696ad962e Add delivery queue number manipulation 
- Add new ItemDeliveryData model class
- Add queue_count initialization in Notifier
- Add queue_done incrementation in various Delivery tasks
 2019-01-21 09:36:51 -05:00
Hypolite Petovan dea1a98a5d Fix various documentation issues/unused variables 2019-01-21 09:33:24 -05:00
Hypolite Petovan 8a0e4e12e1 Replace item_id by target_id in multimode delivery workers 2019-01-21 09:32:41 -05:00
Hypolite Petovan 1e6193a14e Refactor Worker/Notifier part 4 
- Remove redundant $normal_mode flag
- Moved public message email recipient loop
- Simplify OStatus delivery
 2019-01-21 09:31:57 -05:00
Hypolite Petovan 774609dd38 Refactor Worker/Notifier part 3 
- Replace deprecated q() calls
 2019-01-21 09:31:56 -05:00
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