Commit graph

35828 commits

Author SHA1 Message Date
Hypolite Petovan 9b8b1be3e7
Merge pull request #12340 from nupplaphil/bug/friendica-12339
[frio] Fix preview function when creating posts
2022-12-05 20:49:03 -05: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
Marek Bachmann 76f4ba7685 Merge branch 'develop' into new_image_presentation
# Conflicts:
#	src/Object/Image.php
2022-12-05 23:36:57 +01:00
Philipp 8543174bf1
Merge pull request #12341 from annando/fix-small-preview
The BlurHash function must not change the original image
2022-12-05 21:45:37 +01:00
Michael a260e97b6f The BlurHash function must not change the original image 2022-12-05 20:38:21 +00:00
Philipp Holzer c6e627d45c
Fix preview function when creating posts 2022-12-05 21:10:14 +01:00
Marek Bachmann 733543505b Merge branch 'develop' into new_image_presentation 2022-12-05 16:54:12 +01:00
Hypolite Petovan 38fa76d6b5
Merge pull request #12336 from annando/imagick-blurhash
Support blurhash for Imagick
2022-12-05 08:12:56 -05:00
Michael e62be24e6b Swap conditions 2022-12-05 12:53:21 +00:00
Tobias Diekershoff 71c1530303
Merge pull request #12337 from foss-/patch-3
Update FAQ client list
2022-12-05 13:04:15 +01:00
foss- c632675976
Update FAQ client list
- add Android Mastodon F-Droid
- add TheDesk to macOS, Windows
- add Tooot Android Google Play link
- add Fedi GitHub link
- remove Mastonaut (unmaintained since April 2022 https://mastodon.technology/@brunoph/108138252725934908)
- remove Friendly (unmaintained since 2018)
2022-12-05 12:59:46 +01: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
Philipp 73742812d1
Merge pull request #12238 from MrPetovan/task/refactor-dcontact
New table "diaspora-contact" (new paradigm) v34 FINAL
2022-12-05 07:38:05 +01: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
Michael d5e005f90d [Database version 1498] New table "diaspora-contact" for Diaspora contacts (duh)
- Remove duplicated "author-uri-id" keys in view declarations
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
Hypolite Petovan 445a0b61dd
Merge pull request #12332 from annando/issue-11915
Issue 11915: Show reshared posts for contacts
2022-12-04 23:30:02 -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
Marek Bachmann 7833da5196 Merge branch 'develop' into new_image_presentation 2022-12-04 19:06:23 +01:00
Philipp 62f982cf7e
Merge pull request #12330 from annando/issue-12275
Issue 12275: Banner upload via avatar does work now
2022-12-04 17:51:11 +01: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
Hypolite Petovan 23a8245fb0
Merge pull request #12328 from nupplaphil/feat/php81_phpunit
Woodpecker Enhancements
2022-12-04 09:46:59 -05:00
Hypolite Petovan 10154e532e
Merge pull request #12326 from nupplaphil/feat/route_about
Add /about route
2022-12-04 09:43:19 -05:00
Philipp b3ca1e2bfb
Merge pull request #12325 from annando/blurhash
API: Support Blurhash
2022-12-04 15:25:33 +01:00
Philipp Holzer 10e423237e
Force phpunit execution at the opensocial node 2022-12-04 15:06:10 +01:00
Philipp Holzer f79c810236
Try PHP8.1 again 2022-12-04 14:53:14 +01:00
Philipp Holzer 1a8722c1f6
Add /about route 2022-12-04 14:47:31 +01:00
Michael a5be5b27e3 Support Blurhash 2022-12-04 13:29:21 +00:00
Philipp 3d73c452df
Merge pull request #12313 from MrPetovan/bug/12312-calendar-JS
Escape HTML in event mapping callback
2022-12-04 12:53:00 +01:00
Hypolite Petovan 82c2e686d7 Updating main translation file after updating a few strings 2022-12-04 06:42:12 -05: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