1
1
Fork 0
Commit graph

36231 commits

Author SHA1 Message Date
8e9b3234f4
Merge pull request #12657 from annando/display-blocked
Mode depending control for the behaviour with blocked contacts
2023-01-12 07:48:44 -05:00
Daniel Siepmann
6633b0af4b
Properly handle feed item urls with surrounding whitespace
Some feeds might have whitespace around the URLs of each item.
This can't be handled by parse_url.
Therefore the incoming url is trimmed to not contain any surrounding
whitespace for proper handling.

Relates: #12658
2023-01-12 13:47:57 +01:00
8a902afde5 Updated messages.po - again 2023-01-12 07:06:24 +00:00
6cdafb6b63 Fix "Undefined constant Friendica\Content\Conversation::PARCEL_DIASPORA" 2023-01-12 06:57:31 +00:00
5b8752edd9 Updated messages.po 2023-01-12 06:35:49 +00:00
f542211189 Mode depending control for the behaviour with blocked contacts 2023-01-12 06:25:55 +00:00
ec54b303c5
Merge pull request #12655 from annando/fix-communication
Fix: Forum posts from some contacts weren't distributed
2023-01-11 17:04:41 -05:00
53e8b21ca3 Fix: Forum posts from some contacts weren't distributed 2023-01-11 21:55:32 +00:00
8596902abd
Merge pull request #12653 from nupplaphil/bug/config_revert_null
Revert Cache delete() behavior to stable version
2023-01-11 16:06:28 -05:00
fef10e8a57
Improve encapsulation 2023-01-11 22:00:29 +01:00
11a8bd17e3
Assure that deleted cat/keys are working as expected
- A deleted cache-key would delete a merged cache-key as well
- Deleting a key in the Model results in reloading the config to assure any value from underlying files
2023-01-11 21:53:34 +01:00
fd882abd80
Revert Cache delete() behavior to stable version 2023-01-11 21:10:59 +01:00
Philipp
eda65296f5
Merge pull request #12635 from MrPetovan/task/12629-contact-threads-tab
Replace remaining mentions of "Status" by "Conversations" or "Posts"
2023-01-11 19:50:38 +01:00
9f902571b7 Update main translation file after changing strings 2023-01-11 09:01:30 -05:00
5c8cd8fdd6 Replace remaining mentions of "Status" by "Conversations" or "Posts" 2023-01-11 09:01:29 -05:00
d0648b10ef Convert Content\Nav to dynamic object
- Remove DI dependency in Module\Apps
2023-01-11 09:01:24 -05:00
Michael Vogel
f17d1f359f
Merge pull request #12647 from MrPetovan/bug/12607-image-user-theme
Enable profile user theme on single photo display
2023-01-11 07:44:57 +01:00
120b78e30a Enable profile user theme on single photo display 2023-01-10 20:40:35 -05:00
Philipp
1fc7d5ae85
Merge pull request #12645 from MrPetovan/bug/warnings
Replace HTML regular expression by HTML::extractCharset in ParseUrl::getSiteInfo
2023-01-10 19:23:52 +01:00
3966b58965 Only show line number if it's provided in System::callstack
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1377373973
2023-01-10 10:41:20 -05:00
3fcafd1d50 Replace HTML regular expression by HTML::extractCharset in ParseUrl::getSiteInfo
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1374537440
2023-01-10 10:36:59 -05:00
5e2b655b43 Add implementation of HTTP Media Type
- Add charset extraction from DOMDocument
- TESTS!
2023-01-10 10:36:58 -05:00
f4b5d22396
Merge pull request #12644 from annando/improve-ignore
Improve the ignore behaviour
2023-01-10 09:05:48 -05:00
20a2cec0b0 Moved permission assigning / simplified block check 2023-01-10 05:59:25 +00:00
Philipp
4eea80bdd9
Merge pull request #12642 from MrPetovan/bug/fatal-errors
Address a few Fatal Errors
2023-01-09 23:14:05 +01:00
14e4c0db8e Check image property is set in Object\Image
- Property was either an object or null, strict comparison with "false" was inaccurate
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1374888800
2023-01-09 16:06:22 -05:00
b77f3a7525 Check for URI ID existence in Post\Media::insert
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1374538325
2023-01-09 16:06:22 -05:00
4d5d8e5b64 Add line number to output in System::callstack 2023-01-09 16:06:22 -05:00
670b518875 Include other unique key column in condition in Model\Tag:store
- Address https://github.com/friendica/friendica/issues/12486#issuecomment-1372640002
2023-01-09 16:06:22 -05:00
194b84141d Updated messages.po 2023-01-09 17:29:42 +00:00
4e0da578fa Merge remote-tracking branch 'upstream/develop' into improve-ignore 2023-01-09 17:23:10 +00:00
Michael Vogel
69a9c2c618
Merge pull request #12641 from MrPetovan/bug/warnings
Add yet another case to DateTimeFormat::fix
2023-01-09 18:20:58 +01:00
6bee344681 Add yet another case to DateTimeFormat::fix
- Address https://github.com/friendica/friendica/issues/12488#issuecomment-1372637862
2023-01-09 11:38:25 -05:00
79a646550f
Merge pull request #12643 from annando/item-origin
Fix some warnings on item creation
2023-01-09 11:34:56 -05:00
ee8ae5796a Updated messages.po again 2023-01-09 16:25:02 +00:00
840f25cc5c Improve ignoring of messages 2023-01-09 16:23:39 +00:00
214838ea3b Updated messages.po 2023-01-09 16:18:35 +00:00
cd3dbad2a8 Fix some warnings on item creation 2023-01-09 15:55:35 +00:00
e6f6087cac
Merge pull request #12638 from annando/collapse
Posts from contacts can now be collapsed
2023-01-08 19:23:57 -05:00
83dd49a43c Updated "messages.po" again 2023-01-08 23:26:26 +00:00
eb2c42a9fb Merge branch 'collapse' of github.com:annando/friendica into collapse 2023-01-08 23:15:35 +00:00
82b28e173b Updated mesages.po 2023-01-08 23:15:15 +00:00
Michael Vogel
c1f9c1aaa5
Apply suggestions from code review
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2023-01-08 23:13:31 +01:00
c9b6da0127 Remoce test code 2023-01-08 19:01:12 +00:00
b0aa4eb4b7 Update routine to transfer the blockem list to collapsed 2023-01-08 18:59:07 +00:00
5738d480da Changed messages.po 2023-01-08 18:28:34 +00:00
480d9f53c3 Added "collapsed" list 2023-01-08 18:28:19 +00:00
50746bad55 Merge remote-tracking branch 'upstream/develop' into collapse 2023-01-08 17:47:21 +00:00
50e43c530e Posts from contacts can now be collapsed 2023-01-08 17:40:05 +00:00
0ae7a53daa
Merge pull request #12637 from annando/ostatus-subscription
OStatus: Fix PubSubHubBub subscription
2023-01-08 07:58:22 -05:00