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

6729 commits

Author SHA1 Message Date
Michael 516018861e Merge remote-tracking branch 'upstream/develop' into error-handling 2021-10-31 05:25:39 +00:00
Michael 4236a9a105 Improved http error handling 2021-10-29 23:21:07 +00:00
Philipp Holzer d34497e69b
Update messages.po 2021-10-27 20:02:42 +02:00
Tobias Diekershoff 2a0d3da070 fix link to media tab in navigation 
In #10904 the wrong link was set, this PR should fix it and really point towards the media tab of the profiles.
 2021-10-27 15:09:37 +02:00
Tobias Diekershoff c13cb69801 EN US translation update THX AndyH3 2021-10-27 13:54:35 +02:00
Tobias Diekershoff 87e056d2cf EN GB translation update THX AndyH3 2021-10-27 13:54:18 +02:00
Tobias Diekershoff ab44fb5804 AR translation updates THX abidin toumi 2021-10-27 13:54:09 +02:00
Michael Vogel 81c9d8d479
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2021-10-25 21:27:21 +02:00
Michael 87673fd0c5 Merge remote-tracking branch 'upstream/develop' into logging 2021-10-25 18:56:29 +00:00
Tobias Diekershoff 0c62a5db57 AR translation updates THX abidin toumi 2021-10-25 07:43:49 +02:00
Hypolite Petovan c1edfa2478 Update main translation file after string update 2021-10-24 23:21:20 -04:00
Tobias Diekershoff 767d581d50 AR translation updates THX abidin toumi 2021-10-24 15:13:22 +02:00
Tobias Diekershoff 9a19a16929 DE translation updates 2021-10-24 15:13:02 +02:00
Philipp Holzer d0e98422a5 Update messages.po 2021-10-23 21:59:45 -04:00
Michael 9d883f7933 Updated messages.po 2021-10-23 17:25:59 +00:00
Michael 8185c591d8 New option to activate/deactivate contact avatar cache 2021-10-23 17:18:30 +00:00
Michael a497bd3a3d Merge remote-tracking branch 'upstream/develop' into logging 2021-10-22 06:06:39 +00:00
Tobias Diekershoff f5a49b06ee DE translation updates 2021-10-21 07:37:31 +02:00
Michael f6faae5bb1 Replace deprecated log calls 2021-10-20 18:53:52 +00:00
Tobias Diekershoff 656702c66d regen messages.po 2021-10-20 15:13:02 +02:00
Tobias Diekershoff 34c6a4af07 exchange video with media link in the navigation menu in frio 2021-10-20 15:05:22 +02:00
Hypolite Petovan 353cd66b26
Merge pull request #10900 from annando/notify 
`enotify.php` is removed and its functions were transferred
 2021-10-19 22:22:41 -04:00
Michael b44406ad90 Updated messages.po 2021-10-19 20:03:26 +00:00
Tobias Diekershoff afe043c3eb AR translation updates THX abidin toumi 2021-10-19 20:14:36 +02:00
Tobias Diekershoff 501e08a4b2 DE translation updates 2021-10-19 20:13:44 +02:00
Philipp Holzer 5d2170990b
Update messages.po 2021-10-18 23:32:47 +02:00
Hypolite Petovan 2e78e0353d Updated main translation file after adding a string 2021-10-16 19:32:16 -04:00
Hypolite Petovan aea07a7c15 Add new purge contact content option to admin contact blocklist 2021-10-16 19:29:38 -04:00
Michael c6021a45b1 Updated messages.po, keep a translatable string 2021-10-14 06:22:47 +00:00
Hypolite Petovan f05faf22a1
Merge pull request #10861 from annando/no-q 
Replace the legacy function "unavailableNetworks"
 2021-10-11 08:17:45 -04:00
Michael 41dc6cea2b Replace the legacy function 2021-10-11 04:33:10 +00:00
Hypolite Petovan a3e42a8c07
Merge pull request #10857 from annando/no-q 
`q` is now completely removed
 2021-10-10 23:40:28 -04:00
Tobias Diekershoff 364c5317ff DE translation updates 2021-10-10 14:33:36 +02:00
Tobias Diekershoff eb94bedc0e regenerated all the strings 
This is a follow up for #10855 with the regenerated `string.php` files for all the languages currently in the repository.
 2021-10-10 08:22:58 +02:00
Michael 2c134c5229 q is now completely removed 2021-10-09 21:16:15 +00:00
Tobias Diekershoff aec62de438 added AR translation to Friendica 
Thanks to the work of طاهر, Farida Khalaf, محمد أحمد, abidin toumi, Abdullah Alsabi, ButterflyOfFire and ominds the translation of Friendica into Arabic has crossed the magic 50% progress mark, so we now include their work into the repository.
 2021-10-08 07:12:01 +02:00
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