clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
35,527 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

10247 Commits

Author SHA1 Message Date
Marek Bachmann 99e20d1b00 Temporary hack to remove images after last text line by DOM inspection 2022-12-07 13:22:28 +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
Hypolite Petovan 82972744a9
Merge pull request #12316 from VVelox/load_fix 
get the load average in a portable manner
 2022-12-03 05:38:55 -05:00
Zane C. Bowers-Hadley 8f82fb9a22 now with g 2022-12-03 04:34:17 -06:00
Zane C. Bowers-Hadley edaff99307 derp, minor fix 2022-12-03 04:31:04 -06:00
Zane C. Bowers-Hadley f664208157 get the load average in a portable manner 2022-12-03 04:24:49 -06:00
Hypolite Petovan e6f8b8c6e0 Ward against preg_replace_callback null return value in Strings::performWithEscapedBlocks 
- Add logging to troubleshoot potential issue with regex
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
 2022-12-03 04:20:27 -05:00
Hypolite Petovan 3b3192933d Ensure null values aren't processed in Content\Text\Markdown::toBBCode 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1335124938
 2022-12-03 04:20:27 -05:00
Michael edc6851f0e Issue 12302: Remote self is working again 2022-12-03 07:15:29 +00:00
Matthias Moritz 7a39dfe23b Merge branch 'event-details-do-not-render-correctly-#12308' of https://github.com/matthiasmoritz/friendica into event-details-do-not-render-correctly-#12308 2022-12-02 21:01:20 +01:00