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

6616 Commits

Author SHA1 Message Date
Michael a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 15:13:55 +00:00
Michael c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile 2021-10-02 15:09:43 +00:00
Hypolite Petovan b34034cef6 Updated main translation file after adding strings 2021-10-02 08:36:41 -04:00
Michael 865006682a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-10-02 11:57:43 +00:00
Tobias Diekershoff 91a31f2da9 DE translation updates 2021-10-01 17:35:21 +02:00
fabrixxm 0638e23f7a Mark string translatable in View logs 
and update messages.po
 2021-10-01 16:46:55 +02:00
Tobias Diekershoff f51438c168 unescape HTML from the relocation warning message 2021-10-01 14:05:17 +02:00
Tobias Diekershoff 786596fec5 remove superfluous characters from warning messages in the admin panel 
\r\n was shown in the warning messages of the admin panel log view page. They have
been removed. Additionally the messages.po file has been regenerated.
 2021-10-01 14:02:27 +02:00
Tobias Diekershoff 2139e46d98 RU translations THX Alexander An 2021-09-29 07:37:38 +02:00
Michael 96055cafff Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 03:57:31 +00:00
Michael a2532ad755 Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-26 03:07:59 +00:00
Michael 6983f257c8 Updated messages.po 2021-09-25 18:45:32 +00:00
Michael e77b5d4569 Updated messages.po 2021-09-25 18:43:19 +00:00
Michael 1f96742695 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-25 18:38:50 +00:00
Philipp f0c4d504af
Update messages.po (new version) 2021-09-25 20:18:01 +02:00
Michael a6c85f6106 Updated "messages.po" 2021-09-23 21:34:22 +00:00
Tobias Diekershoff 9b78d87287 RU translation updates THX Alexander An 2021-09-23 17:13:48 +02:00
Michael 56a143c5c6 Duplicated "value" removed 2021-09-18 07:32:05 +00:00
Michael 21a3388096 Issue 9871: Deletion og photos is now possible again 2021-09-18 07:28:29 +00:00
Michael Vogel 695df7507a
Merge pull request #10713 from MrPetovan/task/10672-contact-module-security-token 
Use CSRF token as name and value for contact deletion confirm form
 2021-09-15 07:55:34 +02:00
Hypolite Petovan 458e26b00a Link to displayed contact URL no matter the "Stay local" setting value 2021-09-14 17:39:03 -04:00
Hypolite Petovan 06b8f93eae Add support for specific confirm value in confirm.tpl 
- button tags allow for a different value from the label
 2021-09-14 17:28:07 -04:00
Hypolite Petovan 3068cb5788 [frio] Fix contact deletion modal URL concatenation 
- The deletion URL now has an initial query string parameter in the form of a CSRF token
 2021-09-14 17:27:16 -04:00
Tobias Diekershoff f0b589f6d7 HU translation updated THX Balázs Úr 2021-09-14 18:09:09 +02:00
Michael Vogel c8344886fd
Merge pull request #10703 from tobiasd/20210913-fr 
update FR translations THX MrPetovan
 2021-09-13 14:29:06 +02:00
Tobias Diekershoff a0c31fad84 update FR translations THX MrPetovan 2021-09-13 14:13:59 +02:00
Tobias Diekershoff 558e06ff5a DE translation updates 2021-09-13 07:41:35 +02:00
Tobias Diekershoff 5f1016bb61 RU translations THX Alexander An 2021-09-13 07:41:26 +02:00
Hypolite Petovan 12396a1298 [frio] Use correct admin endpoint for block/deletion in Admin\Users\Active 
- Address https://github.com/friendica/friendica/issues/10473#issuecomment-914516676
 2021-09-10 12:27:23 -04:00
Hypolite Petovan 75d3f5094b
Merge pull request #10683 from annando/proxify 
Make the proxy functionality optional
 2021-09-10 10:24:17 -04:00
Tobias Diekershoff 6c9fe7d95b HU translation updated THX Balázs Úr 2021-09-10 07:29:17 +02:00
Michael 634db1ec85 Changed text 2021-09-10 00:30:11 +00:00
Michael Vogel 18470da84a
Merge pull request #10673 from MrPetovan/task/10672-contact-module-security-token 
Add form security token to contact actions
 2021-09-09 14:51:19 +02:00
Michael bdb5aa6bd9 Make the proxy functionality optional 2021-09-09 12:40:19 +00:00
Tobias Diekershoff fa5e4db549 DE translation updates 2021-09-07 07:39:19 +02:00
Michael be3f7e4528 Fix for PR 10674: Changing the template variables according to the last changes 2021-09-06 20:25:23 +00:00
Hypolite Petovan 0011b4187f Update main messages.po 2021-09-06 14:18:56 -04:00
Hypolite Petovan e9aa27b19f Add form security token to contact actions 
- Add token to batch POST actions
- Add token to individual GET actions
 2021-09-06 12:30:38 -04:00
Hypolite Petovan 9718e198a1 Update main messages.po 2021-09-06 11:50:50 -04:00
Hypolite Petovan 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
Hypolite Petovan 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
Hypolite Petovan bd09f5f665
Merge pull request #10669 from annando/no-rino 
Remove all traces of "rino"
 2021-09-05 14:53:46 -04:00
Michael 52ca3e5417 Remove all traces of "rino" 2021-09-05 18:34:44 +00:00
Tobias Diekershoff b80aa8c92b RU translations THX Alexander An 2021-09-05 08:00:26 +02:00
Tobias Diekershoff 27264b256c DE translation updates 2021-09-03 08:30:24 +02:00
Philipp debe4e7ad1
Update messages.po 2021-09-02 23:29:56 +02:00
Philipp 687e6841bc
Rename Storage Backend labels 2021-09-02 23:27:35 +02:00
Tobias Diekershoff 5f48d12d31 DE translation updates 2021-09-02 08:51:42 +02:00
Hypolite Petovan c4307c85e1
Merge pull request #10653 from annando/issue-10640-c 
Issue 10640 - Inverse user display settings
 2021-09-01 17:56:22 -04:00
Michael 1e189d6596 Updated messages.po 2021-09-01 18:36:31 +00:00