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

2800 Commits

Author SHA1 Message Date
Philipp d63aca97b8
Merge pull request #12673 from annando/andstatus-api 
API: Accept "redirect_uris" as both array and string
 2023-01-15 01:01:06 +01:00
Michael e06f699dd9 Added Documentation, updated messages.po 2023-01-14 21:20:04 +00:00
Michael af2a38c5b3 API: Accept "redirect_uris" as both array and string 2023-01-14 21:07:47 +00:00
Philipp 0c14e51112
Merge pull request #12666 from MrPetovan/bug/12661-public-calendar-export 
Enable calendar export for public_calendar = true
 2023-01-14 19:20:20 +01:00
Hypolite Petovan 323765110c Enable calendar export for public_calendar = true 2023-01-14 10:39:18 -05:00
Hypolite Petovan e73adde5fb Remove App dependency from Hook::callSingle 
- This was causing a circular dependency with the logger_instance hook
 2023-01-14 10:38:37 -05:00
Michael f542211189 Mode depending control for the behaviour with blocked contacts 2023-01-12 06:25:55 +00:00
Hypolite Petovan ec54b303c5
Merge pull request #12655 from annando/fix-communication 
Fix: Forum posts from some contacts weren't distributed
 2023-01-11 17:04:41 -05:00
Michael 53e8b21ca3 Fix: Forum posts from some contacts weren't distributed 2023-01-11 21:55:32 +00:00
Hypolite Petovan 5c8cd8fdd6 Replace remaining mentions of "Status" by "Conversations" or "Posts" 2023-01-11 09:01:29 -05:00
Hypolite Petovan d0648b10ef Convert Content\Nav to dynamic object 
- Remove DI dependency in Module\Apps
 2023-01-11 09:01:24 -05:00
Michael Vogel c1f9c1aaa5
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-01-08 23:13:31 +01:00
Michael 480d9f53c3 Added "collapsed" list 2023-01-08 18:28:19 +00:00
Michael 50746bad55 Merge remote-tracking branch 'upstream/develop' into collapse 2023-01-08 17:47:21 +00:00
Michael 50e43c530e Posts from contacts can now be collapsed 2023-01-08 17:40:05 +00:00
Hypolite Petovan 0ae7a53daa
Merge pull request #12637 from annando/ostatus-subscription 
OStatus: Fix PubSubHubBub subscription
 2023-01-08 07:58:22 -05:00
Michael Vogel 1ef9768b98
Apply suggestions from code review 
Co-authored-by: Philipp <admin+Github@philipp.info>
 2023-01-08 13:00:58 +01:00
Michael c3d836db63 OStatus: Fix PubSubHubBub subscription 2023-01-08 09:41:54 +00:00
Hypolite Petovan 97642e770b Treat unsupported API call as HTTP error 2023-01-07 22:47:52 -05:00
Michael 24c32cff0d Merge remote-tracking branch 'upstream/develop' into diaspora-item 2023-01-07 19:52:23 +00:00
Michael d86045058e Diaspora: Photos are now transmitted separately 2023-01-07 15:11:34 +00:00
Philipp 6e4e2c4a82
Fix warning text 2023-01-07 15:30:45 +01:00
Philipp b7a2b6b352
Update src/Module/Admin/Summary.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2023-01-07 15:28:49 +01:00
Philipp 6e0d16f22b
Add warning message in case node.config.php isn't writable 2023-01-07 15:16:55 +01:00
Hypolite Petovan 308618b559
Merge pull request #12622 from nupplaphil/bug/config 
`node.config.php` bugfixings
 2023-01-07 08:45:53 -05:00
Philipp cdd57275eb
Some improvements 
- Move $_SERVER into ConfigFileManager constructor
- Rename "creatConfigFileLoader" to "createConfigFileManager"
- Rename variable "loader" to "manager" in all tests
 2023-01-06 01:03:00 +01:00
Hypolite Petovan 3b9bf4d70d Remove system.no_auto_update personal config key and assume default value of true 
- By popular request, the behavior with false was too perturbating
 2023-01-05 10:27:03 -05:00
Hypolite Petovan dfcfae6bcc Replace $_GET references with $request in Update classes 2023-01-05 10:23:25 -05:00
Philipp b439df892a
Apply suggestions 2023-01-03 17:24:05 +01:00
Philipp 65d79d4c93
Introduce ISetConfigValuesTransactional for transactional config behaviour 2023-01-03 14:22:07 +01:00
Philipp 376e0a9397
Fix Admin\Site 2023-01-03 14:22:07 +01:00
Philipp 1e574d5383
Refactor IManageConfigValues interface 2023-01-03 14:22:04 +01:00
Philipp 0f91d1cbde
Introduce ConfigFileManager for config files 2023-01-03 14:22:02 +01:00
Hypolite Petovan 9c256ad76f Remove obsolete OExchange module and reference 
- Protocol looks unsupported for a decade now
 2023-01-01 19:20:42 -05:00
Hypolite Petovan 8bbf9e93c6 Remove dependency to the second parameter of XML::fromArray 2023-01-01 19:20:42 -05:00
Hypolite Petovan 6e06a7f14c Remove dependency to DI in Search\Acl module 2023-01-01 18:47:44 -05:00
Philipp 4faf08c064
Merge pull request #12562 from MrPetovan/bug/notices 
Ward againt contact_id = 0 in UpdateContact worker
 2023-01-02 00:34:21 +01:00
Hypolite Petovan 1874a32728 Happy New Year 2023! 2023-01-01 09:36:24 -05:00
Michael 4eceb2d26f Merge remote-tracking branch 'upstream/develop' into move-delivery 2022-12-30 21:40:09 +00:00
Michael 9115ec5f0d Adjust class references to the new location 2022-12-30 21:20:28 +00:00
Hypolite Petovan e563de4de7 Ward againt contact_id = 0 in UpdateContact worker 
- Add parameter validation in Worker\UpdateContact::add
- Address https://github.com/friendica/friendica/issues/12487#issuecomment-1366833644
 2022-12-30 02:10:29 -05:00
Philipp 8894b482dc
Find last "update_" config entry occurrence 2022-12-29 22:36:45 +01:00
Philipp 925c30280c
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-29 22:12:02 +01:00
Philipp 965caf98a5
Replace database "update_" config entries with key-value entries 2022-12-29 21:53:58 +01:00
Philipp 6b3265742a
Replace cron/worker "last" config entries with key-value entries 2022-12-29 21:53:57 +01:00
Philipp 10f8631cd9
Replace PostUpdate key-value config entries with key-value pair entries 2022-12-29 21:53:56 +01:00
Hypolite Petovan 53c0fffbec Add ClockInterface dependency to Temporal::getRelativeDate 
- Remove unused $format parameter
 2022-12-28 00:31:20 -05:00
Hypolite Petovan 5c332af844
Merge pull request #12527 from nupplaphil/feat/request_id 
Introduce Request::getRequestId()
 2022-12-26 16:07:35 -05:00
Philipp 4f1bb0d274
Use X-REQUEST-ID for Error pages 2022-12-26 21:18:05 +01:00
Michael 46fdf696ee Issue 12524: Fix first day of week 2022-12-25 22:45:34 +00:00
Michael 5298cd73b3 We now store the violation as well 2022-12-25 10:44:06 +00:00
Michael cef4349421 Changed parameter order 2022-12-25 07:30:39 +00:00
Michael 8a7d08ae28 Category added 2022-12-24 13:57:43 +00:00
Michael 4c945850f4 Reports: The reporting contact id is added 2022-12-24 08:03:37 +00:00
Michael d75cd8a00a The GNU-Social import is removed 2022-12-21 22:21:22 +00:00
Michael 69a9f9033d Three systems added to the federation statistics 2022-12-20 22:29:53 +00:00
Michael de1c0f4c13 Don't display Diaspora reshares 2022-12-20 19:25:57 +00:00
Michael 4db4d1843d Merge remote-tracking branch 'upstream/develop' into diaspora-reshare 2022-12-20 06:58:36 +00:00
Philipp 20374ab5a2
Merge pull request #12447 from MrPetovan/bug/12441-profile-contacts 
Retrieve contact records for the page visitor in several modules
 2022-12-19 17:14:43 +01:00
Philipp c9f92f41fb
Merge pull request #12479 from MrPetovan/bug/deprecated 
Fix several Deprecated notices
 2022-12-19 17:13:12 +01:00
Hypolite Petovan 06ea61f0ed Provide default value for system.banner config key 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:17:57 -05:00
Hypolite Petovan b1b0bfc280 Don't compute system.update_interval when it's -1 (disabled) 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:05:21 -05:00
Hypolite Petovan eb9af005f0 Fix module instantiation in Profile\Index module 
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1357441775
 2022-12-19 09:50:42 -05:00
Hypolite Petovan 29330a4205 Remove DI dependency in Profile\Status module 2022-12-19 09:50:42 -05:00
Hypolite Petovan 9da21bf680 Remove fallback contact query from Model\Contact::photoMenu 
- Correct contact is now supplied to the method
 2022-12-19 09:50:18 -05:00
Hypolite Petovan 2d9633a595 Retrieve contact records for the page visitor in Profile\Common module 2022-12-19 09:50:18 -05:00
Hypolite Petovan 472bde99a4 Retrieve contact records for the page visitor in Contact\Contacts module 2022-12-19 09:50:17 -05:00
Hypolite Petovan fca1abbafe Retrieve contact records for the page visitor in Profile\Contacts module 2022-12-19 09:50:17 -05:00
Hypolite Petovan 36a8962333 Remove DI dependency in Contact\Hovercard module 2022-12-19 09:50:17 -05:00
Hypolite Petovan 7458721f9f Remove DI dependency in Profile\Common module 2022-12-19 09:50:16 -05:00
Hypolite Petovan a633532475 Remove DI dependency in Contact\Contacts module 2022-12-19 09:50:16 -05:00
Hypolite Petovan cef408c842 Remove DI dependency in Module\Profile\Contacts 2022-12-19 09:50:16 -05:00
Tobias Diekershoff 86a486f62b
Merge pull request #12472 from MrPetovan/bug/12466-profile-photos-aside 
Remove VCard for owner in Profile\Photos module
 2022-12-19 07:38:13 +01:00
Tobias Diekershoff b4db8fe8d2
Merge pull request #12469 from MrPetovan/bug/12462-tos-rules 
Skip blank lines in Tos module
 2022-12-19 06:58:42 +01:00
Hypolite Petovan 5392bafbb4 Remove VCard for owner in Profile\Photos module 
- Remove unused remote contact retrieval
- Remove contact list from aside for non-owner visitors
 2022-12-18 23:52:33 -05:00
Hypolite Petovan 39607b20e2 Convert custom profile field URL values to rel="me" links 2022-12-18 23:24:59 -05:00
Hypolite Petovan 76e9c4daa2 Fix link to profile page in custom profile fields settings 
- Previous link was leading to conversations
 2022-12-18 22:49:49 -05:00
Hypolite Petovan 07f7585e40 Remove DI dependency in Profile\Profile module 2022-12-18 22:49:18 -05:00
Hypolite Petovan 1cc0c1148e Skip blank lines in Tos module 2022-12-18 22:16:41 -05:00
Hypolite Petovan 52e3126cba Add missing t() call in Settings\Display module 2022-12-18 01:04:04 -05:00
Hypolite Petovan 9718484f9e Remove DI dependency in Settings\Display module 2022-12-18 01:04:04 -05:00
Hypolite Petovan 43aa9cddc5 Trim terms of service rules before turning them to an array 2022-12-17 21:13:52 -05:00
Hypolite Petovan cdf180c58d Add new calendar.default_view pconfig key 2022-12-17 12:20:43 -05:00
Hypolite Petovan 83e34ef8e7 Move first_day_of_week pconfig key to calendar category 2022-12-17 12:20:14 -05:00
Michael 8397ccf37c Merge remote-tracking branch 'upstream/2022.12-rc' into diaspora-reshare 2022-12-17 12:27:35 +00:00
Philipp 2ae3ae0b8a
Merge pull request #12436 from MrPetovan/bug/notices 
Address a few notices
 2022-12-16 08:52:04 +01:00
Hypolite Petovan 060936d31e Ward against empty $contact array in Module\Photo::getPhotoById 
- Address https://github.com/friendica/friendica/issues/11994#issuecomment-1349591039
 2022-12-15 23:31:32 -05:00
Hypolite Petovan 0c5158b85d Check that $probed key exists before comparison in OStatus\Subscribe 
- Address https://github.com/friendica/friendica/issues/11994#issuecomment-1349590054
 2022-12-15 23:29:06 -05:00
Hypolite Petovan 777afb45fc Apply calendar owner custom theme 2022-12-15 23:14:45 -05:00
Tobias Diekershoff f8b70ef9f0
Merge pull request #12424 from MrPetovan/task/10100-contact-relationship-prominence 
Make relationship filter widget more prominent in Module\Contact
 2022-12-15 06:24:32 +01:00
Tobias Diekershoff 7d20798e97
Merge pull request #12427 from MrPetovan/bug/12399-suppress-notif-forum 
Suppress notifications for forum users in Module\Notifications\Ping
 2022-12-15 06:20:21 +01:00
Hypolite Petovan 2d624e900d Suppress notifications for forum users in Module\Notifications\Ping 
- The bell icon is already hidden for them but the notification number showed in the page title
 2022-12-14 22:01:14 -05:00
Hypolite Petovan c54bca43a5 Make relationship filter widget more prominent in Module\Contact 2022-12-14 21:35:34 -05:00
Hypolite Petovan e0cdb8a940 Show lock status even when feature is disabled in Admin/Features 2022-12-14 21:30:47 -05:00
Marek Bachmann 3576855e71 Small fix to show PHP.ini upload_max_filesize value also with binary prefix for consistency 2022-12-14 23:19:08 +01:00
Hypolite Petovan 0e543b2d4a
Merge pull request #12392 from annando/api-relations 
API: Use "contact" for own relations
 2022-12-14 08:06:14 -05:00
Michael 5041e92937 Merge remote-tracking branch 'upstream/2022.12-rc' into diaspora-reshare 2022-12-14 09:19:41 +00:00
Michael f013c92487 Only search for empty quoted reshares (Diaspora type) 2022-12-13 23:26:58 +00:00
Michael ca8a89ed1c Use reshare with Diaspora like with ActivityPub 2022-12-13 23:19:19 +00:00
Hypolite Petovan d26b0ed5a2
Merge pull request #12407 from HankG/friendica-api-photo-endpoint-updates 
Friendica api photo endpoint updates
 2022-12-13 17:14:48 -05:00
Hank G 7072a71788
Update src/Module/Api/Friendica/Photoalbum/Index.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:52:28 -05:00
Hank G 2338a268d3
Update src/Module/Api/Friendica/Photoalbum/Show.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:52:21 -05:00
Hank G 6af4bfae21
Update src/Module/Api/Friendica/Photoalbum/Show.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:46:16 -05:00
Hank G ae8f1a1c5b
Update src/Module/Api/Friendica/Photoalbum/Show.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:45:56 -05:00
Hank G 7bb60776c6
Update src/Module/Api/Friendica/Photoalbum/Show.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:45:49 -05:00
Hank G d74345782a
Update src/Module/Api/Friendica/Photoalbum/Index.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:45:34 -05:00
Hank Grabowski 5288ed46d4 Remove extraneous comment and fix whitespace between lines for style 2022-12-13 16:04:03 -05:00
Hank Grabowski 0b2c013db4 Fix space missing after if style error in src/Module/Api/Friendica/Photoalbum/Show.php 2022-12-13 15:59:45 -05:00
Hank Grabowski 8576610c54 Fix copyright header issues... 2022-12-13 15:58:03 -05:00
Hank Grabowski 991c5fa6de Add latest_first parameter to photo gallery listing Friendica API endpoint 2022-12-13 15:41:24 -05:00
Hank Grabowski 4fc01c93ce Add photo album show endpoint that lists photos in an album 2022-12-13 14:16:08 -05:00
Hank Grabowski 5b52533749 Fix Friendica API Photo Album list documentation to reflect endpoint 2022-12-13 14:14:58 -05:00
Hank Grabowski 951b221e21 Fix Friendica API Photo Album list documentation to reflect endpoint 2022-12-13 13:31:10 -05:00
Hank Grabowski e1823c7138 Add Photo Album index endpoint to Friendica API 2022-12-13 13:28:34 -05:00
Hank Grabowski 800f94495b Add Photo album cache flushes to Friendica Photo endpoints 2022-12-13 13:27:23 -05:00
Hank Grabowski 8f56aa316b Allow album to be empty string thus defaulting to i10n "Wall Photos" like in UI 2022-12-13 12:48:50 -05:00
Hypolite Petovan 27c738f90f
Merge pull request #12395 from HankG/fix-photo-get-without-scale-arg 
Fix Friendica Photo GET API endpoint to work without explicit scale term
 2022-12-12 13:00:19 -05:00
Hank Grabowski 4e5794c99d Update Friendica Photo API endpoint fix to pass null for scale when not applied 2022-12-12 12:37:01 -05:00
Hank Grabowski 46607598f3 Fix Friendica Photo GET API endpoint to work without explicit scale term 2022-12-12 11:27:59 -05:00
Hypolite Petovan d60c405390
Merge pull request #12393 from annando/api-permissions 
API: Allow permissions for status posts
 2022-12-12 10:20:28 -05:00
Michael Vogel 0209c39e0a
Update src/Module/Api/Twitter/Statuses/Update.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-12 15:51:14 +01:00
Michael 7dfe517c77 Redirect in a different way 2022-12-12 11:24:20 +00:00
Michael 5312b23f03 Don't send the header 2022-12-12 03:13:24 +00:00
Michael a2f386cd2f Transmit header before creating user list 2022-12-12 02:43:32 +00:00
Michael cfd09663e7 Don't display pending requests 2022-12-12 02:33:57 +00:00
Michael 89efa73195 Fix tests 2022-12-11 22:56:56 +00:00
Michael d05910a6e5 API: Allow permissions for status posts 2022-12-11 22:48:43 +00:00
Michael ff5da9bc71 API: Use "contact" for own relations 2022-12-11 22:26:30 +00:00
Michael bf7df13855 Add more BlurHash to avoid not being able to display some picture 2022-12-11 09:56:30 +00:00
Michael 62376d2e62 Only calculate the last login on a "date" level 2022-12-11 03:26:45 +00:00
Michael a65aa75234 Issue 12367: Calculate relative date on "date" level instead of "datetime" 2022-12-11 03:24:36 +00:00
Michael Vogel 46660c9462
Merge pull request #12364 from MrPetovan/bug/warnings 
Address several warning messages
 2022-12-10 18:10:24 +01:00
Hypolite Petovan 71a7f2d503 Remove parameter-less call of OStatus\Salmon module in DFRN\Notify 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1342615279
 2022-12-10 11:45:53 -05:00
Hypolite Petovan d87585477c Delete introductions when referenced contact id doesn't exist anymore in Ping module 
- Address part of https://github.com/friendica/friendica/issues/11993#issuecomment-1338134893
 2022-12-10 11:42:03 -05:00
Hypolite Petovan 7aa5407bbd Remove superfluous strlen call in Module\Tos 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1342617099
 2022-12-10 11:38:42 -05:00
Hypolite Petovan b1860d4121 Check for last-activity value before feeding it to strtotime in Module\NoScrape 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1340019523
 2022-12-10 11:38:41 -05:00
Michael 498a957009 The appearanxe of the link preview is now configurable 2022-12-07 07:02:04 +00:00
Michael 6965614f00 API: Only search for direct hit without offset 2022-12-06 18:47:43 +00:00
Hypolite Petovan 32a9f39768
Merge pull request #12333 from annando/issue-12327 
Issue 12327: Convert avatars to static
 2022-12-04 23:30:58 -05:00
Michael 5bff6f38d7 Issue 12327: Convert avatars to static 2022-12-04 23:31:23 +00:00
Michael 4f98d2c74a Issue 11915: Show reshared posts for contacts 2022-12-04 21:57:58 +00:00
Michael 5c74113bf6 Issue 12275: Banner upload via avatar does work now 2022-12-04 16:33:29 +00:00
Hypolite Petovan 552a30e1f3
Merge pull request #12329 from annando/blurhash 
Use the blurhash when the remote picture doesn't load
 2022-12-04 10:34:30 -05:00
Michael cfe5101b9b Use the blurhash when the remote picture doesn't load 2022-12-04 14:58:53 +00:00
Hypolite Petovan a0752b1161 Escape HTML in event mapping callback 
- This prevents arbitrary Javascript from being executed from the calendar view
 2022-12-04 06:37:37 -05:00
Hypolite Petovan 2f42606c43 Add information about BBCode availability in event fields 2022-12-04 06:37:37 -05:00
Hypolite Petovan 349436a77a Fix event start time not being properly converted to UTC 
- This was triggering unexpected time comparison errors
 2022-12-04 06:37:36 -05:00
Hypolite Petovan 1b71b963d7 Fix description not being populated in event form when there's a validation error 2022-12-04 06:37:36 -05:00
Michael e5a531d3b5 Simplify "last-activity" handling 2022-12-04 07:17:26 +00:00
Michael 1d8c9276f3 Issue 10518: "last-activity" instead of "login_date" 2022-12-04 07:03:11 +00:00
Michael 16b76919c0 Rules added 2022-12-03 21:15:08 +00:00
Michael b6f7d31036 API: Central way to fetch the system rules 2022-12-03 20:18:19 +00:00
Michael 36c7aea214 Debug code removed 2022-12-03 15:37:40 +00:00
Michael e4dda7d2ca Issue 11553: Reliably return the user's contacts 2022-12-03 14:19:48 +00:00
Hypolite Petovan 34f21b40f4 Move missing POST part of Profile\Photos from mod/photos 2022-12-01 17:57:29 -05:00
Hypolite Petovan 84b2a35e05 Add new public_calendar additional feature 
- This gives anonymous access to public events
 2022-12-01 08:06:07 -05:00
Hypolite Petovan ae76fa1174 Remove unused first parameter from BaseProfile::getTabsHTML 
- Add expected Profile::load call to Profile\Photos module
 2022-12-01 08:03:35 -05:00
Hypolite Petovan b83526ad0b Tighten profile restriction feature 
- Prevent feed access to restricted profiles
- Rework display of restricted profiles with a redirect to the profile/restricted route
- Normalize permission checking with IHandleUserSession->isAuthenticated
- Remove unusable "nocache" parameter in feed module because session isn't initialized
- Reword setting name and description
 2022-12-01 08:03:35 -05:00
Hypolite Petovan 0d53c69610 Remove unused theme info value "events_in_profile" 
All public events (event if they are ownded by other users) are visible
 2022-12-01 08:03:34 -05:00
Hypolite Petovan 2baa56d478
Merge pull request #12298 from annando/api-suggestions 
Contact suggestions are now cached
 2022-12-01 05:25:44 -05:00
Michael 1d00947bcd Don't fetch sugestions for the system user / catch error on contact timeline 2022-12-01 07:07:59 +00:00
Hypolite Petovan 1b0f7e5add
Merge pull request #12304 from HankG/add-dismissed-field-to-mastodon-notifications 
Add dismissed field to mastodon notifications
 2022-11-30 14:55:09 -05:00
Hank G f61dbf76a7
Update src/Module/Api/Mastodon/Notifications.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 14:39:00 -05:00
Hank Grabowski a2559d6241 Add 'include_all' parameter on Mastodon API endpoint 
Maintains old functionality of only returning non-dismissed notifications while adding ability to get list of dismissed and non-dismissed notifications
 2022-11-30 14:24:46 -05:00
Hank Grabowski 5b5c38f9ab Fix broken dismiss endpoint on Mastodon notifications API 2022-11-30 14:11:39 -05:00
MarekBenjamin 8f5d6fdf72
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-30 18:19:18 +01:00
MarekBenjamin e4fd9d425f
Update src/Module/Media/Photo/Upload.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 18:16:55 +01:00
MarekBenjamin f9c0d5a14b
Update src/Module/Media/Photo/Upload.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 18:16:42 +01:00
Matthias Moritz 2035a7a178 Merge branch 'bug-noLocalPosts' of https://github.com/matthiasmoritz/friendica into bug-noLocalPosts 2022-11-30 13:20:50 +01:00
Matthias Moritz 71f4dd0d20 Update Status.php 
Instead of removing AP, added Protocol::DFRN to the list of networks.
 2022-11-30 13:19:31 +01:00
Matthias Moritz 7676aa7908
Merge branch 'friendica:develop' into bug-noLocalPosts 2022-11-30 12:18:48 +01:00
Matthias Moritz da93373e8d Fix #12262 - shared friendica posts are filtered on status page 
Native shares from the same Instance (or maybe all Friendica instances) were filtered out from the users home. With this commit they now appear on the users Profile/Status
 2022-11-30 12:15:58 +01:00
Michael f31e617f5d Contact suggestions are now cached 2022-11-30 05:59:27 +00:00
Marek Bachmann 79235b6db1 Removed redundant maximagesize = INF statements 2022-11-30 05:17:48 +01:00
Marek Bachmann bb9afc520b Added getBytesFromShorthand at the remaining places. 2022-11-30 04:13:10 +01:00
Marek Bachmann ca7af7a64b Merge branch 'develop' into show_image_upload_limit 2022-11-30 02:28:15 +01:00
Marek Bachmann 99e1c64b1a Added info that shorthands can be used for maxfilesize Admin Site 2022-11-30 02:16:48 +01:00
MarekBenjamin 72b3bbb23c
Update src/Module/Admin/Site.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-30 01:49:53 +01:00
Marek Bachmann 7d86cb1a1e Removed Trends.php which for what ever reason found its way in my branch under src/Module/Api/Mastodon but is not present in friendica:develop 2022-11-30 01:40:21 +01:00
Marek Bachmann c03784eaa9 wanted to use a constant for the shorthand regex to be used in the form input templates and to check maximagesize post value. But Input field seems to require the regex without enclosing "/.../", so remove const for now 2022-11-30 01:26:08 +01:00
Marek Bachmann d44968cd10 split-off! Trends.php allow shorthands in the system.maximagesize 2022-11-30 01:26:08 +01:00
Marek Bachmann 9c383e2004 allow shorthands in the system.maximagesize 2022-11-30 01:26:08 +01:00
Michael 8eda9dfe7c Fix warning 'Undefined array key "name"' 2022-11-29 23:21:27 +00:00
MarekBenjamin 3cf0b9b9fd
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-29 21:58:46 +01:00
Michael 8b41d62a88 API: Speed improvements 2022-11-29 18:45:30 +00:00
Marek Bachmann 77c68d10e8 Merge branch 'develop' into show_image_upload_limit 2022-11-29 00:28:05 +01:00
Michael Vogel 7898f9cccb
Update src/Module/Api/Mastodon/Trends/Links.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 21:42:34 +01:00
Michael de76e860ad API: Added trending links 2022-11-28 20:19:57 +00:00
Michael bded1c3989 Only use items that had originally been posted in the last week 2022-11-28 14:51:37 +00:00
Michael 0e160040d4 Code standards 2022-11-28 10:54:26 +00:00
Michael c00004f6ea API: Tredning statuses added 2022-11-28 09:30:41 +00:00
Michael 73ba7d8005 Coding styles 2022-11-28 06:52:55 +00:00
Michael f7167acc74 Standards 2022-11-28 04:07:25 +00:00
Michael 56c4727fe1 Merge branch 'api-tags' of github.com:annando/friendica into api-tags 2022-11-28 04:04:35 +00:00
Michael 934766c364 Trim the tag 2022-11-28 04:04:27 +00:00
Michael Vogel 4e6b6fd76b
Update src/Module/Api/Mastodon/FollowedTags.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-11-28 05:00:08 +01:00
Michael 85f57e69fa Issue 12191: We can now follow and unfollow tags via API 2022-11-28 03:29:43 +00:00
Michael a6d060b0e4 Merge remote-tracking branch 'upstream/develop' into api-tags 2022-11-28 02:13:20 +00:00
Marek Bachmann d43e393921 and now the missing ')' at the correct position 2022-11-28 01:16:54 +01:00
Marek Bachmann 5b2ac7b944 Added missing ')' 2022-11-28 01:11:02 +01:00