keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
36164 commits 4 branches 0 tags 179 MiB
Commit graph

36164 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael
fbcc56d42d Changes after code review 2022-11-30 14:33:55 +00:00
Michael
1ced4673fe Indention 2022-11-30 13:35:57 +00: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
Michael Vogel
4a94078091
Merge pull request #12300 from matthiasmoritz/bug-noLocalPosts 
Fix #12262 - shared friendica posts are filtered on status page
 2022-11-30 13:37:40 +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
a01cdccb05 Check that an auto reshare is only done on the expected contact 2022-11-30 09:28:27 +00:00
Michael Vogel
cd3e842f76
Merge pull request #12296 from MrPetovan/bug/deprecated 
Address some PHP 8.1 deprecation notices
 2022-11-30 07:19:46 +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
00808326c2 message.po 2022-11-30 04:39:00 +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
037e181f82 use the existing function for format byte values to KiB, MiB, GiB 2022-11-30 04:34:40 +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
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
Hypolite Petovan
6c2f42ed03
Merge pull request #12294 from annando/tag-warnings 
Fix warning 'Undefined array key "name"'
 2022-11-29 19:36:51 -05: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
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
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