strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
32183 commits 2 branches 55 tags 148 MiB
Commit graph

6693 commits

Author SHA1 Message Date
Hypolite Petovan a9f3e4b53b Updated main translation file after removing a string 2021-10-07 11:36:16 -04:00
Tobias Diekershoff d7b59e61b9 HU translation updated THX Balázs Úr 2021-10-05 11:45:24 +02:00
Hypolite Petovan ac9e5df614
Merge pull request #10823 from annando/photo-guid 
Access contact avatars by guid
 2021-10-04 15:23:19 -04:00
Michael 126aa6f148 Fix tests 2021-10-04 06:26:41 +00:00
Tobias Diekershoff 2e21645dd7 DE translation updates 2021-10-04 08:20:55 +02:00
Tobias Diekershoff 8a17a5b41d RU translations THX Alexander An 2021-10-04 08:19:02 +02:00
Hypolite Petovan 64e4af259f Updated main translation file after adding a string 2021-10-03 14:51:09 -04:00
Hypolite Petovan a9bb53b021 [frio] Fix event time display 2021-10-03 13:42:32 -04:00
Hypolite Petovan 9935e8e711 Remove event.adjust field 
- It was confusing and introduced complexity that wasn't worth the unclear gain
 2021-10-03 13:42:32 -04:00
Tobias Diekershoff 26223443f3 update FR translations THX MrPetovan 2021-10-03 17:15:54 +02:00
Tobias Diekershoff 195d3ecd65 remove unneeded tabs 2021-10-03 17:03:05 +02:00
Tobias Diekershoff 4c04ec483f restore jot.tpl file formatting 2021-10-03 17:03:05 +02:00
Tobias Diekershoff f0763c4eaf add character counter to themes other then frio 
Only vier needed some styling so that the counter looked fitting.

closes #2525
 2021-10-03 17:03:05 +02:00
Michael Vogel 3d97149007
Merge pull request #10722 from MrPetovan/task/refactor-notifications 
Move notify, notifications and introduction notifications to new paradigm
 2021-10-03 14:13:28 +02:00
Tobias Diekershoff 20d20278ef DE translation updats 2021-10-03 10:13:16 +02:00
Hypolite Petovan d441c8b25f Update main translation file after strings have moved 2021-10-02 18:15:45 -04:00
Hypolite Petovan 47acb6a278 Move notify to the new paradigm 
- Remove unused frion notify template
- Update API test
 2021-10-02 18:15:42 -04:00
Hypolite Petovan a8e3d0a4d1 Updated main translation file because I'm used to do it now 2021-10-02 17:30:43 -04:00
Hypolite Petovan 13dfce6356 Updated main translation file after string removal 2021-10-02 16:08:10 -04:00
Hypolite Petovan 222333f64f Remove contact drop feature 
- Feature was confusing, sometimes ineffective and overall overlapping with unfollow/block
 2021-10-02 16:04:28 -04:00
Hypolite Petovan 600c301bc1
Merge pull request #10795 from annando/contact-media 
Contact-media
 2021-10-02 15:51:26 -04:00
Michael afa611bd50 The media class moved 2021-10-02 19:31:27 +00:00
Tobias Diekershoff a874d80861 DE translation updates 2021-10-02 21:30:30 +02:00
Michael 2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 18:35:43 +00:00
Hypolite Petovan d675686a87 Updated main translation file after adding strings 2021-10-02 14:01:49 -04:00
Hypolite Petovan 72fae04e97 Add revoke follow feature 
- Add new follow revoke module
- Add new hooks: revoke_follow, support_follow, support_revoke_follow
- Add link in contact page action menu
 2021-10-02 14:01:46 -04:00
Hypolite Petovan 9918fa3ec0 Move translation strings in their own array for confirm templates 2021-10-02 13:52:54 -04:00
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 Holzer 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 Holzer debe4e7ad1
Update messages.po 2021-09-02 23:29:56 +02:00
Philipp Holzer 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
Michael 58abaf5c53 Merge remote-tracking branch 'upstream/2021.09-rc' into issue-10640-c 2021-09-01 18:34:24 +00:00
Michael c8d2c87af0 Issue 10640 - Inverse user display settings 2021-09-01 18:29:45 +00:00
Tobias Diekershoff 86fb56fe39 DE translation updates 2021-09-01 19:44:31 +02:00
Philipp Holzer 23a1fa18c8
Update messages.po 2021-09-01 14:02:04 +02:00
Philipp Holzer 728e82d8b0
Improve translation for Storage module 2021-09-01 14:00:23 +02:00
Tobias Diekershoff 5fe1ab0758 missing $ in template 
The admin/site.tpl file had a missing $ from a variable name thus Smarty
could not compile the template.
 2021-09-01 10:54:56 +02:00
Tobias Diekershoff 073c3cf134 DE translation updats 2021-09-01 08:13:17 +02:00
Michael 13ae96e9e1 Some more "enable" 2021-08-31 19:54:05 +00:00
Michael a61bfa4e67 Updated messages.po 2021-08-31 19:28:16 +00:00
Michael 85e2328b23 Issue 10640: Some more inversed settings 2021-08-31 19:26:17 +00:00
Tobias Diekershoff f32b2b4f85 DE translation updats 2021-08-31 07:39:01 +02:00
Michael 1a8fdbb527 Updated messages.po 2021-08-30 21:18:00 +00:00
Michael 3944e5d38e Disable mail setting when imap support is disabled 2021-08-30 21:17:03 +00:00
Michael 221c6c4f2a Updated "messages.po" 2021-08-30 19:49:13 +00:00
Michael e3c7cd25e1 Issue 10640: Use consistent settings to enable protocol support 2021-08-30 19:46:10 +00:00
Philipp Holzer 51fe8fc210
Update messages.po (changed branch) 2021-08-29 14:07:31 +02:00
Hypolite Petovan e7fdf3c0c3
Merge pull request #10630 from annando/cleared-enotify 
Unused parts of the old notification system are removed
 2021-08-24 10:25:06 -04:00
Michael a3c3fd13fb Updated "messages.po" 2021-08-24 08:58:23 +00:00
Tobias Diekershoff 12d8715a51 DE translation updats 2021-08-23 07:41:51 +02:00
Michael e9c63ff075 Added "follow" subscription message 2021-08-22 08:27:56 +00:00
Michael 59045b2e23 Added handling another situation 2021-08-22 03:58:50 +00:00
Michael 42de5c77d0 The desktop notifications have been reworked 2021-08-21 20:35:04 +00:00
Hypolite Petovan 632d1024f7
Merge pull request #10309 from fabrixxm/feature/advanced-logsview 
Display structured logs in admin
 2021-08-20 05:24:07 -04:00