267ae356ae
revert e776c72dde
...
revert a readme-md update to set this fork to the tag realese 2020.09-1 markdown edits
editing use of hashtag by markdown
trying to create a fork of 2020.09-1 by adding this text directly to the readme.md
the -> settings: "merge commit" -> "allow edits by mantainers by default" was enabled to do this editing inside the fork
the tag was set to 2020-09-1 inside the /friendica/friendica fork
setting "commit directly to the [develop] branch" was seleted for this commit
2023-09-01 23:57:22 +02:00
e776c72dde
a readme-md update to set this fork to the tag realese 2020.09-1 markdown edits
...
editing use of hashtag by markdown
trying to create a fork of 2020.09-1 by adding this text directly to the readme.md
the -> settings: "merge commit" -> "allow edits by mantainers by default" was enabled to do this editing inside the fork
the tag was set to 2020-09-1 inside the /friendica/friendica fork
setting "commit directly to the [develop] branch" was seleted for this commit
2023-09-01 23:51:00 +02:00
42c1f0c0e3
a readme-md update to set this fork to the tag realese 2020.09-1 / hashtagchanges
...
hashtag changes
trying to create a fork of 2020.09-1 by adding this text directly to the readme.md
the -> settings: "merge commit" -> "allow edits by mantainers by default" was enabled to do this editing inside the fork
the tag was set to 2020-09-1 inside the /friendica/friendica fork
setting "commit directly to the [develop] branch" was seleted for this commit
2023-09-01 23:46:40 +02:00
fc50a0d538
a readme-md update to set this fork to the tag realese 2020.09-1
...
trying to create a fork of 2020.09-1 by adding this text directly to the readme.md
the -> settings: "merge commit" -> "allow edits by mantainers by default" was enabled to do this editing inside the fork
the tag was set to 2020-09-1 inside the /friendica/friendica fork
setting "commit directly to the [develop] branch" was seleted for this commit
2023-09-01 23:45:06 +02:00
5c26ba5f5d
Merge pull request #13387 from annando/relation-score
...
Calculate the interaction score
2023-08-30 16:04:05 -04:00
35995633ae
Calculate the interaction score
2023-08-30 19:17:42 +00:00
Michael Vogel
350999fcca
Merge pull request #13385 from MrPetovan/bug/fatal-errors
...
Fix reference to Entity\LocalRelationship class after simplifying `use` statement in Contact\Profile
2023-08-28 21:55:45 +02:00
667f384bfc
Fix reference to Entity\LocalRelationship class after simplifying use
statement in Contact\Profile
...
- Address https://github.com/friendica/friendica/issues/13156#issuecomment-1696009068
2023-08-28 13:30:01 -04:00
75c4cc70c6
Merge pull request #13383 from annando/baseurl
...
Improve the fetching of the contact's baseurl
2023-08-28 12:31:23 -04:00
24d2d0481a
Merge remote-tracking branch 'upstream/develop' into baseurl
2023-08-28 15:24:20 +00:00
5f832cb75a
Merge pull request #13382 from annando/subscription
...
Store and display the subscribed tags per post
2023-08-28 10:42:09 -04:00
86b6be0668
Fix indentation
2023-08-28 14:14:07 +00:00
Michael Vogel
06a1db4f24
Merge pull request #13375 from MrPetovan/bug/empty-timeline
...
Fix user moderation conditions in network-thread-view and network-item-view
2023-08-28 06:44:20 +02:00
2bc0abbc50
Updated messages.po
2023-08-28 04:37:54 +00:00
ff6d14a022
Merge remote-tracking branch 'upstream/develop' into subscription
2023-08-28 04:15:37 +00:00
38d09084a3
Improve the fetching of the contact's baseurl
2023-08-28 04:09:49 +00:00
f842e7b813
Store and display the subscribed tags
2023-08-28 04:05:52 +00:00
Michael Vogel
70f2489710
Merge pull request #13376 from MrPetovan/task/13369-ignore-server-host
...
Replace author name by server host in Ignore Server labels
2023-08-26 00:10:08 +02:00
Michael Vogel
ddc3c0db03
Merge pull request #13368 from MrPetovan/bug/13367-post-plink
...
Replace reference to post plink by author base URL
2023-08-26 00:03:45 +02:00
ba98327463
Update main translation file after updating a string
2023-08-25 09:30:51 -04:00
15d24a77c7
Replace author name by server host in Ignore Server labels
2023-08-25 09:30:51 -04:00
f2c1ecd19b
Replace reference to post plink by author base URL
...
- This is more reliably used to show the Ignore Author Server link
2023-08-25 09:30:23 -04:00
6fa7c23bb9
[Database 1529] Add author baseurl to post-user-view
...
- Explicit the contact.baseurl and contact.gsid caveat
2023-08-25 09:30:23 -04:00
b659aa5c0f
Fix user moderation conditions in network-thread-view and network-item-view
...
- This was causing the network timeline to be empty if all the top-level authors were blocked or ignored
2023-08-25 09:30:05 -04:00
f667d6dd25
Merge pull request #13377 from nupplaphil/fix/message
...
Update messages.po
2023-08-24 19:17:21 -04:00
25f6f7a406
Update messages.po
2023-08-24 20:47:49 +02:00
Michael Vogel
9a50101bbd
Merge pull request #13371 from MrPetovan/bug/13370-empty-gsid
...
Skip server ignored check when contact gsid is empty in Module\Contact\Profile
2023-08-22 22:13:49 +02:00
Michael Vogel
4a348f8bca
Merge pull request #13372 from MrPetovan/bug/13365-repost-post-rules
...
Fix variable name in constructor in Repository\Report
2023-08-22 22:08:41 +02:00
Michael Vogel
57ab2a4294
Merge pull request #13374 from friendica/update-htaccess
...
Add .htaccess file to exclusion list in Update.md
2023-08-22 22:06:10 +02:00
c55d70b6d4
Add .htaccess file to exclusion list in Update.md
2023-08-22 10:28:34 -04:00
ac99ab55c5
Fix variable name in constructor in Repository\Report
2023-08-22 08:50:16 -04:00
3d13db1f2c
Skip server ignored check when contact gsid is empty in Module\Contact\Profile
2023-08-22 08:38:12 -04:00
Michael Vogel
0219d200a5
Merge pull request #13364 from MrPetovan/bug/missing-user-gserver.gsid-key
...
[Database 1528] Add expected index for foreign key user-gserver.gsid
2023-08-21 14:41:49 +02:00
76cc8eaff8
[Database 1528] Add expected index for foreign key user-gserver.gsid
2023-08-21 08:07:10 -04:00
e9861b11f3
Don't update user.username from an empty profile.name in 1525 update
2023-08-20 15:12:02 -04:00
Michael Vogel
1edb7b6464
Merge pull request #13288 from MrPetovan/task/user-server-block
...
Add Ignore Author Server button to post actions
2023-08-20 20:41:17 +02:00
3cf9edf7cc
Updated main translation file after adding several strings
2023-08-20 14:32:54 -04:00
544ce206d7
[vier] Add mute author server link in photo menu
2023-08-20 14:27:43 -04:00
6ecc9c4cba
Implement ignored server block in conversations
...
- Add server ignore status in contact profile page
- Add new reason in DisplayNotFound exception page
2023-08-20 14:27:43 -04:00
156e3fa101
[Database 1527] Add required gsid fields to post-user-view, post-thread-user-view, post-view and post-thread-view
2023-08-20 14:27:40 -04:00
a670d478f8
Add user settings page to manage remote server settings
2023-08-20 14:27:09 -04:00
4c6334ea13
[frio] Add Mute Author Server button to post actions
2023-08-20 14:27:09 -04:00
9bbb55b2bb
[Database 1526] Add new user-gserver table
...
- Add Entity, Collection, Factory and Repository classes for it
2023-08-20 14:27:03 -04:00
2ba3069b07
Create DDD classes for gserver class
2023-08-20 14:26:27 -04:00
63f5d94a02
Fix DisplayNotFound page
...
- Add another condition earlier in Module\Item\Display
- Separate reasons in individual translation strings
2023-08-20 14:26:27 -04:00
96d2cddb54
Remove DI dependency from Module\Contact\Profile
2023-08-20 14:26:27 -04:00
Michael Vogel
fe48fcf9de
Merge pull request #13339 from MrPetovan/task/13332-deprecate-profile-name
...
Deprecate profile.name in favor of user.username
2023-08-20 20:18:47 +02:00
b79c2e8d71
Updated main translation file after changing a couple strings
2023-08-20 14:00:05 -04:00
38f04616d2
[Database 1525] Deprecate profile.name in favor of user.username
2023-08-20 14:00:01 -04:00
e31d90eadb
Replace references to profile.name by user.username
2023-08-20 13:59:07 -04:00