1
1
Fork 0
Commit graph

31501 commits

Author SHA1 Message Date
a4b0ab90b1 Insert a user-contact for every contact 2021-09-10 13:05:16 +00:00
Philipp
225d368139
Merge pull request from tobiasd/20210907-de
DE translation updates
2021-09-07 08:01:21 +02:00
fa5e4db549 DE translation updates 2021-09-07 07:39:19 +02:00
c7b19653dc
Merge pull request from annando/fix-10674
Fix for PR 10674: Changing the template variables according to the last changes
2021-09-06 16:45:39 -04:00
be3f7e4528 Fix for PR 10674: Changing the template variables according to the last changes 2021-09-06 20:25:23 +00:00
Michael Vogel
b52b78efbd
Merge pull request from MrPetovan/task/10640-convert-disable-settings-to-enable
Convert the two remaining "Disable..." setting names to "Enable..."
2021-09-06 21:32:27 +02:00
0011b4187f Update main messages.po 2021-09-06 14:18:56 -04:00
d295b37789 Convert the two remaining "Disable..." setting names to "Enable..." 2021-09-06 12:43:24 -04:00
Michael Vogel
0c8c0f7374
Merge pull request from MrPetovan/bug/10502-contact-block-unblock
Distinguish between public and private contact in contact actions
2021-09-06 18:25:54 +02:00
9718e198a1 Update main messages.po 2021-09-06 11:50:50 -04:00
d20b53607d Distinguish between public and private contact in contact actions
- Block and ignore is done relating to a public contact (uid = 0)
- Update and drop is done relating to a private contact (uid !=0)
- Method documentation has been improved to precise the contact type it needs
- Public and private contact ids are retrieved before acting on contacts
2021-09-06 11:50:46 -04:00
5262843e63 Add redirect URL parameter to contact batch
- This allows redirection to the correct contact tab after a batch action
2021-09-05 14:54:51 -04:00
6e358bfacf Remove user-controlled contact archival feature
- Archival is managed at the system level for failed probing and doesn't make sense for a user to decide on it
2021-09-05 14:54:50 -04:00
7ee88c3457 Improve documentation of $old_fields possible values in DBA::update and Database->update 2021-09-05 14:54:50 -04:00
bd09f5f665
Merge pull request from annando/no-rino
Remove all traces of "rino"
2021-09-05 14:53:46 -04:00
52ca3e5417 Remove all traces of "rino" 2021-09-05 18:34:44 +00:00
093c656003
Merge pull request from nupplaphil/bug/photo_delete
Fix Photo::delete()
2021-09-05 19:26:06 +02:00
fc46744183
Fix Photo::delete() 2021-09-05 19:20:43 +02:00
Michael Vogel
4e328b0a78
Merge pull request from tobiasd/20210905-ru
RU translations THX Alexander An
2021-09-05 08:59:37 +02:00
b80aa8c92b RU translations THX Alexander An 2021-09-05 08:00:26 +02:00
8ac8bcf0f5
Merge pull request from annando/issue-10651-loggin
Issue 10651: Improved logging
2021-09-04 02:00:17 -04:00
d89f004a2a Issue 10651: Improved logging 2021-09-04 04:51:20 +00:00
c0b2f5d960
Merge pull request from nupplaphil/feat/drone_release_followup
Drone release fixings
2021-09-03 16:09:56 -04:00
8f0e951c1d
Remove unnecessary addon checkout for deployment process 2021-09-03 21:31:47 +02:00
60fd083ea0
Correct sha256 extension 2021-09-03 21:31:12 +02:00
Michael Vogel
14050ea67b
Merge pull request from MrPetovan/bug/fatal-errors
Check for user array key before using it in include/conversation
2021-09-03 19:43:29 +02:00
3e677414d5 Check for user array key before using it in include/conversation
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-905752992
2021-09-03 13:11:14 -04:00
dc78686281
Merge pull request from nupplaphil/feat/drone_release
Create PHP release workflow in drone
2021-09-03 11:02:05 -04:00
Philipp
385875f1ca
Update .drone.yml
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
2021-09-03 16:14:38 +02:00
622c030526
Merge pull request from annando/gravity
Adding gravity to avoid notices
2021-09-03 09:27:40 -04:00
970b8b3b31
Remove github workflows 2021-09-03 09:36:51 +02:00
e563a193f5
Setup PHP release workflow in drone with lftp 2021-09-03 09:36:51 +02:00
Philipp
6d3f6e5c83
Merge pull request from tobiasd/20210903-de
DE translation updates
2021-09-03 09:23:04 +02:00
27264b256c DE translation updates 2021-09-03 08:30:24 +02:00
ce6f6978bd Use the correct function is adviced ... 2021-09-03 04:20:32 +00:00
307cfef12b Select all fields 2021-09-03 04:09:02 +00:00
6bb8b63da0 Adding gravity to avoid notices 2021-09-03 04:05:29 +00:00
1852ea98cf
Merge pull request from annando/self-unfollow
Don't offer to unfollow yourself
2021-09-02 20:04:16 -04:00
4140a59332
Merge pull request from nupplaphil/feat/storage_naming
Rename Storage Backend labels
2021-09-02 19:55:15 -04:00
e6ce767442
Merge pull request from annando/issue-10651
Issue 10651: remote comments appeared as own posts
2021-09-02 19:53:22 -04:00
debe4e7ad1
Update messages.po 2021-09-02 23:29:56 +02:00
687e6841bc
Rename Storage Backend labels 2021-09-02 23:27:35 +02:00
547a13661a Don't offer to unfollow yourself 2021-09-02 19:38:10 +00:00
Michael Vogel
782a54cf8c
Merge pull request from tobiasd/20210902-sec
updating date of security.txt validity
2021-09-02 17:20:20 +02:00
a19a7dc2a0 updating date of security.txt validity
The Friendica release plan is roughly March, June, September, December. With
this patch the information in the security.txt are vailid for the two planed
releases after the 2021.09 release.
2021-09-02 16:57:43 +02:00
Michael Vogel
6d878eafa0
Merge pull request from tobiasd/20210902-de
DE translation updates
2021-09-02 10:33:30 +02:00
5f48d12d31 DE translation updates 2021-09-02 08:51:42 +02:00
64fd94fc74 Issue 10651: remote comments appeared as own posts 2021-09-02 05:57:50 +00:00
c4307c85e1
Merge pull request from annando/issue-10640-c
Issue 10640 - Inverse user display settings
2021-09-01 17:56:22 -04:00
Michael Vogel
d94af463ba
Merge pull request from tobiasd/20210901-de2
DE translation updates
2021-09-01 20:40:26 +02:00