Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 13:03:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
35868 commits 3 branches 64 tags 248 MiB
Commit graph

10455 commits

Author SHA1 Message Date
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
Hypolite Petovan
106dac5508
Merge pull request #12379 from annando/id-for-image 
ID added for list of images in a post
 2022-12-10 14:46:19 -05:00
Michael
870fd1a52b ID added for list of images in a post 2022-12-10 19:08:56 +00:00
Michael Vogel
46660c9462
Merge pull request #12364 from MrPetovan/bug/warnings 
Address several warning messages
 2022-12-10 18:10:24 +01:00
Michael Vogel
2722ef82cf
Merge pull request #12360 from MrPetovan/bug/deprecated 
Address several Deprecated messages
 2022-12-10 18:08:17 +01:00
Hypolite Petovan
2362e28c40
Merge pull request #12378 from annando/localprobe 
Diaspora added to localprobe
 2022-12-10 11:47:45 -05:00
Hypolite Petovan
71a7f2d503 Remove parameter-less call of OStatus\Salmon module in DFRN\Notify 
- Address https://github.com/friendica/friendica/issues/11993#issuecomment-1342615279
 2022-12-10 11:45:53 -05:00
Hypolite Petovan
a71fb8d7f3 Check for existence of a public contact id before deleting related notifications in Model\Contact 
- Address part of https://github.com/friendica/friendica/issues/11993#issuecomment-1338134893
 2022-12-10 11:42:04 -05:00
Hypolite Petovan
e78471c847 Throw exception when a few keys are missing from probe data array in Repository\DiasporaContact 
- Address part of https://github.com/friendica/friendica/issues/11993#issuecomment-1338134893
 2022-12-10 11:42:04 -05:00
Hypolite Petovan
d87585477c Delete introductions when referenced contact id doesn't exist anymore in Ping module 
- Address part of https://github.com/friendica/friendica/issues/11993#issuecomment-1338134893
 2022-12-10 11:42:03 -05:00
Hypolite Petovan
7aa5407bbd Remove superfluous strlen call in Module\Tos 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1342617099
 2022-12-10 11:38:42 -05:00
Hypolite Petovan
607d26e906 Ward against empty JsonLD::fetchElement result in ActivityPub\Receiver::processTags 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1336478368
 2022-12-10 11:38:42 -05:00
Hypolite Petovan
b1860d4121 Check for last-activity value before feeding it to strtotime in Module\NoScrape 
- Address https://github.com/friendica/friendica/issues/12011#issuecomment-1340019523
 2022-12-10 11:38:41 -05:00
Hypolite Petovan
c70d657885 Ward against invalid name from receiver in ActivityPub::storeReceivers 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:41 -05:00
Hypolite Petovan
f3dc69c226 Ensure strpos is provided a string in App::runFrontend 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:41 -05:00
Hypolite Petovan
fc246424a9 Provide default host value to hash() in Model\Item::guidFromUri 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:37 -05:00
Hypolite Petovan
0af2be14ee Check for parts key existence before performing strpos in Network\Probe 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:02 -05:00
Hypolite Petovan
1622ce0a99 Coalesce null activity name in ActivityPub\Processor 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:02 -05:00
Hypolite Petovan
e7574356d8 Replace parse_url with UriInterface instantiation in Model\APContact 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1338133783
 2022-12-10 11:38:02 -05:00
Michael
2761972742 Simplify lastname/firstname 2022-12-10 16:02:38 +00:00
Michael
ab1ff53b18 Diaspora added to localprobe 2022-12-10 15:59:11 +00:00
Hypolite Petovan
19d11c08d4 Change DiasporaContact->subscribe type to string 
- This avoids the expected "{uri}" placeholder to be URL-encoded in the string representation
 2022-12-10 09:23:29 -05:00
Michael
c6ca844f33 "networks" has to contain all probing fields 2022-12-10 12:35:05 +00:00
Michael
6496ed4c19 Remove testcode, improve rearrange 2022-12-10 12:14:23 +00:00
Michael
019bb56668 Issue 12373: Fix communication to Diaspora 2022-12-10 12:08:55 +00:00
MarekBenjamin
75d857c595
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-08 20:40:58 +01:00
Marek Bachmann
d270a98e86 Image grid logic 2022-12-08 20:39:51 +01:00
Hypolite Petovan
d9e69fc543 Fix OPTIONS responses 2022-12-08 10:10:40 -05:00
Hypolite Petovan
15eba181a0 Initialize parameter with $server for all Router cases including Maintenance mode 
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1339614287
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1339909728
 2022-12-08 10:10:23 -05:00
Michael
741469a5c5 Add images in a loop (preparation for a galery) 2022-12-08 07:16:25 +00:00
Michael
7d51fa47d5 Issue 12345: No link preview on DFRN posts 2022-12-08 05:49:25 +00:00
MarekBenjamin
74ff7bae59
Merge branch 'friendica:2022.12-rc' into new_image_presentation 2022-12-07 18:52:20 +01:00
Marek Bachmann
d590df9a72 set character encoding to utf-8 for parsing rendered-html 2022-12-07 18:50:16 +01:00
Marek Bachmann
99e20d1b00 Temporary hack to remove images after last text line by DOM inspection 2022-12-07 13:22:28 +01:00
Michael
498a957009 The appearanxe of the link preview is now configurable 2022-12-07 07:02:04 +00:00
Hypolite Petovan
8d1bc02f8f
Merge pull request #12349 from annando/hidewall 
Fix "Missing hidewall key" message
 2022-12-06 23:57:09 -05:00
Michael
e5ff71f839 Fix "Missing hidewall key" 2022-12-06 22:23:43 +00:00
Michael
6965614f00 API: Only search for direct hit without offset 2022-12-06 18:47:43 +00:00
Tobias Diekershoff
215c332a94
Merge pull request #12347 from annando/add-parents 
Fix post completion
 2022-12-06 19:21:22 +01:00
Michael
5e40b47a17 Fix post completion 2022-12-06 17:45:18 +00:00
Tobias Diekershoff
59088161e8 bump version to 2022.12-rc 2022-12-06 14:34:03 +01:00
Marek Bachmann
9778b60e64 cleaned up my git mess :-/ anyways, should work now 2022-12-06 01:14:15 +01:00
Marek Bachmann
2205ef0574 Merge remote-tracking branch 'origin/new_image_presentation' into new_image_presentation 
# Conflicts:
#	src/Model/Item.php
 2022-12-06 01:02:04 +01:00
Marek Bachmann
458f22d303 Support more than 2 images 2022-12-06 00:59:48 +01:00
Marek Bachmann
7fb0f018df First draft for using a image grid to display attached images. 2022-12-06 00:59:47 +01:00
Marek Bachmann
8145454707 Revert "Merge branch 'develop' into new_image_presentation" 
This reverts commit 76f4ba7685, reversing
changes made to 733543505b.
 2022-12-06 00:48:28 +01:00
Michael
a260e97b6f The BlurHash function must not change the original image 2022-12-05 20:38:21 +00:00
Marek Bachmann
733543505b Merge branch 'develop' into new_image_presentation 2022-12-05 16:54:12 +01:00
Michael
e62be24e6b Swap conditions 2022-12-05 12:53:21 +00:00
Michael
b93f100c97 Merge remote-tracking branch 'upstream/develop' into imagick-blurhash 2022-12-05 07:34:16 +00:00
Michael
6deb93256a Support blurhash for Imagick 2022-12-05 06:53:19 +00:00
Hypolite Petovan
818cdf83ca [Database version 1500] Remove obsolete table fcontact 2022-12-05 00:00:50 -05:00
Hypolite Petovan
ce69026964 [Database version 1499] Create new paradigm classes for Diaspora Contact 
- Switch table fcontact for dcontact in views
 2022-12-05 00:00:50 -05:00
Michael
ace80ca1b4 Use "author_handle" for the author handle extracted from Diaspora XML messages 
- We have structured data under the variable name "author"
- Remove unused $uid parameter from Diaspora::storeByGuid
- Convert $person parameter to just its URL in Diaspora::authorContactByUrl
- Flip parameters in getUriFromGuid to get rid of $onlyfound
 2022-12-05 00:00:49 -05:00
Hypolite Petovan
32a9f39768
Merge pull request #12333 from annando/issue-12327 
Issue 12327: Convert avatars to static
 2022-12-04 23:30:58 -05:00
Michael
2be0ad7697 Remove test code 2022-12-05 03:59:47 +00:00
Michael
08d64f3c57 Fix the function description 2022-12-05 03:46:40 +00:00
Michael Vogel
28c7fda6e9
Update src/Factory/Api/Mastodon/Status.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-05 04:37:04 +01:00
Marek Bachmann
fbd4b54656 Support more than 2 images 2022-12-05 04:23:34 +01:00
Marek Bachmann
6753eeab8b First draft for using a image grid to display attached images. 2022-12-05 03:27:51 +01:00
Michael
5bff6f38d7 Issue 12327: Convert avatars to static 2022-12-04 23:31:23 +00:00
Michael
4f98d2c74a Issue 11915: Show reshared posts for contacts 2022-12-04 21:57:58 +00:00
Michael
5c74113bf6 Issue 12275: Banner upload via avatar does work now 2022-12-04 16:33:29 +00:00
Hypolite Petovan
552a30e1f3
Merge pull request #12329 from annando/blurhash 
Use the blurhash when the remote picture doesn't load
 2022-12-04 10:34:30 -05:00
Michael
1c8690a872 Fix calls for pictures without blurhash 2022-12-04 15:14:43 +00:00
Michael
cfe5101b9b Use the blurhash when the remote picture doesn't load 2022-12-04 14:58:53 +00:00
Philipp
b3ca1e2bfb
Merge pull request #12325 from annando/blurhash 
API: Support Blurhash
 2022-12-04 15:25:33 +01:00
Michael
a5be5b27e3 Support Blurhash 2022-12-04 13:29:21 +00:00
Hypolite Petovan
a0752b1161 Escape HTML in event mapping callback 
- This prevents arbitrary Javascript from being executed from the calendar view
 2022-12-04 06:37:37 -05:00
Hypolite Petovan
2f42606c43 Add information about BBCode availability in event fields 2022-12-04 06:37:37 -05:00
Hypolite Petovan
349436a77a Fix event start time not being properly converted to UTC 
- This was triggering unexpected time comparison errors
 2022-12-04 06:37:36 -05:00
Hypolite Petovan
1b71b963d7 Fix description not being populated in event form when there's a validation error 2022-12-04 06:37:36 -05:00
Michael
e5a531d3b5 Simplify "last-activity" handling 2022-12-04 07:17:26 +00:00
Michael
1d8c9276f3 Issue 10518: "last-activity" instead of "login_date" 2022-12-04 07:03:11 +00:00
Hypolite Petovan
22e2578b23
Merge pull request #12322 from annando/api-rules 
API: Central way to fetch the system rules
 2022-12-03 17:24:52 -05:00
Michael
16b76919c0 Rules added 2022-12-03 21:15:08 +00:00
Michael
b6f7d31036 API: Central way to fetch the system rules 2022-12-03 20:18:19 +00:00
Michael
fa80c69d94 Only fetch the processes if needed 2022-12-03 19:44:50 +00:00
Hypolite Petovan
8cb7d4a9bd
Merge pull request #12320 from annando/issue-11553a 
Issue 11553: Reliably return the user's contacts
 2022-12-03 12:20:34 -05:00
Michael
36c7aea214 Debug code removed 2022-12-03 15:37:40 +00:00
Hypolite Petovan
303d556ab0 Fix last reference of replaced variable $owner_nick in Protocol\Feed::atom() 
- Address https://github.com/friendica/friendica/issues/11994#issuecomment-1336146405
 2022-12-03 10:19:04 -05:00
Michael
e4dda7d2ca Issue 11553: Reliably return the user's contacts 2022-12-03 14:19:48 +00:00