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

10436 commits

Author SHA1 Message Date
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
c7e53cb9b4 Use account-user-view entry to instantiate Api\Mastodon\FollowRequest objects 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1354395861
 2022-12-18 01:03:37 -05:00
Hypolite Petovan
43aa9cddc5 Trim terms of service rules before turning them to an array 2022-12-17 21:13:52 -05:00
Michael
ed520a3f39 Fix image grid in shared Friendica posts 2022-12-17 22:07:14 +00: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
Hypolite Petovan
c69705d34e
Merge pull request #12446 from annando/preview-image 
Fix: Images must not be removed on preview
 2022-12-17 01:25:13 -05:00
Michael
2e6ab0e312 Fix: Images must not be removed on preview 2022-12-17 05:48:09 +00:00
Philipp
44b2b97e80
Merge pull request #12445 from MrPetovan/bug/12382-tag-attachment 
Exclude [attachment] from tag search
 2022-12-17 02:23:18 +01:00
Hypolite Petovan
d609d70bd2 Exclude [attachment] from tag search 2022-12-16 20:06:37 -05:00
Hypolite Petovan
c60464a4be Catch exceptions in Model\Gserver::cleanURL 
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1354393419
 2022-12-16 17:39:40 -05:00
Philipp
b0cc0f0d7b
Add load(true) for ViewDefinitions as well 2022-12-16 22:05:32 +01:00
Philipp
1c789d487b
Include DBA definitions from Hooks again 2022-12-16 21:59:32 +01: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
2497817c2a Ward against empty siteinfo in Text\BBCode::embedURL 
- Address https://github.com/friendica/friendica/issues/11994#issuecomment-1349593196
 2022-12-15 23:33:02 -05: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
Hypolite Petovan
590f92ba42
Merge pull request #12434 from MarekBenjamin/issue_make_balancing_optional 
Removed balancing of image grid
 2022-12-15 15:49:20 -05:00
Marek Bachmann
91cc6d5a94 Add unbalanced imagegrid generation 2022-12-15 21:29:14 +01: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
0128bbdb08
Merge pull request #12426 from MrPetovan/task/12237-ACL-meta-groups-doc 
Add documentation about the ACL autocomplete fields
 2022-12-15 06:22:14 +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
Tobias Diekershoff
eb856275f2
Merge pull request #12416 from MrPetovan/task/remove-clear-body-attach 
Remove obsolete `<div class="clear"></div>` from body-attach div
 2022-12-15 06:05:22 +01:00
Hypolite Petovan
8a6da56738 Remove obsolete <div class="clear"></div> from body-attach div 2022-12-14 22:35:12 -05: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
07520719f7 Add documentation about the ACL autocomplete fields 2022-12-14 21:57: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
d9361f2b81 Improve code standards in Model\Item 2022-12-13 09:33:01 -05:00
Marek Bachmann
290b14a000 Fixed image grid when exactly ONE portrait and ONE landscape is attached 2022-12-13 00:39:39 +01:00
MarekBenjamin
c554af9c30
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-12 19:07:09 +01: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
a8428264f0 Use is_int not intval to return Photo->createFromId back to original version 2022-12-12 12:38:45 -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
MarekBenjamin
d2b23d57e4
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-12 17:59:42 +01: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
Hypolite Petovan
c8d4b73871
Merge pull request #12391 from annando/issue-12338 
Issue 12338: Use redirect for "about" and "about/more"
 2022-12-12 09:39:12 -05: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
MarekBenjamin
e4702ed464
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 22:25:47 +01:00
Hypolite Petovan
baf2f7565a
Merge pull request #12390 from annando/fixes 
Only reshare the author's posts on `MIRROR_NATIVE_RESHARE`
 2022-12-11 15:05:47 -05:00
Hypolite Petovan
0d95535137
Merge pull request #12389 from annando/fatal 
Handle some fatal errors
 2022-12-11 15:04:54 -05:00
Michael
afd1dba774 Issue 12338: Use redirect for "about" and "about/more" 2022-12-11 19:50:10 +00:00
Michael
2f3f41ed9c Merge remote-tracking branch 'origin/2022.12-rc' into fixes 2022-12-11 19:00:59 +00:00
Marek Bachmann
eb1cfd09a9 added more sophisticated column balancing logic for portraits and landscapes 2022-12-11 18:25:19 +01:00
MarekBenjamin
a5aa44f189
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 18:24:27 +01:00
Michael
5d3248d57b Handle some fatal errors 2022-12-11 16:48:36 +00:00
Marek Bachmann
58cc270da8 fixed bug in portrait iteration 
shortened var names

added some comments
 2022-12-11 17:09:28 +01:00
MarekBenjamin
23f31883f5
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-11 16:56:33 +01:00
Hypolite Petovan
a79be5e697 Add Clock classes to deal with "now" times in tests 
- [Composer] Add psr/clock dependency
 2022-12-11 10:12:23 -05:00
Michael Vogel
884a265c5a Some small fixes 2022-12-11 11:21:02 +01:00
Michael
3ce4a1fee4 Avoid error when image couldn't be fetched 2022-12-11 10:12:20 +00:00
Michael
bf7df13855 Add more BlurHash to avoid not being able to display some picture 2022-12-11 09:56:30 +00:00
Hypolite Petovan
183e9dc7b2
Merge pull request #12383 from annando/issue-12367 
Issue 12367: Calculate relative date on "date" level instead of "datetime"
 2022-12-10 23:55:05 -05:00
Michael
fc1ef084f4 Simplify variable name 2022-12-11 04:16:58 +00:00
Michael
5e176b52a5 Issue 12285: Show sharing notification only once 2022-12-11 04:11:29 +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
MarekBenjamin
1454f3bc2a
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-10 23:59:51 +01:00
Marek Bachmann
fe2c4f7c4b Restored $s = $hook_data['html']; call which was removed on error 2022-12-10 23:47:37 +01:00
Marek Bachmann
412ba461e7 Removed unused imports 2022-12-10 23:45:42 +01:00
Marek Bachmann
2eb170bdbd Added some logic for image grid column balancing 2022-12-10 23:37:03 +01:00
Hypolite Petovan
04945f9c98
Merge pull request #12381 from annando/issue-11875 
Issue 11875: Fetch post on activity
 2022-12-10 17:20:38 -05:00
Marek Bachmann
cc048bca38 remove old code 2022-12-10 22:58:43 +01:00
Marek Bachmann
d786f225ee Added image grid generation to addVisualAttachments 2022-12-10 22:54:50 +01:00
Michael
1a1e452fae Issue 11875: Fetch post on activity 2022-12-10 21:48:00 +00:00
Michael
539ac4f2b8 Fix "part" calculation for splitted posts 2022-12-10 21:23:21 +00:00
MarekBenjamin
c7811576cc
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-10 22:17:26 +01:00