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

36100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff e1b45c7fba fix 2022-12-18 09:16:46 +01:00
Tobias Diekershoff 7beee99f31 regen CREDITS.txt 2022-12-18 09:15:31 +01:00
Tobias Diekershoff b3504dfdee
Merge pull request #12460 from annando/photo-api 
API: Fix interoperability between Friendica and Mastodon part
 2022-12-18 08:15:49 +01:00
Michael 1899c53516 API: Fix interoperability between Friendica and Mastodon part 2022-12-18 06:30:32 +00:00
Michael Vogel 49078069f9
Merge pull request #12442 from MrPetovan/bug/warnings 
Use account-user-view entry to instantiate Api\Mastodon\FollowRequestobjects
 2022-12-18 07:06:59 +01:00
Hypolite Petovan f7a8c109e9 Updated main translation file after adding a string 2022-12-18 01:04:04 -05:00
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
Michael Vogel af4164b86a
Merge pull request #12458 from MrPetovan/bug/12456-tos-rules 
Trim terms of service rules before turning them to an array
 2022-12-18 06:23:55 +01:00
Hypolite Petovan 43aa9cddc5 Trim terms of service rules before turning them to an array 2022-12-17 21:13:52 -05:00
Philipp 9a8f6f2150
Merge pull request #12457 from annando/image-grid-shared 
Fix image grid in shared Friendica posts
 2022-12-17 23:30:10 +01:00
Michael ed520a3f39 Fix image grid in shared Friendica posts 2022-12-17 22:07:14 +00:00
Philipp d25fc9de9b
Merge pull request #12359 from matthiasmoritz/calendar_default_view 
Calendar default view
 2022-12-17 19:05:57 +01:00
Hypolite Petovan 3756f933a6 Update main translation file after adding strings 2022-12-17 12:20:49 -05: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
Matthias Moritz 5817709562 Move vier version of calendat/calendar_head template to base 
- With the support for the remaining themes dropped, the base template wasn't used anymore
 2022-12-17 12:20:13 -05:00
Hypolite Petovan 60dd9bed5e
Merge pull request #12455 from tobiasd/20221217-security 
renewed the expiration date for the security.txt file
 2022-12-17 10:52:46 -05:00
Tobias Diekershoff 704cc34981 renewed the expiration date for the security.txt file 2022-12-17 16:46:46 +01:00
Tobias Diekershoff b84ad5578f CHANGELOG updates for 2022.12 2022-12-17 16:40:13 +01:00
Philipp 057eefcbe2
Merge pull request #12451 from tobiasd/20221217-ru 
RU translation update THX SpcCw
 2022-12-17 15:37:55 +01:00
Tobias Diekershoff 847396ac38 RU translation update THX SpcCw 2022-12-17 15:24:59 +01:00
Michael 8397ccf37c Merge remote-tracking branch 'upstream/2022.12-rc' into diaspora-reshare 2022-12-17 12:27:35 +00:00
Philipp e73ef3e925
Merge pull request #12449 from tobiasd/20221217-lng 
DE, FR, HU and PL translation updates
 2022-12-17 08:56:20 +01:00
Tobias Diekershoff bde1d5b02e DE translation updates 2022-12-17 08:51:23 +01:00
Tobias Diekershoff ce14c81e1f HU translation updates THX Balázs Úr 2022-12-17 08:49:27 +01:00
Tobias Diekershoff 301fd13ced DE translation updates 2022-12-17 08:48:10 +01:00
Tobias Diekershoff d77fa441db FR translation updates THX kalon33 2022-12-17 08:41:38 +01:00
Tobias Diekershoff 912493f673 PL translation updates THX strebski 2022-12-17 08:40:27 +01: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
Philipp 22c1cd3cd1
Merge pull request #12440 from MrPetovan/bug/fatal-errors 
Catch exceptions in Model\Gserver::cleanURL
 2022-12-17 02:17:00 +01:00
Philipp f49c85e9b8
Merge pull request #12444 from MrPetovan/bug/11911-frio-modal-height 
[frio] Allow space for the upload button in the fbrowser modal
 2022-12-17 02:16:21 +01:00
Hypolite Petovan d609d70bd2 Exclude [attachment] from tag search 2022-12-16 20:06:37 -05:00
Hypolite Petovan 30973647a6 [frio] Allow space for the upload button in the fbrowser modal 2022-12-16 19:16:25 -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
Hypolite Petovan f37750d679
Merge pull request #12443 from nupplaphil/bug/dba_definition 
Include DBA/View definitions from Hooks again
 2022-12-16 17:05:16 -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
Philipp 63c661c783
Merge pull request #12435 from MrPetovan/bug/12344-calendar-profile-load 
Apply calendar owner custom theme
 2022-12-16 08:51:17 +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
Philipp a5931f7ffd
Merge pull request #12432 from MrPetovan/bug/12431-frio-forum-network 
[frio] Re-hide the forum contact row in network page
 2022-12-15 18:38:06 +01:00