bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity
36062 commits 3 branches 61 tags 178 MiB
Commit graph

10581 commits

Author SHA1 Message Date
Michael
088a3b6bc4 Merge remote-tracking branch 'upstream/develop' into reduce-update-contacts 2022-12-28 16:06:08 +00:00
Michael
954b95b039 Updated logging 2022-12-28 16:04:31 +00:00
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
Michael
54d308fb8a Fix indention 2022-12-28 15:16:07 +00:00
Michael
e0e2e45b91 Reduce the amount of "UpdateContact" worker calls 2022-12-28 14:56:12 +00:00
Tobias Diekershoff
5c3cb63952
Merge pull request #12549 from MrPetovan/task/12490-fakelink-button 
Turn fake link spans into full-fledged buttons
 2022-12-28 07:39:56 +01:00
Hypolite Petovan
a1dc6e2417 Switch rounding to flooring in Temporal::getRelativeDate 
- Add tests for regression
 2022-12-28 00:32:26 -05:00
Hypolite Petovan
53c0fffbec Add ClockInterface dependency to Temporal::getRelativeDate 
- Remove unused $format parameter
 2022-12-28 00:31:20 -05:00
Hypolite Petovan
a1070f4818 Turn fake link spans into full-fledged buttons 2022-12-27 21:47:35 -05: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
Philipp
7b42657d1e
Fix redirects 2022-12-27 20:08:33 +01: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
5c332af844
Merge pull request #12527 from nupplaphil/feat/request_id 
Introduce Request::getRequestId()
 2022-12-26 16:07:35 -05: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
Michael
7c4b320f30 Cleanup work with the activity types 2022-12-26 15:08:46 +00: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
Michael
e718d39ef0 Fixes "E_WARNING: Undefined variable $subject" 2022-12-26 12:14:45 +00:00
Michael
e05cbf46e1 Activity "Read" is now stored 2022-12-26 08:41:40 +00:00
Michael
46fdf696ee Issue 12524: Fix first day of week 2022-12-25 22:45:34 +00:00
Michael
5298cd73b3 We now store the violation as well 2022-12-25 10:44:06 +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
8a7d08ae28 Category added 2022-12-24 13:57:43 +00: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
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
Michael
ca12d1549b AP: We can now store received reports 2022-12-23 22:11:50 +00:00
Philipp
8fd0d4cdc0
Merge pull request #12513 from MrPetovan/bug/12507-rel-meeee 
Add call to HTML::checkRelMeLink in Worker\CheckRelMeProfileLink
 2022-12-23 21:12:06 +01:00
Hypolite Petovan
e4ac3c7922
Merge pull request #12510 from MarekBenjamin/email-notification_like-in-subject 
Change email subject to "(...)like in conversation(...)" for likes in…
 2022-12-23 07:57:28 -05:00
MarekBenjamin
3061cee083
Update src/Navigation/Notifications/Repository/Notify.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-23 11:14:38 +01:00
Hypolite Petovan
b2f2fbc4d4 Flatten conditions and add call to HTML::checkRelMeLink in Worker\CheckRelMeProfileLink 2022-12-23 02:44:49 -05:00
Hypolite Petovan
91c4ab2359 Add new xpathQuote and checkRelMeLink methods to Content\Text\HTML class 
- Add tests for both methods
 2022-12-23 02:41:22 -05:00
Michael
998b05095b A server is only reachable when the network can be detected 2022-12-23 06:48:53 +00:00
Michael
1e888ad6a4 Always check whe verified 2022-12-23 06:26:58 +00:00
Michael
179d776d0a Only check the homepage for active users with a homepage 2022-12-23 06:22:12 +00:00
Marek Bachmann
8393975cbc Merge remote-tracking branch 'origin/email-notification_like-in-subject' into email-notification_like-in-subject 2022-12-23 02:38:15 +01:00
Marek Bachmann
b876a9efcd Distinguish between comment likes and post likes. 2022-12-23 02:38:00 +01:00
MarekBenjamin
d52c988ebc
Update src/Navigation/Notifications/Repository/Notify.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-23 01:22:21 +01:00
Marek Bachmann
ef4f508f9b messages.po and and corrected typo in comment 2022-12-23 01:06:21 +01:00
Marek Bachmann
82eec270fa Change email subject to "(...)like in conversation(...)" for likes instead of "(...)new comment(...)" 2022-12-23 00:56:26 +01:00
Michael
99284222c1 Remove the activity 2022-12-22 22:08:42 +00:00
Michael
9fe70af85a AP: Support for "move" and "accept" from gup.pe 2022-12-22 21:58:51 +00:00
Michael
d75cd8a00a The GNU-Social import is removed 2022-12-21 22:21:22 +00:00
Hypolite Petovan
31e8574006
Merge pull request #12494 from annando/blurhash-fix 
Don't calculate the blurhash on images without a size
 2022-12-20 20:19:32 -05:00
Michael
e6f0e3c23e Don't calculate the blurhash on images without a size 2022-12-20 22:32:24 +00:00
Michael
69a9f9033d Three systems added to the federation statistics 2022-12-20 22:29:53 +00:00
Michael
de1c0f4c13 Don't display Diaspora reshares 2022-12-20 19:25:57 +00:00
Michael
4db4d1843d Merge remote-tracking branch 'upstream/develop' into diaspora-reshare 2022-12-20 06:58:36 +00:00
Philipp
8b3a9fc58a
Merge pull request #12485 from annando/errors-warnings 
Measures against several warnings and errors in the log
 2022-12-20 07:48:59 +01:00
Michael
bdc865afae Measures against several warnings and errors in the log 2022-12-20 06:22:11 +00:00
Tobias Diekershoff
c84f18ef66 bump VERSION to 2023.03-dev 2022-12-20 06:52:15 +01:00
Tobias Diekershoff
eeadc00e83 bump VERSION to 2022.12 2022-12-20 06:48:39 +01:00
Michael
e733adcaae Issue 12419: Quickhack to make GoToSocial work 2022-12-19 21:21:06 +00:00
Michael
d39f4014e4 Fix delivery problems with "reachable" test 2022-12-19 19:41:04 +00:00
Philipp
20374ab5a2
Merge pull request #12447 from MrPetovan/bug/12441-profile-contacts 
Retrieve contact records for the page visitor in several modules
 2022-12-19 17:14:43 +01:00
Philipp
c9f92f41fb
Merge pull request #12479 from MrPetovan/bug/deprecated 
Fix several Deprecated notices
 2022-12-19 17:13:12 +01:00
Hypolite Petovan
f2188835e7 Add logging and default value when JSON encode->decode fails in JsonLD::compact 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:22:05 -05:00
Hypolite Petovan
06ea61f0ed Provide default value for system.banner config key 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:17:57 -05:00
Hypolite Petovan
6a17223289 Ward against null value in language key of item array in Mastodon\Status object 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:11:12 -05:00
Hypolite Petovan
b1b0bfc280 Don't compute system.update_interval when it's -1 (disabled) 
- Address part of https://github.com/friendica/friendica/issues/12011#issuecomment-1357768936
 2022-12-19 10:05:21 -05:00
Hypolite Petovan
eb9af005f0 Fix module instantiation in Profile\Index module 
- Address https://github.com/friendica/friendica/issues/11992#issuecomment-1357441775
 2022-12-19 09:50:42 -05:00
Hypolite Petovan
29330a4205 Remove DI dependency in Profile\Status module 2022-12-19 09:50:42 -05:00
Hypolite Petovan
9da21bf680 Remove fallback contact query from Model\Contact::photoMenu 
- Correct contact is now supplied to the method
 2022-12-19 09:50:18 -05:00
Hypolite Petovan
2d9633a595 Retrieve contact records for the page visitor in Profile\Common module 2022-12-19 09:50:18 -05:00
Hypolite Petovan
472bde99a4 Retrieve contact records for the page visitor in Contact\Contacts module 2022-12-19 09:50:17 -05:00
Hypolite Petovan
fca1abbafe Retrieve contact records for the page visitor in Profile\Contacts module 2022-12-19 09:50:17 -05:00
Hypolite Petovan
36a8962333 Remove DI dependency in Contact\Hovercard module 2022-12-19 09:50:17 -05:00
Hypolite Petovan
7458721f9f Remove DI dependency in Profile\Common module 2022-12-19 09:50:16 -05:00
Hypolite Petovan
a633532475 Remove DI dependency in Contact\Contacts module 2022-12-19 09:50:16 -05:00
Hypolite Petovan
cef408c842 Remove DI dependency in Module\Profile\Contacts 2022-12-19 09:50:16 -05:00
Michael Vogel
8f22b4f33d
Update src/Model/GServer.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-19 15:22:21 +01:00
Michael
feb74b4d9a Don't perform a delivery to failing servers 2022-12-19 09:30:56 +00:00
Tobias Diekershoff
86a486f62b
Merge pull request #12472 from MrPetovan/bug/12466-profile-photos-aside 
Remove VCard for owner in Profile\Photos module
 2022-12-19 07:38:13 +01:00
Tobias Diekershoff
9d38671ec9
Merge pull request #12471 from MrPetovan/bug/12468-bbcode-img-code 
Skip literal text in ActivityPub\Transmitter::removePictures
 2022-12-19 07:03:31 +01:00
Tobias Diekershoff
b4db8fe8d2
Merge pull request #12469 from MrPetovan/bug/12462-tos-rules 
Skip blank lines in Tos module
 2022-12-19 06:58:42 +01:00
Hypolite Petovan
5392bafbb4 Remove VCard for owner in Profile\Photos module 
- Remove unused remote contact retrieval
- Remove contact list from aside for non-owner visitors
 2022-12-18 23:52:33 -05:00
Hypolite Petovan
2372e50e3b Skip literal text in ActivityPub\Transmitter::removePictures 2022-12-18 23:32:52 -05:00
Hypolite Petovan
39607b20e2 Convert custom profile field URL values to rel="me" links 2022-12-18 23:24:59 -05:00
Hypolite Petovan
76e9c4daa2 Fix link to profile page in custom profile fields settings 
- Previous link was leading to conversations
 2022-12-18 22:49:49 -05:00
Hypolite Petovan
07f7585e40 Remove DI dependency in Profile\Profile module 2022-12-18 22:49:18 -05:00
Hypolite Petovan
1cc0c1148e Skip blank lines in Tos module 2022-12-18 22:16:41 -05:00
Michael
e057b39f68 Issue 12185: Problems adding contacts 2022-12-18 15:43:35 +00:00
Philipp
40777d08c1
Merge pull request #12459 from MrPetovan/bug/12454-link-preview-translation 
Add missing t() call in Settings\Display module
 2022-12-18 09:26:04 +01:00
Michael
1899c53516 API: Fix interoperability between Friendica and Mastodon part 2022-12-18 06:30:32 +00: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
Hypolite Petovan
43aa9cddc5 Trim terms of service rules before turning them to an array 2022-12-17 21:13:52 -05:00
Michael
ed520a3f39 Fix image grid in shared Friendica posts 2022-12-17 22:07:14 +00: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
Michael
8397ccf37c Merge remote-tracking branch 'upstream/2022.12-rc' into diaspora-reshare 2022-12-17 12:27:35 +00: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
Hypolite Petovan
d609d70bd2 Exclude [attachment] from tag search 2022-12-16 20:06:37 -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
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
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
Tobias Diekershoff
f8b70ef9f0
Merge pull request #12424 from MrPetovan/task/10100-contact-relationship-prominence 
Make relationship filter widget more prominent in Module\Contact
 2022-12-15 06:24:32 +01:00
Tobias Diekershoff
0128bbdb08
Merge pull request #12426 from MrPetovan/task/12237-ACL-meta-groups-doc 
Add documentation about the ACL autocomplete fields
 2022-12-15 06:22:14 +01:00
Tobias Diekershoff
7d20798e97
Merge pull request #12427 from MrPetovan/bug/12399-suppress-notif-forum 
Suppress notifications for forum users in Module\Notifications\Ping
 2022-12-15 06:20:21 +01:00
Tobias Diekershoff
eb856275f2
Merge pull request #12416 from MrPetovan/task/remove-clear-body-attach 
Remove obsolete `<div class="clear"></div>` from body-attach div
 2022-12-15 06:05:22 +01:00
Hypolite Petovan
8a6da56738 Remove obsolete <div class="clear"></div> from body-attach div 2022-12-14 22:35:12 -05:00
Hypolite Petovan
2d624e900d Suppress notifications for forum users in Module\Notifications\Ping 
- The bell icon is already hidden for them but the notification number showed in the page title
 2022-12-14 22:01:14 -05:00
Hypolite Petovan
07520719f7 Add documentation about the ACL autocomplete fields 2022-12-14 21:57:14 -05:00
Hypolite Petovan
c54bca43a5 Make relationship filter widget more prominent in Module\Contact 2022-12-14 21:35:34 -05:00
Hypolite Petovan
e0cdb8a940 Show lock status even when feature is disabled in Admin/Features 2022-12-14 21:30:47 -05:00
Marek Bachmann
3576855e71 Small fix to show PHP.ini upload_max_filesize value also with binary prefix for consistency 2022-12-14 23:19:08 +01:00
Hypolite Petovan
0e543b2d4a
Merge pull request #12392 from annando/api-relations 
API: Use "contact" for own relations
 2022-12-14 08:06:14 -05:00
Michael
5041e92937 Merge remote-tracking branch 'upstream/2022.12-rc' into diaspora-reshare 2022-12-14 09:19:41 +00:00
Michael
f013c92487 Only search for empty quoted reshares (Diaspora type) 2022-12-13 23:26:58 +00:00
Michael
ca8a89ed1c Use reshare with Diaspora like with ActivityPub 2022-12-13 23:19:19 +00:00
Hypolite Petovan
d26b0ed5a2
Merge pull request #12407 from HankG/friendica-api-photo-endpoint-updates 
Friendica api photo endpoint updates
 2022-12-13 17:14:48 -05:00
Hank G
7072a71788
Update src/Module/Api/Friendica/Photoalbum/Index.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:52:28 -05:00
Hank G
2338a268d3
Update src/Module/Api/Friendica/Photoalbum/Show.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:52:21 -05:00
Hank G
6af4bfae21
Update src/Module/Api/Friendica/Photoalbum/Show.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:46:16 -05:00
Hank G
ae8f1a1c5b
Update src/Module/Api/Friendica/Photoalbum/Show.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:45:56 -05:00
Hank G
7bb60776c6
Update src/Module/Api/Friendica/Photoalbum/Show.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:45:49 -05:00
Hank G
d74345782a
Update src/Module/Api/Friendica/Photoalbum/Index.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2022-12-13 16:45:34 -05:00
Hank Grabowski
5288ed46d4 Remove extraneous comment and fix whitespace between lines for style 2022-12-13 16:04:03 -05:00
Hank Grabowski
0b2c013db4 Fix space missing after if style error in src/Module/Api/Friendica/Photoalbum/Show.php 2022-12-13 15:59:45 -05:00
Hank Grabowski
8576610c54 Fix copyright header issues... 2022-12-13 15:58:03 -05:00
Hank Grabowski
991c5fa6de Add latest_first parameter to photo gallery listing Friendica API endpoint 2022-12-13 15:41:24 -05:00
Hank Grabowski
4fc01c93ce Add photo album show endpoint that lists photos in an album 2022-12-13 14:16:08 -05:00
Hank Grabowski
5b52533749 Fix Friendica API Photo Album list documentation to reflect endpoint 2022-12-13 14:14:58 -05:00
Hank Grabowski
951b221e21 Fix Friendica API Photo Album list documentation to reflect endpoint 2022-12-13 13:31:10 -05:00
Hank Grabowski
e1823c7138 Add Photo Album index endpoint to Friendica API 2022-12-13 13:28:34 -05:00
Hank Grabowski
800f94495b Add Photo album cache flushes to Friendica Photo endpoints 2022-12-13 13:27:23 -05:00
Hank Grabowski
8f56aa316b Allow album to be empty string thus defaulting to i10n "Wall Photos" like in UI 2022-12-13 12:48:50 -05:00
Hypolite Petovan
d9361f2b81 Improve code standards in Model\Item 2022-12-13 09:33:01 -05:00
Marek Bachmann
290b14a000 Fixed image grid when exactly ONE portrait and ONE landscape is attached 2022-12-13 00:39:39 +01:00