mexon/friendica
1
0
Fork 0
Code Pull requests Activity
26876 commits 5 branches 60 tags 188 MiB
Commit graph

5864 commits

Author SHA1 Message Date
Philipp Holzer 388b963714
Replace BaseObject class with DI::* calls 2019-12-29 20:17:38 +01:00
Hypolite Petovan a9220aa83b
Merge pull request #8026 from nupplaphil/task/l10n_immutable 
Make L10n immutable
 2019-12-29 13:54:32 -05:00
Hypolite Petovan 25847c4c71
Merge pull request #8022 from nupplaphil/task/mod_hcard 
Move mod/hcard to src\Module\HoverCard
 2019-12-28 21:42:01 -05:00
Philipp Holzer 7a2f4dc54e
Make L10n immutable 
- Remove Push/Pop
- Add "withLang($lang)" method
 2019-12-28 23:12:01 +01:00
Philipp Holzer eeb78d2d29
Move mod/hcard to src\Module\HoverCard 2019-12-27 22:53:09 +01:00
Philipp Holzer aa5771cf3e
Move Login/Logout/TwoFactor to bundled submodule "Security" 2019-12-27 22:19:28 +01:00
Philipp Holzer d30e8665e1
Move mod/openid to src\Module\OpenId 2019-12-27 22:16:40 +01:00
Hypolite Petovan eaeb9438d8 Add missing use statement in mod/community 
- Addresses https://github.com/friendica/friendica/issues/7998#issuecomment-569265877
 2019-12-27 08:08:47 -05:00
Hypolite Petovan 66e9f0e0da Remove unused albumname input in album drop modal 
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-568798634
 2019-12-24 15:19:08 -05:00
Hypolite Petovan b4704b7205 Protect potentially missing array keys in mod/profiles 
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-568784029
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-568785161
 2019-12-24 12:56:20 -05:00
Hypolite Petovan 3694396758 Rename wrong desc form value name in mod/events 
- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-568783457
 2019-12-24 12:44:36 -05:00
Tobias Diekershoff 00756737b5 Merge branch 'master' 2019.12 into develop 2019-12-23 20:03:47 +01:00
Hypolite Petovan 637d526d6a
Ensure $item exists in mod/display 
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-567575161
 2019-12-22 09:00:16 -05:00
Hypolite Petovan bba8f03296 Check for parent existence in mod/display 
- Addresses https://github.com/friendica/friendica/issues/7677#issuecomment-566079001
 2019-12-19 07:47:35 -05:00
Philipp 5197833c55
Merge pull request #7930 from MrPetovan/task/7887-api-followers-request 
Add POST follow request Mastodon API endpoint
 2019-12-18 22:12:52 +01:00
Hypolite Petovan 6e4a428c73
Merge pull request #7907 from nupplaphil/task/reduce_app_deps 
Cleanup Session/Authentication
 2019-12-14 09:53:40 -05:00
Hypolite Petovan c23543f463 Restore correct highlighted contact tabs 2019-12-13 15:27:16 -05:00
Hypolite Petovan 0656e9ece4 Update web modules handling introduction to use new model class 2019-12-11 08:24:17 -05:00
Philipp Holzer 54392fab81
Move Cookie to own class (with tests) 
Move Authentication to App namespace
 2019-12-08 22:45:34 +01:00
Michael 23cdc9cec8 Fixes issue 7914: Reshares got crumbled 2019-12-07 21:05:14 +00:00
Philipp Holzer 96555a7385
Refactor "Authentication" class with four main methods: 
- withSession() - for auto authentication with Session/Cookie variables
- withOpenId() - for authentication with an OpenID account
- withPassword() - for authentication with Password
- setForUser() - for setting the user auth context of the current session

Refactor "Session" class - contains now "native" Session Management methods
 2019-12-05 23:02:51 +01:00
Philipp Holzer 18a3d18ba6
Move Authentication methods to class "Authentication" 2019-12-05 23:02:50 +01:00
Michael eeb8bee1b7 Use the new function to fetch shared information 2019-12-05 06:16:27 +00:00
Michael 22c66e1811 Add data for shared posts from the original 2019-12-04 22:57:09 +00:00
Hypolite Petovan 4403aeeda5
Merge pull request #7901 from annando/disable-smart-threading 
Changed the option to enable the smart threading with the option to disable this
 2019-12-04 15:25:53 -05:00
Michael Vogel 9cf1aea8c9 Changed the option to enable the smart threading with the option to disable this 2019-12-04 21:21:20 +01:00
Hypolite Petovan f989c331a3 Fix warnings about unexpected parameter array values type in ACL::getFullSelectorHTML 
- Addresses https://github.com/friendica/friendica/issues/7676#issuecomment-560503744
 2019-12-03 06:59:51 -05:00
Michael Vogel 2f2480d88d
Merge pull request #7876 from MrPetovan/task/7308-backport-compose-acl 
Generalize the Compose ACL to the whole site
 2019-11-28 21:24:20 +01:00
Hypolite Petovan ae3d4f63a3 Use visibility tags input for the default ACL selector 
- Move friendica-tagsinput to default view folder
- Update all references to ACL::getFullSelectorHTML
- Fix theme-specific issues with the new ACL
 2019-11-28 12:54:53 -05:00
Michael Vogel 3ed196fd9c Added option for insecure IMAP 2019-11-26 23:27:20 +01:00
Michael Vogel 16d2f11b40 Don't allow unencrypted IMAP, allow deleting mails 2019-11-26 22:27:25 +01:00
Michael 7c1f8a0597 Renamed config name 2019-11-19 16:31:22 +00:00
Michael 1e9214bfea Use the correct field 2019-11-19 13:10:38 +00:00
Michael fa876d770e Make the automatic title appending optional 2019-11-19 12:59:21 +00:00
Hypolite Petovan 31f0fe0992 Use correct variable to store user.hidewall in mod/settings 2019-11-09 09:12:20 -05:00
Hypolite Petovan 28537dbf63 Use correct variable to store user.page-flags in mod/settings 2019-11-09 09:12:10 -05:00
Michael 8c03bdada9 parameters now are having a default value and are optional 2019-11-05 21:48:54 +00:00
Tobias Diekershoff 9fad4abcec add missing quotation 2019-11-03 22:47:57 +01:00
Philipp d0068170db
Merge pull request #7806 from tobiasd/20191102-csvexport 
added export and import of followed contacts to and from  CSV files
 2019-11-03 20:28:08 +01:00
Tobias Diekershoff 9815d63352 use config var in settings form 2019-11-03 17:31:01 +01:00
Tobias Diekershoff 955a84a266 added export and import of followed contacts to and from CSV files 2019-11-03 00:12:16 +01:00
Michael Vogel 6ba7b5961c
Merge pull request #7798 from MrPetovan/task/rework-photo-functions 
Rework photo functions
 2019-11-02 21:20:38 +01:00
Philipp ebef0d5cd4
Merge pull request #7749 from MrPetovan/bug/7740-frio-hovercard-add-unfollow 
[frio] Rework hovercard actions
 2019-11-02 20:36:39 +01:00
Michael 421db4e454 Changed label for network sorting 2019-11-02 17:03:40 +00:00
Hypolite Petovan e3e2b0e6d0 Remove mod/hovercard file 2019-11-02 12:48:04 -04:00
Tobias Diekershoff 9f215fc33b
Merge pull request #7797 from annando/arrival-order 
Posted order is now arrival order
 2019-11-02 16:02:27 +01:00
Michael 682001ab0a And some other renaming 2019-11-02 13:55:55 +00:00
Michael 6e11419e00 Aligned code 2019-11-02 12:59:57 +00:00
Michael f97de52694 Renamed labels 2019-11-02 12:54:26 +00:00
Hypolite Petovan 26b5de9a76 Rename Photo::newResource() result variable from $hash to $resource_id 2019-11-02 07:48:45 -04:00
Hypolite Petovan 03bf1dcbd3 Move Object\Image static methods to Util\Images 
- Optimize imports in modified files
 2019-11-02 07:48:45 -04:00
Hypolite Petovan b543ee8ac7
Merge pull request #7726 from tobiasd/20191010-uexport 
move uexport module to src
 2019-11-02 07:46:57 -04:00
Tobias Diekershoff 8bea9e7523 mv URL path uexport -> userexport 2019-11-02 12:44:46 +01:00
Michael 01142cb4d0 Remove debug logging 2019-11-02 11:17:47 +00:00
Michael b81ab4f9a4 Posted order is now arrival order 2019-11-02 10:39:51 +00:00
Philipp Holzer aa7be41728
Fix ACLFormatterTest 
- Add nullable to expand() function again
- Add angle bracket support to toString()
 2019-11-01 14:13:29 +01:00
Hypolite Petovan d6ff89d7b4
Merge pull request #7769 from annando/issue-3229 
Changed OpenID registration
 2019-10-29 10:32:02 -04:00
Philipp Holzer 3eda62bfa6
Check null for acl-fields 2019-10-28 18:16:10 +01:00
Michael e1f36bfd7a Standards and unneccessary EOL 2019-10-28 13:51:38 +00:00
Michael bfbce16d0b Merge remote-tracking branch 'upstream/develop' into issue-3229 2019-10-28 13:50:06 +00:00
Philipp Holzer 5d995b854a
just remove parenthess 2019-10-26 05:24:05 +02:00
Philipp Holzer 28d5f39330
simplify show determination 2019-10-26 05:03:58 +02:00
Philipp Holzer 3465bd9f11
rename methods 2019-10-26 05:02:14 +02:00
Philipp Holzer fdc0236aa1
Fix arguments 2019-10-26 04:37:31 +02:00
Philipp Holzer a72e65a760
Adapt class structure 
- Introduce constants
- Add constructor parameters
- Add typehints
- Renamed fields more meaningful
- Renamed method names to match identifier
- Adjust PHP doc
- Add GetClass call at used places
 2019-10-26 04:03:27 +02:00
Philipp Holzer 1f368d469f
Move Friendica\Core\NotificationsManager to Friendica\Model\Notify 2019-10-26 02:01:46 +02:00
Philipp Holzer 7343ee5108
Move Namespace of ActivityNamespace 2019-10-25 00:41:48 +02:00
Philipp Holzer dc2858938d
Renamed to ActivityNamespace 2019-10-25 00:32:35 +02:00
Philipp Holzer 3897c74deb
Add docs 2019-10-25 00:10:20 +02:00
Michael aca701bef8 Changed OpenID registration 2019-10-24 20:23:26 +00:00
Philipp Holzer 2fba7ed477
Rename namespace 2019-10-24 21:40:13 +02:00
Philipp Holzer 07cea24430
Move Activity/Namespaces defines to constants 2019-10-24 21:40:12 +02:00
Hypolite Petovan ee1954f294
Merge pull request #7762 from nupplaphil/task/mod_ignored 
move mod/ignored to src/Module/Item/Ignored
 2019-10-24 12:04:50 -04:00
Philipp Holzer c9e1098dd2
Adapt naming convention 2019-10-23 21:39:00 +02:00
Philipp Holzer ad67fd3aa8
Move is_a_date_arg to DateTimeFormat::isYearMonth 
- Improved functionality
- Added tests
 2019-10-23 02:39:28 +02:00
Philipp Holzer 52c42491c4
Move activity_match() to Protocol\Activity::match() 
- With tests
 2019-10-23 02:05:11 +02:00
Philipp Holzer 5843a80b6c
Move perms2str to ACLFormatter::aclToString() 
- including new tests
 2019-10-23 00:54:34 +02:00
Philipp Holzer f65f7f11c3
Move expand_acl to ACLFormatter::expand() 
- including tests
 2019-10-23 00:40:14 +02:00
Philipp Holzer 2870f42ca2
Move bb_translate_video 
- To new Class BBCode\Video
- Adding tests
- Make BaseObject::getClass() public
 2019-10-23 00:14:47 +02:00
Philipp Holzer 7f49c73730
Move undo_post_tagging to mod/editpost because of the only occurrence 2019-10-22 23:57:44 +02:00
Philipp Holzer 17aca9bee8
move mod/ignored to src/Module/Item/Ignored 2019-10-21 21:19:28 +02:00
Philipp Holzer 2a41f0b104
wrong field 2019-10-21 11:34:47 +02:00
Philipp Holzer cbc48a4fd4
Fix parameter 2019-10-20 13:23:13 +02:00
Philipp Holzer 7716374593
Move mod/receive to src/Module/Diaspora/receive 
- Added routes
- Make Diaspora::decode(Raw) more explicit
- Add new User::getByGuid() method
 2019-10-20 13:07:16 +02:00
Hypolite Petovan e3915d2f93 Prevent empty [url] label regular expression to break image insertion 2019-10-16 13:53:16 -04:00
Philipp b0967ffd02
Merge pull request #7742 from MrPetovan/task/7190-remove-defaults-mod 
Replace deprecated defaults() calls by a combination of ?? and ?: operators in mod/
 2019-10-15 18:07:53 +02:00
Hypolite Petovan 2db6171641 Replace deprecated defaults() calls by a combination of ?? and ?: operators in mod/ 2019-10-15 09:01:17 -04:00
Hypolite Petovan c07cb2c8f3
Merge pull request #7738 from annando/clean-url 
Convert links with empty descriptions
 2019-10-13 20:11:28 -04:00
Michael 5875830d1e Convert links with empty descriptions 2019-10-13 15:52:33 +00:00
Hypolite Petovan 02f02d44dc Move mod/manage to src/Module/Delegation 
- Move templates/manage to templates/delegation
- Update navigation links
- Update CSS classes
 2019-10-11 19:59:06 -04:00
Hypolite Petovan 27eaffd7fb
Merge pull request #7725 from dew-git/develop 
Fix security vulnerabilities.
 2019-10-11 14:48:07 -04:00
Tobias Diekershoff 46172b641d moved UExport to src/Module/Settings/Uexport 2019-10-11 07:38:42 +02:00
Tobias Diekershoff fb562fc25b removed mod/uexport file 2019-10-11 07:36:41 +02:00
dew-git 811cdcdfcb Fix security vulnerbilities. 
Fix possible length extension attack, predicable generators, timing attacks on hash comparision and improved formatting.
 2019-10-10 15:21:41 -08:00
Hypolite Petovan 57a749af38 Add required use statement in mod/subthread 2019-10-10 13:12:27 -04:00
Philipp cf4bae26c7
Merge pull request #7720 from MrPetovan/task/4090-move-delegate-to-src 
Move mod/delegate to src/Module/Settings/Delegation
 2019-10-10 10:24:15 +02:00
Hypolite Petovan 616edd0600 Move mod/delegate to src/Module/Settings/Delegation 
- Move templates/delegate to templates/settings/delegation
 2019-10-09 22:17:09 -04:00
Hypolite Petovan 1e737ae888 Move mod/search to src/Module/Search/Index 
- Update BaseSeachModule not to depend on a single query string parameter
 2019-10-07 14:27:46 -04:00
Hypolite Petovan 22598fc7e8 Improve search box 
- Use new saved search module
- Use dynamic search option loop
- Use "q" instead of "search" for search query string parameter
 2019-10-07 14:27:46 -04:00
Hypolite Petovan cdefa7f32a Add new module and widget for managing saved searches 2019-10-07 14:27:46 -04:00
Hypolite Petovan f4d06ebd47 Remove useless theme session variable deletions in modules 2019-10-06 12:08:15 -04:00
Hypolite Petovan e5fbaf6a00 Add Session::clear method 
- Replace manual session clear by method in mod/manage
 2019-10-06 11:21:54 -04:00
Hypolite Petovan 8f20e2054b Move /acl module to src/ 
- Move Core\ACL::contactAutocomplete to Module\Search\Acl
- Rename module path to /search/acl
 2019-10-03 22:40:42 -04:00
Hypolite Petovan 185f1fc687
Merge pull request #7636 from annando/manage 
Restructured "manage" functionality, added count parameters
 2019-09-30 11:12:46 -04:00
Hypolite Petovan 2333526b8a
Merge pull request #7678 from annando/remote-rework 
Reworked the remote authentication
 2019-09-30 09:18:43 -04:00
Philipp Holzer d5dd12b8f8
Add Drone CI 
- Add drone test environment
- Add drone config
- apt phpunit
- Fix api.php
- Fix item.php
- Fix DBStructure
- Check if caching is possible during tests
 2019-09-30 14:03:12 +02:00
Michael d41399496e Merge remote-tracking branch 'upstream/develop' into manage 2019-09-30 06:30:13 +00:00
Michael 0d7c79d051 Using central function to set the "remote" session value 2019-09-30 06:29:00 +00:00
Michael 0185c91246 Merge remote-tracking branch 'upstream/2019.09-rc' into remote-rework 2019-09-29 06:32:35 +00:00
Michael Vogel 4e9a810206 Fix magic auth for redirects with non profile paths 2019-09-29 02:16:09 +02:00
Michael 23bad85847 Ensure to fetch the correct item 2019-09-28 20:43:45 +00:00
Michael 83b00ef308 New function "isAuthenticated" 2019-09-28 18:09:11 +00:00
Michael 89f02a1125 Fix warnings 2019-09-28 15:31:36 +00:00
Michael 1c26baec46 remote_user is replaced 2019-09-28 09:59:08 +00:00
Michael 6e9026e033 Renamed function, beginning to replace the "remote_user" function 2019-09-28 09:36:41 +00:00
Michael 1ddd2df4b8 Removed obsolete code 2019-09-28 05:37:24 +00:00
Michael 3dd94355b7 Fix permissions when viewing photos, applying same fix to items as well 2019-09-27 05:49:23 +00:00
Michael ec66553032 Reworked "remote" cookie handling 2019-09-25 22:24:17 +00:00
Michael 6a376c29d8 Fix session size problems 2019-09-25 05:57:32 +00:00
Michael 08f30e1769 Fix notice 2019-09-24 21:51:08 +00:00
Michael 5254147ccc Fix "redir" loop 2019-09-23 22:13:20 +00:00
Michael aba23daeca Get rid of zombie introductions that reappear automatically 2019-09-22 10:51:34 +00:00
Hypolite Petovan 118e737a49 Remove dependency to App object in Temporal::getDateofBirthField 2019-09-21 05:15:52 -04:00
Michael 9e7467f8f9 Added to-do 2019-09-18 05:56:06 +00:00
Michael 1144863090 Changed "hidewall" behaviour 2019-09-18 05:20:33 +00:00
Michael 8237d35a87 Restructured "manage" functionality, added count parameters 2019-09-17 04:05:26 +00:00
Tobias Diekershoff d2707a0e15 Added some help text about influence on search engines 2019-09-14 19:14:52 +02:00
Hypolite Petovan 32707022bf Remove GET page parameter access from Core\ACL 2019-09-13 20:06:57 -04:00
Michael f71abb30ca Issue 3229: Switched to other function to receive the identity 2019-09-11 16:46:13 +00:00
Michael 57e4b9f806 Issue 7610: Set the appropriate meta header to not being crawled 2019-09-10 17:15:29 +00:00
Michael 323285216b We have to check for "0" in "rel" as well 2019-09-09 20:39:19 +00:00
Michael f185f6fd3d Pending contacts part 2: Fix contact deletion / added cron job for repairs 2019-09-09 20:03:11 +00:00
Hypolite Petovan 91b0f0465f
Merge pull request #7604 from annando/pending-contacts 
Display pending contacts in the contact list
 2019-09-09 13:49:51 -04:00
Michael 2dbd843ed2 Don't display ignored pending contacts, link to contact request page 2019-09-09 05:29:33 +00:00
Hypolite Petovan c2c3bb2074 Remove deprecated defaults() call in mod/events 2019-09-06 08:33:41 -04:00
Michael d7a8417941 Fix fatal error for empty parameter for "System::removedBaseUrl" 2019-09-04 21:11:58 +00:00
Michael Vogel 35a487ae30 Don't fork worker on frontend by default 2019-08-08 22:42:12 +02:00
Hypolite Petovan 3e2f0e9ffa Feedback changes 
- Import namespaces in mod/community
- Fix alignment in Content\Feature
- Add phpDoc to Widget\TrendingTags
 2019-08-06 07:37:48 -04:00
Hypolite Petovan c399e40618 Add trending_tags additional feature + usage in mod/community 2019-08-06 07:09:04 -04:00
Tobias Diekershoff 3053cde210 Typo in setting description 2019-08-05 18:07:43 +02:00
Michael 1b7f96dac8 Partly reverted, real problem fixed 2019-08-04 04:29:52 +00:00
Hypolite Petovan e5321ecc7f
Merge pull request #7458 from annando/fix-7449 
Fix issue 7449: Image permissions are now set like before
 2019-08-02 13:26:57 -04:00
Michael d95ef96cca Fix issue 7449: Image permissions are now set like before 2019-08-02 16:38:50 +00:00
Michael Vogel e8459cce34
Merge pull request #7381 from MrPetovan/task/7309-frio-compose 
[frio] New Compose page
 2019-08-01 08:15:02 +02:00
Michael b4c673a620 We now use a central function for fetching the postdata 2019-07-30 22:26:01 +00:00
Hypolite Petovan 0579252362 Add user meta-groups for followers and mutual contacts 
- Both Group::expand and Item::enumeratePermissions now have a user id parameter to expand meta-groups
 2019-07-29 20:31:46 -04:00
Hypolite Petovan e745506c04
Replace removed Photo::select by new Photo::selectToArray in /photos 2019-07-29 13:38:55 -04:00
Hypolite Petovan cfd2e7f686
Replace removed Photo::select by new Photo::selectToArray in /profile_photo 2019-07-29 13:37:54 -04:00
Philipp Holzer 6c2cf494b5
Remove DependencyFactory 
- Include all necessary classes in `dependencies.config.php`
- Add DI-reference to BaseObject (acts as a global registry)
- Refactor all static "init()" methods to use the global registry

- Refactor Logging for Worker-Logger a little bit
 2019-07-27 23:54:12 +02:00
Hypolite Petovan 6df53624c7 Remove confusing extraneous success_update >= failure_update conditions 2019-07-20 13:34:08 -04:00
Hypolite Petovan 2f9e710f5c Fix reference non-existing "mobile-theme" field in user record 2019-07-20 12:14:20 -04:00
Michael Vogel 2aea286143
Merge pull request #7400 from MrPetovan/bug/7397-frio-settings-fallback 
[frio] Theme settings fallback on node settings
 2019-07-18 23:22:17 +02:00
Michael 13212e0d04 Added search 2019-07-18 06:37:33 +00:00
Hypolite Petovan ac53ee8e0f Show node's theme as selected in display setting for new users 2019-07-17 23:08:26 -04:00
Hypolite Petovan ada699536a Prevent users from forcibly installing a disabled theme in mod/settings 2019-07-17 23:08:03 -04:00
Michael e247a14d2b Added the option to only receive top level posts from people you follow 2019-07-17 21:37:13 +00:00
Hypolite Petovan 19247b62ae Ensure $uid parameter of Feature::isEnabled to be an integer 2019-07-15 22:00:49 -04:00
Michael 5d5a10fb9c Only fetch toplevel posts when searching for hashtags on network page 2019-07-09 05:20:34 +00:00
Hypolite Petovan b124c414dc Rewrite conditions for photo linked item to prevent crash on old photos 
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-509064260
 2019-07-07 23:51:23 -04:00
Michael 6bb418c5a7 Use "received" instead of "created" when displaying posts in creation order 2019-07-07 21:30:33 +00:00
Hypolite Petovan 9b8b2b36cd
Merge pull request #7339 from annando/gcontact-update 
Restructured Contact/GContact handling
 2019-07-07 13:28:20 -04:00
Hypolite Petovan f92752c9b4 Ensure $link_item variable type when calling get_responses() in mod/photos 
- Addresses https://github.com/friendica/friendica/issues/7297#issuecomment-508622668
 2019-07-05 13:40:33 -04:00
Michael dda86f6dfc Basepath function now uses the contact field 2019-07-05 06:41:48 +00:00
Michael 6041f74df6 New constant for federated protocols 2019-07-01 18:00:55 +00:00
Michael 6cd6fa889b leading, trailing, all the same :-) 2019-06-29 20:09:23 +00:00
Michael 644c08a035 Issue 4815: Silently ignoring trailing @ at follow requests 2019-06-29 19:01:07 +00:00
Hypolite Petovan 9545ff614b Limit smilies replacement to BBCode::convert 2019-06-23 17:53:25 -04:00
Hypolite Petovan b9ab613777 Merge branch 'master' into develop 2019-06-23 17:40:52 -04:00
Hypolite Petovan c1f99c70b1 Merge branch '2019.06-rc' 
# Conflicts:
#	CHANGELOG
#	VERSION
#	boot.php
 2019-06-23 15:30:44 -04:00
Michael 289bcfa121 Fix receiving of DFRN posts with public envelope 2019-06-22 04:17:38 +00:00
Philipp fb63274aaf
Merge pull request #7250 from MrPetovan/bug/6410-normalize-message-button 
Normalize message button in profile sidebar
 2019-06-12 17:56:05 +02:00
Hypolite Petovan 3aebb92cf3 Rework Profile::sidebar profile link conditions 
- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect
 2019-06-10 21:56:03 -04:00
Philipp Holzer 7c54edd4b4
Fixing Network::post() caused by wrong argument 2019-06-10 19:34:16 +02:00
Hypolite Petovan d7d44e1af7
Merge pull request #7245 from annando/unify-constants 
Fix delivery counter for poking / unify delivery commands
 2019-06-10 11:59:40 -04:00
Michael 41dc243186 Fix delivery counter for poking / unify delivery commands 2019-06-10 14:19:24 +00:00
Philipp Holzer cc7444d84d
Move internal recursion-counter to the end of all cur/fetchUrl parameters 2019-06-10 14:34:54 +02:00
Michael 44a49a8d7d Ensure that pokes are always send only via DFRN 2019-06-06 04:26:02 +00:00
Hypolite Petovan f0de19dd8a
Merge pull request #7208 from nupplaphil/bug/6916-filetag 
Adding null checks before FileTag method (fix fatal)
 2019-05-31 01:47:52 -04:00
Hypolite Petovan ac294be746
Merge pull request #7207 from nupplaphil/bug/6917-php_warnings 
Add hexadecimal check (fix warnings)
 2019-05-30 09:31:50 -04:00
Philipp Holzer c76258c370
catching nulls for FileTag 2019-05-30 13:54:35 +02:00
Philipp Holzer 03ca26f0c4
Change fallback logic 2019-05-30 13:45:39 +02:00
Philipp Holzer aa33a79e13
normal comparison 2019-05-30 13:38:00 +02:00
Philipp Holzer 4c5dd9f47c
Add more Strings::isHex() checks to photos 2019-05-30 10:30:15 +02:00
Philipp Holzer e4a63bc219
Replace $_SESSION with Session::get() 2019-05-30 10:18:52 +02:00
Philipp Holzer 7334be803d
Bugfix - item_id 2019-05-29 21:40:21 +02:00
Philipp Holzer 392137b433
Adding hexadecimal check for parse_rul 
see https://github.com/friendica/friendica/issues/6917#issuecomment-475461338
 2019-05-29 20:32:16 +02:00
Philipp Holzer 3de540d1d1
Adding hexadecimal check for photos 
see https://github.com/friendica/friendica/issues/6917#issuecomment-492798238
 2019-05-29 20:28:25 +02:00
Philipp Holzer e853e256c7
Checking all values for $_SESSION 
See https://github.com/friendica/friendica/issues/6918#issuecomment-491492826
 2019-05-29 20:07:22 +02:00
Philipp Holzer 3015135750
Adding fallback route in case of a non valid route 
see https://github.com/friendica/friendica/issues/6918#issuecomment-491009954
 2019-05-29 20:06:50 +02:00
Philipp 59bbb1ac99
Merge pull request #7203 from MrPetovan/bug/warnings 
Fix condition in dfrn_request_content() when $a->profile isn't set
 2019-05-29 07:06:06 +02:00
Philipp 9245942a0c
Merge pull request #7199 from MrPetovan/bug/7171-filer-network 
Allow commas in saved folder names
 2019-05-29 07:03:44 +02:00
Hypolite Petovan 8f4dbec696 Fix condition in dfrn_request_content() when $a->profile isn't set 
See https://github.com/friendica/friendica/issues/6917#issuecomment-494087890
 2019-05-28 21:14:21 -04:00
Hypolite Petovan ed768c71ee Remove "f=&" nonsense from network module 
- Fixes wrong redirect when using the sidebar filters
 2019-05-27 17:45:27 -04:00
Hypolite Petovan cd05d15b04 Replace build_querystring() by http_build_query() introduced in PHP 5 2019-05-27 17:40:12 -04:00
Hypolite Petovan 0fadc7730c Replace deprecated string-bases Model\FileTag calls with array-based ones 2019-05-27 17:40:08 -04:00
Hypolite Petovan 3c7e4b474b
Merge pull request #7193 from nupplaphil/bug/uimport_datetime 
Fix NULL datetime for uimport/uexport
 2019-05-27 09:13:01 -04:00
Hypolite Petovan 01e71254d9 Replace defaults() calls on $_SESSION by Core\Session calls 
- Replace direct calls to $_SESSION by Core\Session calls in Module\Login
 2019-05-26 21:26:59 -04:00
Philipp Holzer 26d4214c19
added suggestions 2019-05-26 21:53:24 +02:00
Philipp Holzer 220f8f0862
friendica-6950 uimport doesn't support "pwdreset_time":null 2019-05-26 15:49:44 +02:00
Philipp Holzer 2652787460
friendica-7130 Edits of images not possible 2019-05-26 15:00:19 +02:00
Hypolite Petovan d27d4d8927 Move posted date widget to Content\Widget 2019-05-25 19:08:15 -04:00
Hypolite Petovan c65faecc8c Add current tab parameter to Model\Profile::getTabs 2019-05-20 15:09:33 -04:00
Hypolite Petovan 709eba6ce3 Move /viewcontacts to /profile/{nickname}/contacts[/{type}] 
- Add contact relationship filter to profile contacts page
- Include feed contacts in contacts page and contact widget
 2019-05-20 14:50:09 -04:00
Hypolite Petovan 862159c712
Merge pull request #7165 from nupplaphil/task/mod_dirfind 
Move mod/dirfind to src/Module/Search/Directory
 2019-05-20 14:45:19 -04:00
Hypolite Petovan 0c9b76a585
Merge pull request #7173 from nupplaphil/task/mod_newmember 
Move mod/newmember to src/Module/Welcome
 2019-05-20 14:14:58 -04:00
Philipp Holzer f97b72eb9f
Move mod/newmember to src/Module/Welcome 2019-05-20 20:12:20 +02:00
Hypolite Petovan 6f0c6e8926
Merge pull request #7160 from nupplaphil/task/mod_probe 
Move mod/probe to src/Module/Probe
 2019-05-19 15:06:13 -04:00
Hypolite Petovan 3ca64185a6
Merge pull request #7169 from annando/send-suggest 
Sending contact suggestions does work again
 2019-05-19 14:59:28 -04:00
Philipp a758671a1b
Merge pull request #7154 from MrPetovan/task/refactor-widgets 
Refactor widgets
 2019-05-19 20:52:00 +02:00
Michael a6cf036db2 Sending contact suggestions does work again 2019-05-19 17:59:37 +00:00
Michael 14d4132ad0 Fixed contact suggestion 2019-05-19 08:54:26 +00:00
Philipp Holzer a7aae9603a
Split Directory Search as a base for further changes 2019-05-19 05:06:02 +02:00
Philipp Holzer 5b44fdc202
Split Directory Search as a base for further changes 2019-05-19 05:01:46 +02:00
Philipp Holzer e00f110ef1
Move mod/dirfind to src/Module/DirFind 2019-05-19 04:28:16 +02:00
Philipp Holzer 48bba87abe
Move mod/probe to src/Module/Probe 2019-05-19 04:24:18 +02:00
Hypolite Petovan 7a13582c67
Merge pull request #7159 from nupplaphil/task/mod_notice 
Move mod/notice to src/Module/Notice
 2019-05-18 22:16:35 -04:00
Hypolite Petovan ec5c123f41
Merge pull request #7163 from nupplaphil/task/mod_starred 
Move mod/starred to src/Module/Starred
 2019-05-18 22:16:21 -04:00
Hypolite Petovan 596e95917e
Merge pull request #7164 from nupplaphil/task/mod_randprof 
Move mod/randprof to src/Module/RandomProfile
 2019-05-18 22:16:06 -04:00
Philipp Holzer 82e271589f
Move mod/starred to src/Module/Starred 2019-05-19 03:07:44 +02:00
Hypolite Petovan d3a4ed0111
Merge pull request #7162 from nupplaphil/task/mod_view 
Move mod/view to src/Module/Theme
 2019-05-18 21:07:27 -04:00
Philipp Holzer 9092cb1beb
Move mod/notice to src/Module/Notice 2019-05-19 02:53:31 +02:00
Hypolite Petovan 33ec3d8051
Merge pull request #7161 from nupplaphil/task/mod_toggle_mobile 
Move mod/toggle_mobile to src/Module/ToggleMobile
 2019-05-18 20:14:27 -04:00
Hypolite Petovan 30945784c3
Merge pull request #7157 from nupplaphil/task/mod_notify 
Move mod/notify to src/Module/Notify
 2019-05-18 17:49:01 -04:00
Philipp Holzer 8bb85b1da7
Move mod/randprof to src/Module/RandomProfile 2019-05-18 22:17:57 +02:00
Philipp Holzer d1d7fa394a
Move mod/view to src/Module/View 2019-05-18 21:23:12 +02:00
Philipp Holzer 295d90d496
Move mod/toggle_mobile to src/Module/ToggleMobile 2019-05-18 21:13:19 +02:00
Philipp Holzer 2906a9031b
Removed mod/notify 2019-05-18 19:04:33 +02:00
Philipp Holzer 9f13ae6e73
Move mod/opensearch to src/Module/OpenSearch 2019-05-18 17:43:58 +02:00
Hypolite Petovan 71ae8d07a6 Refactor widgets 
- Move widget templates to subfolder
- Add new generic filter widget templates to replace category, network and filer filters
- Update styles
 2019-05-18 11:33:35 -04:00
Hypolite Petovan 8e885f5b97 Add two-factor authentication settings 
- Add settings aside menu entry
- Add two-factor authentication documentation
 2019-05-13 01:52:01 -04:00
Hypolite Petovan 6071fe81b4 Move Authentication::setAuthenticatedSessionForUser to Session::setAuthenticatedForUser 2019-05-13 01:51:59 -04:00
Hypolite Petovan 3785c6de05
[hotfix] Fix wrong Exception namespace 2019-05-07 11:56:25 -04:00
Philipp 7c62a4e02b
Merge pull request #7104 from annando/separated-confirm 
The follow confirmation process is now separated
 2019-05-06 21:40:11 +02:00
Hypolite Petovan 20c9d5fe1d
Merge pull request #7103 from nupplaphil/task/mod_smilies 
Move mod/smilies to src/Module/Smilies
 2019-05-06 12:53:45 -04:00
Michael 37f9af2f24 Merge remote-tracking branch 'upstream/develop' into separated-confirm 2019-05-06 05:54:51 +00:00
Michael 5da3e17a12 The follow confirmation process is now separated between DFRN and the rest 2019-05-06 05:46:13 +00:00
Hypolite Petovan bd604d1cfb
Merge pull request #7084 from nupplaphil/task/mod_removetag 
Move mod/filerm to src/Module/Filer/RemoveTag
 2019-05-05 20:36:38 -04:00
Hypolite Petovan fbf36d6e7f
Merge pull request #7086 from nupplaphil/task/mod_maintenance 
Move mod/maintenance to src/Module/Maintenance
 2019-05-05 20:36:12 -04:00
Hypolite Petovan b79201beaf
Merge pull request #7102 from nupplaphil/task/mod_pretheme 
Move mod/pretheme to src/Module/ThemeDetails
 2019-05-05 20:33:21 -04:00
Hypolite Petovan 1e6affada1
Merge pull request #7101 from nupplaphil/task/mod_viewsrc 
Move mod/viewsrc to src/Module/ItemBody
 2019-05-05 20:32:42 -04:00
Hypolite Petovan 12b6ab9943
Merge pull request #7100 from nupplaphil/task/mod_robots_txt 
Move mod/robots_txt to src/Module/RobotsTxt
 2019-05-05 14:23:10 -04:00
Hypolite Petovan 8af0ae171e
Merge pull request #7083 from nupplaphil/task/mod_friendica 
Move mod/friendica to src/Module/Friendica
 2019-05-05 14:19:57 -04:00
Michael Vogel fb563e0495
Merge pull request #7099 from nupplaphil/task/mod_modexp 
Move mod/modexp to src/Module/PublicRSAKey
 2019-05-05 19:49:51 +02:00
Philipp Holzer e90876cd86
Move mod/smilies to src/Module/Smilies 2019-05-05 19:39:02 +02:00
Philipp Holzer 3f71a51d21
Move mod/pretheme to src/Module/ThemeDetails 2019-05-05 19:24:10 +02:00
Philipp Holzer 49a3179578
Move mod/viewsrc to src/Module/ItemBody 2019-05-05 19:15:33 +02:00
Philipp Holzer 510c150156
Move mod/robots_txt to src/Module/RobotsTxt 2019-05-05 19:06:51 +02:00
Philipp Holzer 9f0bbd96be
Move mod/modexp to src/Module/PublicRSAKey 2019-05-05 19:02:19 +02:00
Hypolite Petovan e17db489ee
Merge pull request #7095 from annando/ap-connect 
Switching from legacy DFRN connect to ActivityPub
 2019-05-05 09:37:43 -04:00
Hypolite Petovan c830e4b300
Merge pull request #7091 from nupplaphil/task/mod_rsd 
Move mod/rsd_xml to src/Module/ReallySimpleDiscovery
 2019-05-05 08:30:06 -04:00