tobias/friendica
1
0
Fork 0
Code Pull requests Activity
35389 commits 2 branches 61 tags 203 MiB
Commit graph

35389 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Marek Bachmann 2794100cbc Fixed meaning of "maximagesize" = 0 --> infinity 2022-11-30 02:16:04 +01:00
Marek Bachmann 49db646922 Merge remote-tracking branch 'origin/show_image_upload_limit' into show_image_upload_limit 2022-11-30 01:58:32 +01:00
Marek Bachmann 0ea219f728 Use previously already available field.5 for short hand pattern ad admin page for maximagesize 2022-11-30 01:58:22 +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 b2f962c0ce Merge remote-tracking branch 'origin/show_image_upload_limit' into show_image_upload_limit 2022-11-30 01:26:37 +01:00
Marek Bachmann 978fe26f4c Added Strings::getBytesFromShorthand() for file size check at upload and new message.po 2022-11-30 01:26:08 +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
Marek Bachmann e73451d89b Added Strings::getBytesFromShorthand() for file size check at upload and new message.po 2022-11-30 01:22:38 +01:00
Marek Bachmann 10e0672981 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:15:42 +01:00
Marek Bachmann 25ba8bfb53 allow shorthands in the system.maximagesize 2022-11-30 01:05:32 +01:00
MarekBenjamin 3cf0b9b9fd
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-29 21:58:46 +01:00
Hypolite Petovan 24e4dfa541
Merge pull request #12293 from annando/report-status 
Added status to the report
 2022-11-29 15:01:57 -05:00
Michael 8eca961aeb Added status to the report 2022-11-29 19:50:12 +00:00
Michael Vogel dddf17b5c5
Merge pull request #12290 from MrPetovan/bug/frio-contact-follow 
[frio] Add page wrapper to contact follow page
 2022-11-29 19:59:10 +01:00
Hypolite Petovan ebe512edfd
Merge pull request #12292 from annando/api-speed 
API: Speed improvements
 2022-11-29 13:55:33 -05:00
Michael 8b41d62a88 API: Speed improvements 2022-11-29 18:45:30 +00:00
Hypolite Petovan c0c414ab95 [frio] Add page wrapper to contact follow page 2022-11-29 06:37:41 -05:00
Marek Bachmann 77c68d10e8 Merge branch 'develop' into show_image_upload_limit 2022-11-29 00:28:05 +01:00
Hypolite Petovan 624231c665
Merge pull request #12289 from annando/fatal 
Fix fatal errors because of unknown function/variable names
 2022-11-28 16:46:19 -05: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 437419bbd9 Updated database.sql 2022-11-28 20:22:08 +00: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
Hypolite Petovan 1ec4c14501
Merge pull request #12287 from nupplaphil/bug/fix_router 
Fix Legacy Router class routing
 2022-11-28 14:52:01 -05:00
Michael e391328cbf Added changelog entry 2022-11-28 19:31:04 +00:00
Philipp Holzer 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
MarekBenjamin bfe220c344
Merge branch 'friendica:develop' into show_image_upload_limit 2022-11-28 10:53:50 +01:00
Michael c00004f6ea API: Tredning statuses added 2022-11-28 09:30:41 +00:00
Philipp 5e7e2b65b2
Merge pull request #12284 from tobiasd/20221128-de 
DE translation update THX  MarekBenjamin
 2022-11-28 08:12:53 +01:00
Michael 6b36bd893b API: Trending tags are added 2022-11-28 07:08:01 +00:00
Michael 73ba7d8005 Coding styles 2022-11-28 06:52:55 +00:00
Michael a7639a2341 Updated documentation 2022-11-28 06:46:18 +00:00
Tobias Diekershoff 3092975523 DE translation update THX MarekBenjamin 2022-11-28 07:00:11 +01: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 361908ce3b and the messages.po 2022-11-28 01:23:00 +01:00
Marek Bachmann d43e393921 and now the missing ')' at the correct position 2022-11-28 01:16:54 +01:00