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

35896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marek Bachmann eb87a2afbe Merge remote-tracking branch 'origin/doubled_code_for_scaling-dimensions' into doubled_code_for_scaling-dimensions 
# Conflicts:
#	src/Object/Image.php
 2022-12-28 16:43:47 +01:00
Marek Bachmann 7b34fdc715 removed one redundant check for height and width beeing set 2022-12-28 16:42:38 +01:00
MarekBenjamin 2c509ac2b2
Update src/Object/Image.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-28 16:32:33 +01:00
Marek Bachmann 88a7dd1afb Replaced the doubled code in for getScalingDimension with Images::getScalingDimensions($width, $height,$max) 2022-12-28 03:30:56 +01:00
Michael Vogel 59268c600c
Merge pull request #12544 from nupplaphil/bug/redirect 
Fix redirects
 2022-12-27 21:04:02 +01:00
Philipp 7b42657d1e
Fix redirects 2022-12-27 20:08:33 +01:00
Michael Vogel 4bb0fdc9a9
Merge pull request #12541 from MrPetovan/task/10974-screen-reader-part-3 
Remove counter-productive role="heading" and aria-level attributes
 2022-12-27 19:35:39 +01:00
Hypolite Petovan c19dd39fe3 Remove counter-productive role="heading" and aria-level attributes 2022-12-27 13:24:19 -05:00
Hypolite Petovan 89705afa9d
Merge pull request #12540 from annando/forum-thread 
Improved handling of forum mentions
 2022-12-27 12:13:36 -05:00
Michael b7e461d2f3 Improved handling of forum mentions 2022-12-27 17:01:40 +00:00
Philipp e0fa557f18
Merge pull request #12539 from annando/forum-thread 
Distribute forum comments only via the forum
 2022-12-27 17:51:22 +01:00
Michael ca0e3e3db7 Distribute forum comments only via the forum 2022-12-27 16:14:04 +00:00
Hypolite Petovan df7415a84e
Merge pull request #12538 from MarekBenjamin/patch-1 
Update sample-nginx-certbot.config
 2022-12-27 10:08:36 -05:00
MarekBenjamin 45fce5c15e
Update sample-nginx-certbot.config 
in accordance to 1dfe0fc603
 2022-12-27 15:00:25 +01:00
Hypolite Petovan 5c332af844
Merge pull request #12527 from nupplaphil/feat/request_id 
Introduce Request::getRequestId()
 2022-12-26 16:07:35 -05:00
Philipp 1dfe0fc603
adapt examples 2022-12-26 21:18:05 +01:00
Philipp 4f1bb0d274
Use X-REQUEST-ID for Error pages 2022-12-26 21:18:05 +01:00
Philipp 5584e7a4e5
Use X-REQUEST-ID for Logging 2022-12-26 21:18:04 +01:00
Philipp 10864e50c7
Adapt Logger\Introspection 
- Create an interface
- Add it as constructor parameter
 2022-12-26 21:18:04 +01:00
Philipp bfc1c157f1
Adapt UserSession 
- Move from App methods to UserSession methods
- Deprecate corresponding App methods
 2022-12-26 21:18:04 +01:00
Hypolite Petovan fa579c2346
Merge pull request #12534 from annando/activity-types 
Cleanup work with the activity types
 2022-12-26 10:26:45 -05:00
Michael 7c4b320f30 Cleanup work with the activity types 2022-12-26 15:08:46 +00:00
Michael Vogel cd1cc9ea43
Merge pull request #12533 from MrPetovan/bug/warnings 
Address several warning messages
 2022-12-26 15:40:58 +01:00
Hypolite Petovan 1be9d6b2cb Fix wrong variable reference in view wall_thread template 
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1364715116
 2022-12-26 09:26:57 -05:00
Hypolite Petovan 74229fe230 Ward against empty $target_item array (relocation) in Worker\Delivery->deliverDFRN 
- Address third part of https://github.com/friendica/friendica/issues/12488#issuecomment-1364487793
 2022-12-26 09:22:44 -05:00
Hypolite Petovan 482eeb7109 Fix wrong square bracket position in Worker\Delivery->deliverDFRN 
- Address second part of https://github.com/friendica/friendica/issues/12488#issuecomment-1364487793
 2022-12-26 09:11:37 -05:00
Hypolite Petovan e8420dcb71 Query expected photo.type field in Protocol\DFRN::relocate 
- Address first part of https://github.com/friendica/friendica/issues/12488#issuecomment-1364487793
 2022-12-26 09:10:55 -05:00
Tobias Diekershoff 1babd93c15
Merge pull request #12532 from annando/warning 
Fixes "E_WARNING: Undefined variable $subject"
 2022-12-26 14:27:19 +01:00
Michael e718d39ef0 Fixes "E_WARNING: Undefined variable $subject" 2022-12-26 12:14:45 +00:00
Tobias Diekershoff c1d74db7c9
Merge pull request #12531 from annando/read 
Activity "Read" is now stored
 2022-12-26 10:15:20 +01:00
Michael e05cbf46e1 Activity "Read" is now stored 2022-12-26 08:41:40 +00:00
Hypolite Petovan d8fe7e22b0
Merge pull request #12528 from annando/issue-12524 
Issue 12524: Fix first day of week
 2022-12-25 19:03:26 -05:00
Michael 46fdf696ee Issue 12524: Fix first day of week 2022-12-25 22:45:34 +00:00
Hypolite Petovan 08bfd37cac
Merge pull request #12518 from annando/reporter 
Reports: The reporting contact id is added
 2022-12-25 07:34:21 -05:00
Michael 80247bd1ca Fix tests 2022-12-25 10:57:27 +00:00
Michael c0c70427f3 Tests 2022-12-25 10:52:47 +00:00
Michael 5298cd73b3 We now store the violation as well 2022-12-25 10:44:06 +00:00
Michael fd53cf824f Tests 2022-12-25 07:40:19 +00:00
Michael cef4349421 Changed parameter order 2022-12-25 07:30:39 +00:00
Michael dc73cbe30c Simplified code 2022-12-24 23:33:21 +00:00
Michael 59a848c8ec Tests 2022-12-24 23:26:54 +00:00
Hypolite Petovan c376605dd2
Merge pull request #12519 from tobiasd/20221224-img 
issue 12515
 2022-12-24 10:28:26 -05:00
Michael 8a7d08ae28 Category added 2022-12-24 13:57:43 +00:00
Tobias Diekershoff 509715068a use correct field for ALT test 2022-12-24 14:57:03 +01:00
Tobias Diekershoff 8dcfafcfb0 issue 12515 2022-12-24 14:52:26 +01:00
Michael bf4d321aa3 Wrong variable 2022-12-24 08:09:23 +00:00
Michael 4c945850f4 Reports: The reporting contact id is added 2022-12-24 08:03:37 +00:00
Hypolite Petovan e9c6611965
Merge pull request #12516 from annando/api-report 
AP: We can now store received reports
 2022-12-23 22:00:45 -05:00
Michael 8cb85368ff Added comment 2022-12-23 22:48:57 +00:00
Michael 72e1d5d417 Fix storing reports 2022-12-23 22:43:32 +00:00