1
0
Fork 0
Commit graph

6637 commits

Author SHA1 Message Date
64e4af259f Updated main translation file after adding a string 2021-10-03 14:51:09 -04:00
a9bb53b021 [frio] Fix event time display 2021-10-03 13:42:32 -04:00
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
26223443f3 update FR translations THX MrPetovan 2021-10-03 17:15:54 +02:00
195d3ecd65 remove unneeded tabs 2021-10-03 17:03:05 +02:00
4c04ec483f restore jot.tpl file formatting 2021-10-03 17:03:05 +02:00
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
20d20278ef DE translation updats 2021-10-03 10:13:16 +02:00
d441c8b25f Update main translation file after strings have moved 2021-10-02 18:15:45 -04:00
47acb6a278 Move notify to the new paradigm
- Remove unused frion notify template
- Update API test
2021-10-02 18:15:42 -04:00
a8e3d0a4d1 Updated main translation file because I'm used to do it now 2021-10-02 17:30:43 -04:00
13dfce6356 Updated main translation file after string removal 2021-10-02 16:08:10 -04:00
222333f64f Remove contact drop feature
- Feature was confusing, sometimes ineffective and overall overlapping with unfollow/block
2021-10-02 16:04:28 -04:00
600c301bc1
Merge pull request #10795 from annando/contact-media
Contact-media
2021-10-02 15:51:26 -04:00
afa611bd50 The media class moved 2021-10-02 19:31:27 +00:00
a874d80861 DE translation updates 2021-10-02 21:30:30 +02:00
2408ac8227 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 18:35:43 +00:00
d675686a87 Updated main translation file after adding strings 2021-10-02 14:01:49 -04:00
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
9918fa3ec0 Move translation strings in their own array for confirm templates 2021-10-02 13:52:54 -04:00
a44d200c21 Merge remote-tracking branch 'upstream/develop' into contact-media 2021-10-02 15:13:55 +00:00
c3554ac0f4 "Video" is replaced by a "Media" tab in contact and profile 2021-10-02 15:09:43 +00:00
b34034cef6 Updated main translation file after adding strings 2021-10-02 08:36:41 -04:00
865006682a Merge remote-tracking branch 'upstream/develop' into user-contact 2021-10-02 11:57:43 +00:00
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
f51438c168 unescape HTML from the relocation warning message 2021-10-01 14:05:17 +02:00
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
2139e46d98 RU translations THX Alexander An 2021-09-29 07:37:38 +02:00
96055cafff Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-26 03:57:31 +00:00
a2532ad755 Merge remote-tracking branch 'upstream/develop' into user-contact 2021-09-26 03:07:59 +00:00
6983f257c8 Updated messages.po 2021-09-25 18:45:32 +00:00
e77b5d4569 Updated messages.po 2021-09-25 18:43:19 +00:00
1f96742695 Merge remote-tracking branch 'upstream/develop' into conversation-moved 2021-09-25 18:38:50 +00:00
f0c4d504af
Update messages.po (new version) 2021-09-25 20:18:01 +02:00
a6c85f6106 Updated "messages.po" 2021-09-23 21:34:22 +00:00
9b78d87287 RU translation updates THX Alexander An 2021-09-23 17:13:48 +02:00
56a143c5c6 Duplicated "value" removed 2021-09-18 07:32:05 +00:00
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
458e26b00a Link to displayed contact URL no matter the "Stay local" setting value 2021-09-14 17:39:03 -04:00
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
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
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
a0c31fad84 update FR translations THX MrPetovan 2021-09-13 14:13:59 +02:00
558e06ff5a DE translation updates 2021-09-13 07:41:35 +02:00
5f1016bb61 RU translations THX Alexander An 2021-09-13 07:41:26 +02:00
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