Hank Grabowski
a27ffda59f
Add dismissed field to Mastodon API Notification types
2022-11-30 14:23:20 -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
Hypolite Petovan
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
Michael
a01cdccb05
Check that an auto reshare is only done on the expected contact
2022-11-30 09:28: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
Hypolite Petovan
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
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
3288efb323
Fix fatal errors because of unknown function/variable names
2022-11-28 21:22:21 +00:00
Hypolite Petovan
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
Michael
de76e860ad
API: Added trending links
2022-11-28 20:19:57 +00:00
Hypolite Petovan
d6a7303991
Merge pull request #12283 from annando/api-tags
...
Issue 12191: API tag handling
2022-11-28 14:52:29 -05:00
Philipp
de25d3a7ee
Fix Legacy Router class routing
2022-11-28 20:14:37 +01: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
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
Michael
6d74d74a26
Issue 12149: Show that a post was reshared
2022-11-27 20:47:08 +00:00
Michael
0e2c2cd0e0
API: Support new tag endpoints
2022-11-27 19:22:41 +00:00
