Matthias Moritz
7a39dfe23b
Merge branch 'event-details-do-not-render-correctly-#12308' of https://github.com/matthiasmoritz/friendica into event-details-do-not-render-correctly-#12308
2022-12-02 21:01:20 +01:00
Matthias Moritz
f27d9cb73e
Update Event.php
2022-12-02 20:59:24 +01:00
Matthias Moritz
942d1e15f6
Merge branch 'friendica:develop' into event-details-do-not-render-correctly-#12308
2022-12-02 20:42:58 +01:00
Matthias Moritz
8b2a3805b6
Update Event.php
...
fixing double encoding issue in event view.
fixes #12308
2022-12-02 20:42:16 +01:00
98f4a68890
Ward against missing hidewall key in profile array in Model\Profile::getVCardHTML
...
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
- Add logging to troubleshoot unexpected case
2022-12-02 08:17:06 -05:00
34f21b40f4
Move missing POST part of Profile\Photos from mod/photos
2022-12-01 17:57:29 -05:00
84b2a35e05
Add new public_calendar additional feature
...
- This gives anonymous access to public events
2022-12-01 08:06:07 -05:00
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
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
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
2baa56d478
Merge pull request #12298 from annando/api-suggestions
...
Contact suggestions are now cached
2022-12-01 05:25:44 -05:00
1d00947bcd
Don't fetch sugestions for the system user / catch error on contact timeline
2022-12-01 07:07:59 +00:00
146f874c2e
Avoid 'Undefined array key "last-activity"'
2022-12-01 06:12:13 +00:00
8e0196fec3
Update the last activity in OAuth
2022-12-01 06:02:51 +00:00
431eb34a1c
Deactivate setting last activity
2022-12-01 05:57:29 +00:00
5201d87b3f
Reenable last acttivity update
2022-12-01 05:54:42 +00:00
910a76812a
Reenable worker call
2022-12-01 05:53:18 +00:00
c56e4222dc
Debug the failing test
2022-12-01 05:50:34 +00:00
8012968506
Check post existence before accessing its properties in Model\Post\UserNotification
2022-11-30 19:30:36 -05:00
ed1a879b7b
Use "utcNow"
2022-11-30 22:36:58 +00:00
f905220923
New field to show the day of the last activity
2022-11-30 22:34:50 +00:00
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
f61dbf76a7
Update src/Module/Api/Mastodon/Notifications.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-30 14:39:00 -05:00
b51b537711
Update src/Factory/Api/Mastodon/Notification.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-30 14:38:53 -05:00
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
a27ffda59f
Add dismissed field to Mastodon API Notification types
2022-11-30 14:23:20 -05:00
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
fbcc56d42d
Changes after code review
2022-11-30 14:33:55 +00:00
1ced4673fe
Indention
2022-11-30 13:35:57 +00:00
7402bc9f50
Merge pull request #12299 from annando/auto-reshare-fix
...
Check that an auto reshare is only done on the expected contact
2022-11-30 08:34:10 -05: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
a01cdccb05
Check that an auto reshare is only done on the expected contact
2022-11-30 09:28:27 +00:00
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
a3d8a59b00
Correctly output binary prefix values since base 2 is used for conversion
2022-11-30 04:37:08 +01:00
Marek Bachmann
75b01f669a
Check for inf values before try to converts bytes to binary prefix strings
2022-11-30 04:35:18 +01:00
Marek Bachmann
bb9afc520b
Added getBytesFromShorthand at the remaining places.
2022-11-30 04:13:10 +01:00
150c0e0750
Address some PHP 8.1 deprecation notices
...
- Replace a strstr call by strpos in Model\APContact
- Simplify conditions in Protocol\DFRN
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1331012289
2022-11-29 21:37:41 -05:00
Marek Bachmann
97a3587e58
Added handling as infinity if maxfilesize is set to 0
2022-11-30 02:44:48 +01:00
Marek Bachmann
ca7af7a64b
Merge branch 'develop' into show_image_upload_limit
2022-11-30 02:28:15 +01:00
Marek Bachmann
bbd1c34292
Wrapped all occurrences of DI::config()->get('system', 'maximagesize') with Strings::getBytesFromShorthand()
2022-11-30 02:26:56 +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
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
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
3288efb323
Fix fatal errors because of unknown function/variable names
2022-11-28 21:22:21 +00:00
0ba111d99c
Merge pull request #12288 from annando/api-tags
...
API: Added trending links
2022-11-28 16:13:37 -05: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
de76e860ad
API: Added trending links
2022-11-28 20:19:57 +00:00
d6a7303991
Merge pull request #12283 from annando/api-tags
...
Issue 12191: API tag handling
2022-11-28 14:52:29 -05:00
de25d3a7ee
Fix Legacy Router class routing
2022-11-28 20:14:37 +01:00
bded1c3989
Only use items that had originally been posted in the last week
2022-11-28 14:51:37 +00:00
0e160040d4
Code standards
2022-11-28 10:54:26 +00:00
c00004f6ea
API: Tredning statuses added
2022-11-28 09:30:41 +00:00
73ba7d8005
Coding styles
2022-11-28 06:52:55 +00:00
f7167acc74
Standards
2022-11-28 04:07:25 +00:00
56c4727fe1
Merge branch 'api-tags' of github.com:annando/friendica into api-tags
2022-11-28 04:04:35 +00:00
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
85f57e69fa
Issue 12191: We can now follow and unfollow tags via API
2022-11-28 03:29:43 +00:00
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
MarekBenjamin
6877f8a473
Update src/Module/Admin/Site.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-28 01:06:40 +01:00
Marek Bachmann
a01872a117
Merge branch 'develop' into show_image_upload_limit
...
# Conflicts:
# src/Util/Strings.php
# view/lang/C/messages.po
2022-11-27 23:52:58 +01:00
6d74d74a26
Issue 12149: Show that a post was reshared
2022-11-27 20:47:08 +00:00
0e2c2cd0e0
API: Support new tag endpoints
2022-11-27 19:22:41 +00:00
db987999b5
Return only one result in case of exact match in Api\Mastodon\Search
2022-11-27 08:28:52 -05:00
9fbdcb5459
Merge pull request #12277 from nupplaphil/mod/fbrowser
...
Move mod/fbrowser to src\Modules\Attachment|Photos\Browser
2022-11-27 07:55:55 -05:00
Philipp
b56e6f4b5b
Merge pull request #12280 from MrPetovan/bug/11804-delete-notifications-item
...
Remove related notifications when marking an item for deletion
2022-11-27 09:01:28 +01:00
25e1412174
Remove related notifications when marking an item for deletion
2022-11-26 21:48:26 -05:00
3ac3b3d2af
Perfection!
2022-11-27 01:52:49 +01:00
Philipp
272911527c
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-27 01:52:14 +01:00
4e53ba0c20
Cache the Module class
2022-11-27 01:48:52 +01:00
29190fae73
Update messages.po
2022-11-27 01:36:31 +01:00
012f486eb6
Adhere feedback
2022-11-27 01:34:59 +01:00
e6933a28da
Be more kindly :-)
2022-11-27 01:34:59 +01:00
50316bbb80
Move Browser & Upload to own namespace
2022-11-27 01:34:59 +01:00
051253a745
Move FileBrowser to own namespace & Bugfix album usage
2022-11-27 01:34:58 +01:00
Philipp
3607aa32ca
Apply suggestions from code review
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-27 01:34:58 +01:00
Philipp
e60dfef0d0
Update src/App/Arguments.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-27 01:34:58 +01:00
7c058153b5
Make PHP-CS happy
2022-11-27 01:34:58 +01:00
Philipp
801ee5c17f
Merge pull request #12276 from MrPetovan/bug/fatal-errors
...
Address a couple of fatal errors
2022-11-27 00:31:14 +01:00
Marek Bachmann
719c294fb5
Added info about upload_max_filesize to admin page
2022-11-26 23:45:58 +01:00
a5f601718f
Add a default value for $data['version'] in Model\GServer
...
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1327320541
2022-11-26 17:28:55 -05:00
b6d62003a6
Have a default value for $item['contact-id'] in Model\Post\Delayed
...
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1327030873
2022-11-26 17:27:36 -05:00
MarekBenjamin
765b50bde8
Update src/Util/Strings.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-26 23:14:21 +01:00
MarekBenjamin
ce56cabd9f
Update src/Util/Strings.php
...
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2022-11-26 23:12:46 +01:00
