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

1860 Commits

Author SHA1 Message Date
Hypolite Petovan 7a2d5f6a8e Move notification to the new paradigm 2021-10-02 18:15:45 -04:00
Hypolite Petovan bc0734e0f1 Move notification introductions to the new paradigm 2021-10-02 18:15:45 -04:00
Hypolite Petovan 3e6fea30f2 Create constants for Mastodon notification types 2021-10-02 18:15:44 -04:00
Hypolite Petovan bf81f21001 Rename Model\Post\UserNotifications type constants 2021-10-02 18:15:43 -04:00
Hypolite Petovan 47acb6a278 Move notify to the new paradigm 
- Remove unused frion notify template
- Update API test
 2021-10-02 18:15:42 -04:00
Hypolite Petovan ce7d394ff9
Merge pull request #10801 from annando/network-thread-view 
Fixing "Unknown column 'network-thread-view.uri-id'"
 2021-10-02 17:40:00 -04:00
Hypolite Petovan bd42f5757f Implement relationship termination for Mastodon block 
- This is the expected Mastodon behavior on block
 2021-10-02 17:30:07 -04:00
Michael Vogel fc9ac0ff46
Update src/Module/Conversation/Network.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-02 23:18:54 +02:00
Michael eea355ae3b Merge remote-tracking branch 'upstream/develop' into network-thread-view 2021-10-02 21:00:10 +00:00
Michael bd85babc3e Fixing "Unknown column 'network-thread-view.uri-id'" 2021-10-02 20:56:11 +00:00
Hypolite Petovan c4a4473cd0 Remove the obsolete parameter $two_way from terminateFriendship methods 
- Follow revokation is now done independently
 2021-10-02 16:14:22 -04:00
Hypolite Petovan 222333f64f Remove contact drop feature 
- Feature was confusing, sometimes ineffective and overall overlapping with unfollow/block
 2021-10-02 16:04:28 -04:00
Michael 1550c0cf13 Reverted unneeded changes 2021-10-02 19:33:51 +00:00
Michael afa611bd50 The media class moved 2021-10-02 19:31:27 +00:00
Michael 2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 18:35:43 +00:00
Hypolite Petovan 72fae04e97 Add revoke follow feature 
- Add new follow revoke module
- Add new hooks: revoke_follow, support_follow, support_revoke_follow
- Add link in contact page action menu
 2021-10-02 14:01:46 -04:00
Hypolite Petovan 9918fa3ec0 Move translation strings in their own array for confirm templates 2021-10-02 13:52:54 -04:00
Michael a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 15:13:55 +00:00
Michael c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile 2021-10-02 15:09:43 +00:00
Michael 865006682a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-10-02 11:57:43 +00:00
Michael 1979b4775d New functionality to display media posted by a contact 2021-10-02 11:55:22 +00:00
fabrixxm e8c0d5d445 Logs view: remove unneeded tpl var 2021-10-01 17:00:06 +02:00
fabrixxm 0638e23f7a Mark string translatable in View logs 
and update messages.po
 2021-10-01 16:46:55 +02:00
Tobias Diekershoff 786596fec5 remove superfluous characters from warning messages in the admin panel 
\r\n was shown in the warning messages of the admin panel log view page. They have
been removed. Additionally the messages.po file has been regenerated.
 2021-10-01 14:02:27 +02:00
Michael 64d181c1cc Code style 2021-09-24 04:35:27 +00:00
Michael 0ad904c185 The conversation functionality moved to a class 2021-09-23 21:18:36 +00:00
Michael 3dddea96fa Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-18 20:27:24 +00:00
Hypolite Petovan 24ecf5954c
Merge pull request #10721 from annando/issue-10720-avatar 
Issue 10720: Use different path scheme for user avatars
 2021-09-18 09:30:08 -04:00
Philipp c00da77c67
Add feedback 2021-09-18 12:55:17 +02:00
Philipp 462f76352e
Add feedback :-) 2021-09-18 12:51:09 +02:00
Philipp 644f312896
Fix various Notices 2021-09-18 12:51:06 +02:00
Michael a91e3f5dbc Issue 10720: Use different path scheme for user avatars 2021-09-17 18:36:20 +00:00
Hypolite Petovan 9a0c3cc834 Simplify max_data parameter for Temporal::getDateTimeField 2021-09-15 15:56:44 -04:00
Hypolite Petovan 44ec4de14c Use CSRF token as name and value for contact deletion confirm form 2021-09-14 17:28:42 -04:00
Michael 5abc1543fd Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-13 12:31:30 +00:00
Hypolite Petovan d78661817e
Merge pull request #10693 from nupplaphil/feat/config_dir 
Add the possibility to use a different configuration directory
 2021-09-13 07:02:52 -04:00
Michael 19c3e55ca8 Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact 2021-09-12 12:36:04 +00:00
Philipp 27e4586597
Move path determination logic into the ConfigFactory 2021-09-12 13:44:29 +02:00
Hypolite Petovan 5a93bb6eff Prevent expandTags to be performed on existing links in Module\Api\Mastodon\Statuses 
- We never need to expand tags inside of an already existing BBCode url tag
 2021-09-12 00:05:22 -04:00
Philipp 5702944116
Add the possibility to use a different configuration directory 2021-09-11 14:33:26 +02:00
Michael 9c14eb0c6b Use centralized function to update contact entries 2021-09-10 18:21:19 +00:00
Hypolite Petovan 8b450be09b Move unsecured GET endpoint handlers before security token check in Module\Contact 2021-09-10 12:05:43 -04:00
Hypolite Petovan 75d3f5094b
Merge pull request #10683 from annando/proxify 
Make the proxy functionality optional
 2021-09-10 10:24:17 -04:00
Michael 634db1ec85 Changed text 2021-09-10 00:30:11 +00:00
Michael bdb5aa6bd9 Make the proxy functionality optional 2021-09-09 12:40:19 +00:00
Hypolite Petovan e9aa27b19f Add form security token to contact actions 
- Add token to batch POST actions
- Add token to individual GET actions
 2021-09-06 12:30:38 -04:00
Hypolite Petovan d20b53607d Distinguish between public and private contact in contact actions 
- Block and ignore is done relating to a public contact (uid = 0)
- Update and drop is done relating to a private contact (uid !=0)
- Method documentation has been improved to precise the contact type it needs
- Public and private contact ids are retrieved before acting on contacts
 2021-09-06 11:50:46 -04:00
Hypolite Petovan 5262843e63 Add redirect URL parameter to contact batch 
- This allows redirection to the correct contact tab after a batch action
 2021-09-05 14:54:51 -04:00
Hypolite Petovan 6e358bfacf Remove user-controlled contact archival feature 
- Archival is managed at the system level for failed probing and doesn't make sense for a user to decide on it
 2021-09-05 14:54:50 -04:00
Michael 52ca3e5417 Remove all traces of "rino" 2021-09-05 18:34:44 +00:00
Michael ce6f6978bd Use the correct function is adviced ... 2021-09-03 04:20:32 +00:00
Michael 307cfef12b Select all fields 2021-09-03 04:09:02 +00:00
Michael 6bb8b63da0 Adding gravity to avoid notices 2021-09-03 04:05:29 +00:00
Hypolite Petovan 4140a59332
Merge pull request #10658 from nupplaphil/feat/storage_naming 
Rename Storage Backend labels
 2021-09-02 19:55:15 -04:00
Philipp 687e6841bc
Rename Storage Backend labels 2021-09-02 23:27:35 +02:00
Michael 64fd94fc74 Issue 10651: remote comments appeared as own posts 2021-09-02 05:57:50 +00:00
Michael 58abaf5c53 Merge remote-tracking branch 'upstream/2021.09-rc' into issue-10640-c 2021-09-01 18:34:24 +00:00
Michael c8d2c87af0 Issue 10640 - Inverse user display settings 2021-09-01 18:29:45 +00:00
Philipp 728e82d8b0
Improve translation for Storage module 2021-09-01 14:00:23 +02:00
Hypolite Petovan 1665b54c6f
Fix variable assignment alignment in Module\Admin\Site 2021-08-31 16:01:20 -04:00
Michael 13ae96e9e1 Some more "enable" 2021-08-31 19:54:05 +00:00
Michael 85e2328b23 Issue 10640: Some more inversed settings 2021-08-31 19:26:17 +00:00
Michael 3944e5d38e Disable mail setting when imap support is disabled 2021-08-30 21:17:03 +00:00
Michael e3c7cd25e1 Issue 10640: Use consistent settings to enable protocol support 2021-08-30 19:46:10 +00:00
Philipp 13a91e63aa
Rename DI::httpRequest() into DI::httpClient() 2021-08-25 21:54:54 +02:00
Philipp 505100bdd7
Rename HTTPRequestOptions to HTTPClientOptions 2021-08-25 21:45:15 +02:00
Philipp 0cafa871f1
Use HTTPRequestOptions constants for HTTPClient::get() 2021-08-25 21:31:30 +02:00
Philipp befd5c860d
Fix headers (string to array) and make sure the signature doesn't change 2021-08-25 14:22:43 +02:00
Philipp 2356221aba
Fixup HTTP headers for httpClient requests 2021-08-25 14:22:43 +02:00
Hypolite Petovan 7a8d800024 Add probe support to @user@domain.tld search string format 2021-08-24 12:46:01 -04:00
Hypolite Petovan ceeb246128 Remove Profile::load from Module\HCard 
- Renamed and re-scoped Profile::sidebar to getVcardHtml
 2021-08-24 06:24:06 -04:00
Hypolite Petovan e155821d7a Set profile fields for system user in Model\User::getOwnerDataById 
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-903676606
- This is required when Model\Profile::load is called for the system user for example
 2021-08-24 05:53:46 -04:00
fabrixxm ec4f53d56f Add DI to ParsedLogIterator, replace constructors with fluent api 2021-08-19 14:56:51 +02:00
fabrixxm 84fa668845 Fix code formatting 2021-08-19 14:55:33 +02:00
fabrixxm 5b9aeeeca9 Add search and filter to log view 2021-08-19 14:55:33 +02:00
fabrixxm 9368f5445d Display structured logs in admin 
Tries to parse log lines and to display info in a table.
Additional JSON data is parsed and displayed clicking on a row.

File reading and line parsing is handled in iterators, to avoid to keep
too much data in memory.
Search and filter should be trivial to add.
Log file is read backward to display log events newest first.
A "tail" functionality should be easy to implement.
 2021-08-19 14:55:33 +02:00
Michael Vogel 486328336f
Merge pull request #10611 from MrPetovan/task/feed-debug-contact 
Allow contact creation in Module\Debug\Feed
 2021-08-18 10:05:38 +02:00
Hypolite Petovan 0a592fbf34 Abort early if owner isn't found in Module\RemoteFollow 
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-899099987
 2021-08-17 09:38:35 -04:00
Hypolite Petovan a04944d443 Allow contact creation in Module\Debug\Feed 
- This module only allowed existing contact feeeds to be debugged
 2021-08-17 08:20:58 -04:00
Philipp 99239e3d99
Fix usage 2021-08-16 23:27:43 +02:00
Philipp c17bc55158
Introduce InvalidClassStorageException and adapt the code for it 2021-08-16 23:27:42 +02:00
Philipp d0536ebea7
Rename ISelectableStorage to IWritableStorage 2021-08-16 23:27:42 +02:00
Philipp 29c7552df5
Refactor IStorage 2021-08-16 23:27:42 +02:00
Michael ce9da778b9 Clarify XMPP profile field description 2021-08-16 06:15:18 +00:00
Michael 74f3cbc383 Improved error check, added "put" 2021-08-15 07:28:26 +00:00
Michael e28a4265c5 API: First steps to support subscriptions 2021-08-15 00:30:41 +00:00
Michael 81d9fc677f Updated messages.po 2021-08-12 06:33:08 +00:00
Michael 473adaf463 Mark, file and starring does now work for all items 2021-08-12 05:28:47 +00:00
Michael c81e81dc8d "getUserId" is now "getLoggedInUserId" 2021-08-09 20:33:46 +00:00
Michael 15b93b4459 "getUserNickname" is now "getLoggedInUserNickname" 2021-08-09 19:48:39 +00:00
Michael f5e84c1ff0 Use owner not profile 2021-08-09 15:38:22 +00:00
Michael 4495e83eca Merge remote-tracking branch 'upstream/develop' into app-user2 2021-08-09 15:32:32 +00:00
Michael b8fa75b2dd Changed function name 2021-08-09 15:29:07 +00:00
Hypolite Petovan 3e1e3c8b3e
Merge pull request #10588 from annando/matrix 
Matrix addresses can be entered in the profile
 2021-08-09 10:56:12 -04:00
Michael 51d549639d Fix profile probing via Pleroma 2021-08-09 06:56:41 +00:00
Michael bee04f86ee Matrix addresses can be entered in the profile 2021-08-09 01:39:09 +00:00
Michael 9f01052dd2 Removed some more unused "use" 2021-08-08 20:03:28 +00:00
Michael a9d7e5b29e Removed unused use 2021-08-08 19:43:15 +00:00
Michael 28090bd793 Get rid of App->user completely 2021-08-08 19:30:21 +00:00
Michael fc283ab928 Remove direct calls to App->user 2021-08-08 10:14:56 +00:00
Michael 6a23b17c95 Respect the postopts values for scheduled posts 2021-08-06 18:49:17 +00:00
Michael a8442e41ab Improved error message for external resources 2021-08-06 04:02:42 +00:00
Michael 4bc3e8c141 Don't send "accept" when we accept anything 2021-08-06 04:02:22 +00:00
Michael a26a2a0228 Make the system owner ready for Diaspora 2021-08-05 08:30:44 +00:00
Michael Vogel 25f0f0c439 Display the publish time in the local timezone 2021-08-04 07:58:07 +02:00
Hypolite Petovan 37d5bc1a51
Merge pull request #10566 from annando/manage-avatar 
Use the general function ro create an avatar path
 2021-08-02 18:50:15 -04:00
Michael 9f19adf8bb Use the general function ro create an avatar path 2021-08-02 22:28:42 +00:00
Michael 6c8a4a2552 Use a centralized function to delete delayed entries 2021-08-02 20:56:34 +00:00
Michael 88e276843e Using "post" when deleting, fixing deleting 2021-08-02 19:18:44 +00:00
Michael f87e41e206 Scheduled posts are now listed and can be deleted 2021-08-02 17:03:06 +00:00
Michael ec5ed0cf46 Placeholder page for scheduled posts 2021-08-02 12:10:03 +00:00
Michael 8214401b57 Merge remote-tracking branch 'upstream/develop' into scheduled-frontend 2021-08-01 13:12:25 +00:00
Michael 2e2d1bf81d Added option to define a schedule date when posting items 2021-08-01 13:01:31 +00:00
Hypolite Petovan 98803064eb
Merge pull request #10562 from nupplaphil/bug/storage_admin 
Fix legacy storage config
 2021-08-01 05:59:35 -04:00
Philipp 839b5b5859
Fix legacy storage config 2021-07-31 20:56:32 +02:00
Michael 929de9081e All needed fields are now filled 2021-07-30 13:22:06 +00:00
Michael 93263a820d Function renamed, documentation added 2021-07-30 10:24:08 +00:00
Michael bb37c41bd7 Scheduled posts can now be created 2021-07-30 06:22:32 +00:00
Michael 432206bc5b Use router constants 2021-07-30 06:19:02 +00:00
Michael a1828430e5 Fixing variables 2021-07-29 14:58:04 +00:00
Michael 6ea3d4aa61 Added API calls, removed fields 2021-07-29 10:34:31 +00:00
Hypolite Petovan dfb043ce60 Add Exception for empty User::getOwnerDataById(0 return case in Protocol\ActivityPub\Transmitter::getProfile() 
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-882781552
- Add try-catch blocks to all references of Protocol\ActivityPub\Transmitter::getProfile()
 2021-07-27 16:46:08 -04:00
Hypolite Petovan 3cef3ab107
Merge pull request #10548 from annando/args 
Replaced argv/argc with replacement functions
 2021-07-26 18:43:47 -04:00
Michael 5a87ccf026 Getter/Setter for theme info 2021-07-25 19:39:10 +00:00
Michael c52b8595e8 theme infos are now bundled in a single array 2021-07-25 19:07:03 +00:00
Michael df558d4056 Completely removed argc/argv 2021-07-25 15:23:37 +00:00
Hypolite Petovan 69c75daf4f
Merge pull request #10543 from annando/app-variables 
App variables reduced and removed
 2021-07-25 08:56:05 -04:00
Michael 9cc4682e0a Merge branch 'app-variables' of github.com:annando/friendica into app-variables 2021-07-25 05:08:33 +00:00
Michael fbac31edc5 Simplyfying code 2021-07-25 05:08:29 +00:00
Michael Vogel 1793513f46
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-07-25 07:04:48 +02:00
Michael 8f46064430 Using getter/setter functions 2021-07-24 20:34:07 +00:00
Philipp 4be4498b13
Update UX for Storage administration 2021-07-24 19:01:01 +02:00
Philipp 1e4f9f62fe
Rename buttons 2021-07-24 19:01:00 +02:00
Philipp e19b9824cd
Allow setting & saving storages per type 2021-07-24 19:00:58 +02:00
Philipp 2fe28af74f
PHP-CS fixing 2021-07-24 19:00:58 +02:00
Philipp cbe522ee82
Fixings 2021-07-24 19:00:58 +02:00
Philipp 3647f6f031
Refactor storage admin setting 2021-07-24 19:00:58 +02:00
Philipp 97bafb3a59
Extract Storage admin section to own page 2021-07-24 19:00:58 +02:00
Michael 30aad250df App->contact is now removed 2021-07-24 11:49:11 +00:00
Michael 2502a9192d Many more app-variables removed 2021-07-24 10:09:39 +00:00
Michael fae0f839bc Merge remote-tracking branch 'origin/develop' into profile 2021-07-23 13:29:36 +00:00
Michael afe3c8954c Simplified functionality to load the profile in the sidebar 2021-07-23 12:39:37 +00:00
Michael 9a3a4def3d "hovercard" is "hcard" 2021-07-23 12:38:29 +00:00
Hypolite Petovan 72ab57f067
Merge pull request #10530 from annando/api-mail 
API: Support for fetching mails with more "statuses" calls
 2021-07-21 09:52:26 -04:00
Michael 01fd128502 API: Support for fetching mails with more "statuses" calls 2021-07-21 05:58:22 +00:00
Michael ec08784aa3 API: Added dummy endpoint for featured tags 2021-07-21 05:22:56 +00:00
Michael c01ca1583c Added permission check 2021-07-20 21:45:42 +00:00
Michael e199abc837 Removed unused use 2021-07-20 21:19:16 +00:00
Michael b5f59d5be0 API: Support for deprecated API endpoints and OAuth removal 2021-07-20 20:48:37 +00:00
Michael 289a4dcba7 Added missing app class (avoid fatal error) 2021-07-19 16:15:06 +00:00
Michael f62f82df75 Move ActivityPub endpoints to an AP class 2021-07-17 20:28:46 +00:00
Michael 209d4d0d6a DFRN endpoints moved, changelog entry added 2021-07-16 14:45:29 +00:00
Michael 3a5523820c Legacy DFRN transport layer is removed 2021-07-15 13:28:32 +00:00
Michael d267ba999c We now use the new account-user-view (and fixed the function name) 2021-07-11 09:39:34 +00:00
Michael 07d2dfcd60 Some more "convertForUriId" replacements 2021-07-10 12:58:48 +00:00
Michael d8974c9a2a Function renamed to better reflect the functionality 2021-07-09 06:29:24 +00:00
Michael 377bb78cc2 Set "convertForItem" at more places 2021-07-08 20:01:52 +00:00
Michael 178bc543e3 New founction to count threads 2021-07-08 17:32:41 +00:00
Michael f29bd23ea8 New function to convert BBCode for a given ID 2021-07-08 13:47:46 +00:00
Michael 098cd543ea Cleaned code for contact avatars 2021-07-06 10:36:00 +00:00
Michael dac27ead7a Proxy settings removed 2021-07-06 06:44:18 +00:00
Michael aed5e4cc96 New struture for post related links 2021-07-05 18:45:49 +00:00
Michael a06d699480 Item cache related functionality removed 2021-07-05 04:57:50 +00:00
Michael 844727dc19 Simplyfying code 2021-07-05 04:16:02 +00:00
Michael e519b782fd Simplified proxy handling 2021-07-04 21:24:49 +00:00
Michael f0268b57be Use "getOwnerDataById" and "getOwnerDataByNick" to fetch owner data 2021-07-04 17:25:08 +00:00
Hypolite Petovan bedc8e1427
Merge pull request #10463 from annando/proxy-security 
Proxy: Avoid access for not logged in users
 2021-07-04 10:12:36 -04:00
Michael 24f013a654 Redirecting not logged in user instead of failing 2021-07-04 11:53:49 +00:00
Michael da484a48e3 Proxy: Avoid access for not logged in users 2021-07-04 10:55:32 +00:00
Michael 47904f99c2 Removal of duplicated photo entries for a contact 2021-07-04 10:40:03 +00:00
Michael c72abe48a8 Fixed fetching private local images 2021-07-03 15:29:27 +00:00
Michael 8e9433f2e9 Fix: Fetching of non public photos 2021-07-01 18:05:54 +00:00
Hypolite Petovan c63dfa38c1
Merge pull request #10451 from annando/contact-path 
Some more places changed to the new contact avatar path format
 2021-06-30 21:24:27 -04:00
Hypolite Petovan 7a2038fc93
Merge pull request #10452 from annando/notice 
Avoid Notice: Undefined index: field1 in /src/Module/Register.php on line 253
 2021-06-30 21:23:12 -04:00
Michael df9a69db01 Avoid Notice: Undefined index: field1 in /src/Module/Register.php on line 253 2021-06-30 19:13:27 +00:00
Michael 09aa496387 Some more places changed to the new contact avatar path format 2021-06-30 16:58:46 +00:00
Michael ec49afa116 Guess the mimetype in advance 2021-06-30 04:28:03 +00:00
Michael 39fe60744b Grammar 2021-06-30 03:49:43 +00:00
Michael d2b32a151e Detect the mimetype for external resources 2021-06-30 03:47:53 +00:00
Michael 19aef93560 Unified avatar paths 2021-06-29 20:26:58 +00:00
Michael ebb9e0c2f5 Fix resizing 2021-06-28 19:38:03 +00:00
Michael ffdbac7e41 Issue 10443: Fix requesting media content 2021-06-28 18:53:10 +00:00
Michael 2f06d271bb Use a default value for "uid" 2021-06-28 13:58:06 +00:00
Michael 4f95622d73 Only user the user with attached media. 2021-06-28 12:40:58 +00:00
Michael 6f350c1e59 Use signed requests for fetching private images 2021-06-28 10:08:51 +00:00
Michael 7e200174d6 Replace attachment links in the body 2021-06-28 04:53:20 +00:00
Michael dbf9132ea6 Fixed indendation 2021-06-28 01:34:29 +00:00
Michael b46b7b08ba Reduce the usage of the "proxifyUrl" function 2021-06-27 11:50:10 +00:00
Michael e6e90abc77 AOI: Send "history" section for trends 2021-06-24 22:15:25 +00:00
Michael 89608d5844 Set CORS header fields to support Halcyon 2021-06-24 18:02:29 +00:00
Michael 9276f6823b New class for external resources 2021-06-24 17:30:22 +00:00
Michael 96809b3fdd API: Improved avatar handling 2021-06-24 07:08:38 +00:00
Michael 6b46fdb54e Don't count the system user as user 2021-06-21 04:03:20 +00:00
Philipp 322f0b3ecf
Cleanup Mastodon Factories 2021-06-20 13:25:45 +02:00
Michael 97891fe05b Context: use the correct "select functionality 2021-06-19 18:27:35 +00:00
Michael fe07dc828b Fix noscrape publishing and pulling, added header 2021-06-17 11:23:32 +00:00
Michael ebd4f59d02 Merge remote-tracking branch 'upstream/2021.06-rc' into public-timeline 2021-06-16 21:01:20 +00:00
Hypolite Petovan 7b91bd1d80
Merge pull request #10410 from annando/oauth 
API: Added OAuth revoke, adding documentation to parameters
 2021-06-16 16:32:45 -04:00
Michael Vogel a256f18159
Update src/Module/OAuth/Token.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-06-16 22:19:26 +02:00
Michael 6b3476409a Check for REDIRECT_REMOTE_USER as well 2021-06-16 19:39:51 +00:00