Commit Graph

33029 Commits

Author SHA1 Message Date
Michael 2b0c2a57a7 Merge remote-tracking branch 'upstream/2021.12-rc' into announce-notification 2022-01-23 19:38:16 +00:00
Michael 8bb2c9fc13 Support for desktop notifications for reshared posts 2022-01-23 19:37:52 +00:00
Philipp Holzer 7ec4d42461
Fix test 2022-01-23 20:29:46 +01:00
Philipp Holzer 9bcd0ffac8
Fix Addons-Load for StorageManager 2022-01-23 20:23:44 +01:00
Philipp 2c33a7803e
Merge pull request #11150 from annando/user-banner
First support for user header banner image
2022-01-23 20:10:42 +01:00
Philipp Holzer 71c7669066
Fix config usage during install process 2022-01-23 20:08:48 +01:00
Philipp Holzer 5fcb3e4901
Remove unused field 2022-01-23 20:08:33 +01:00
Philipp Holzer b123762459
Move language names to constant 2022-01-23 20:08:12 +01:00
Hypolite Petovan 3b19ccc351
Merge pull request #11175 from annando/lemmy
Improved handling of several object types
2022-01-23 05:47:26 -05:00
Michael 35e2ae3925 Merge remote-tracking branch 'upstream/2021.12-rc' into lemmy 2022-01-23 10:44:27 +00:00
Philipp c7a916269d
Merge pull request #11176 from tobiasd/20220123-ru
RU translations THX Alexander An
2022-01-23 11:00:29 +01:00
Tobias Diekershoff 5f49cf1505
RU translations THX Alexander An 2022-01-23 09:47:09 +01:00
Philipp b55c5d4d94
Merge pull request #11174 from MrPetovan/bug/11169-last_used-null
Handle null value for last_used fields in TrustedBrowsers and AppSpecificPassword
2022-01-23 08:56:44 +01:00
Michael ad526f5ad2 set the post-type to "poll" for incoming poll posts 2022-01-23 05:50:39 +00:00
Michael a8c6160dd7 Improved handling of several object types 2022-01-23 04:40:45 +00:00
Hypolite Petovan 1a4ec00fec Handle null value for last_used fields in TrustedBrowsers and AppSpecificPassword
- Remove obsolete reference to DBA::NULL_DATETIME
2022-01-22 21:10:20 -05:00
Hypolite Petovan 52b119cba3
Merge pull request #11170 from annando/lemmy
Lemmy support added
2022-01-22 20:58:50 -05:00
Michael Vogel 0476a82f4d
Merge pull request #11173 from nupplaphil/feat/api_cleanup
Move last legacy API tests
2022-01-22 21:48:55 +01:00
Philipp Holzer 7dd8f7102f
Remove deprecated static mock 2022-01-22 21:44:12 +01:00
Philipp Holzer 40b3c69eec
Adapt test names 2022-01-22 21:43:30 +01:00
Philipp Holzer fbefb599dc
Move last legacy API tests & adapt phpunit.xml 2022-01-22 21:29:43 +01:00
Philipp e6d940f7a3
Merge pull request #11171 from tobiasd/20220122-lng
DE, HU, SV and RU translation updates
2022-01-22 19:33:03 +01:00
Tobias Diekershoff 6bef359805 DE translation updates 2022-01-22 18:12:05 +01:00
Tobias Diekershoff 9a4aa440c9 SV update to the strings THX Kristoffer Grundström 2022-01-22 18:11:58 +01:00
Tobias Diekershoff 8f6ef346dd HU translation updated THX Balázs Úr 2022-01-22 18:11:25 +01:00
Tobias Diekershoff 7fcfe2893c RU translations THX Alexander An 2022-01-22 18:11:17 +01:00
Michael 43b9e39c6a Lemmy support added 2022-01-22 15:24:51 +00:00
Hypolite Petovan 732663ea6b
Merge pull request #11168 from annando/issue-8845
Issue 8845: Signature support for "created" and "expires" added
2022-01-21 11:09:46 -05:00
Michael dbd6d10536 Issue 8845: Signature support for "created" and "expires" added 2022-01-21 15:38:33 +00:00
Michael Vogel 4c37fcb2d3
Merge pull request #11167 from tobiasd/20220121-lng
missing "as" in string
2022-01-21 16:23:46 +01:00
Tobias Diekershoff d5665331fe
missing "as" in string
A translator from the SV team discovered a missing "as" in a string.
2022-01-21 14:23:30 +01:00
Michael 7d21f6f8d3 Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner 2022-01-19 18:41:31 +00:00
Hypolite Petovan 7206a0a351
Merge pull request #11166 from annando/group-by
Issue 10935: Improved "GROUP BY" handling
2022-01-19 09:16:04 -05:00
Michael a46b21590d use "ANY_VALUE" instead of "MAX" 2022-01-18 06:59:02 +00:00
Michael 615c6ca696 Issue 10935: Improved "GROUP BY" handling 2022-01-18 06:35:18 +00:00
Philipp 4298afd479
Merge pull request #11164 from MrPetovan/bug/11163-api-photo-create
Fix wrong default value in Module\Api\Friendica\Photo\Create::post
2022-01-18 01:04:50 +01:00
Philipp 3fcffcfc42
Merge pull request #11165 from nupplaphil/bug/pipeline
Remove "include/" folder from release-list
2022-01-18 00:56:11 +01:00
Philipp Holzer 8143fb7cc2
Remove "include/" folder from release-list 2022-01-18 00:39:20 +01:00
Hypolite Petovan babbdf58e6 Fix wrong default value in Module\Api\Friendica\Photo\Create::post
- The underlying Model\Photo::upload doesn't accept a null value for description
2022-01-17 16:46:43 -05:00
Tobias Diekershoff f4e71b57da
Merge pull request #11161 from MrPetovan/bug/11160-shared-bidi
Fix bidi support in shared posts
2022-01-17 14:07:06 +01:00
Hypolite Petovan aeb112ab5f Fix bidi support in shared posts
- Display was wrong when language direction was different between nickname and content
2022-01-17 07:39:05 -05:00
Michael 0450536621 Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner 2022-01-17 03:04:03 +00:00
Hypolite Petovan 55369613d4
Merge pull request #11159 from annando/api-finally-moved
API: The legacy API finally moved
2022-01-16 18:21:31 -05:00
Hypolite Petovan f7e087bb4b
Merge pull request #11158 from nupplaphil/sec/smarty
Bump smarty/smarty from 3.1.40 to 3.1.43
2022-01-16 17:53:23 -05:00
Michael 51dcfe134e fixing some more tests 2022-01-16 20:58:58 +00:00
Michael 55679a6021 Possibly fixing one test 2022-01-16 20:54:14 +00:00
Michael 71cf72cc8b Standards 2022-01-16 20:49:59 +00:00
Michael 1fd9557ef7 Merge branch 'api-finally-moved' of github.com:annando/friendica into api-finally-moved 2022-01-16 20:47:20 +00:00
Michael Vogel b38c9bed6f
Apply suggestions from code review
Co-authored-by: Philipp <admin+Github@philipp.info>
2022-01-16 21:47:12 +01:00
Michael 0f7b48c53e Fix wrong return value 2022-01-16 20:37:50 +00:00