Commit Graph

29 Commits

Author SHA1 Message Date
Ilja
4587f37dd7 Allow canceling a follow request
When a follow request is sent, but not (yet) accepted, the behaviour is now to cancel the request instead of re sending.

The reason is double
* You couldn't cancel a follow request if you change your mind and the request wasn't answered yet
* Instances don't always correctly process a new follow request when the following is already happening. If something went wrong (e;g. the target server thinks you're following, but your instance thinks you're not yet), it's better to first sent an unfollow. This is the behaviour that Mastodon and most probably most other clients have. Therefore this flow is more tested and expected by other instances.
2021-12-12 18:09:21 +01:00
Mark Felder
49aaf9dc57 Merge branch 'develop' into refactor/notification_settings 2020-07-15 09:01:40 -05:00
Shpuld Shpuldson
89d1fb5cf4 remove remaining autoload i18n 2020-07-14 15:15:02 +03:00
Shpuld Shpuldson
b8c1b25397 remove most of reply preview and autoload related stuff 2020-07-14 15:08:04 +03:00
Mark Felder
8fcd37a3b9 Remove i18n entries that are deprecated or need to be retranslated 2020-07-13 13:29:44 -05:00
Mark Felder
caf9a2a8f6 Revert i18n to develop 2020-06-26 16:56:57 -05:00
Mark Felder
b8350423d9 Updated Notification Settings API use 2020-05-28 10:57:02 -05:00
Shpuld Shpuldson
e55645aec1 Fix formatting in oc.json 2019-09-25 10:25:44 +03:00
Exilat
39106dc545 Update oc.json 2019-08-03 14:04:49 +00:00
Exilat
920bd05081 Update for Interactions, new search, sticker picker, update copy. 2019-08-03 13:55:05 +00:00
Exilat
fe500c44ed Update oc.json 2019-06-30 14:24:34 +00:00
lain
0eed2ccca8 Feature/polls attempt 2 2019-06-18 20:28:31 +00:00
Exilat
b98bab52a9 Update oc.json 2019-05-01 16:40:40 +00:00
William Pitcock
55823b8d67 add BBCode strings 2019-04-26 22:48:21 +00:00
Exilat
ed9aa8df76 Update oc.json 2019-04-20 14:44:43 +00:00
Exilat
213891ac71 Update oc.json 2019-04-20 14:38:04 +00:00
Exilat
69468c7c41 Update oc.json 2019-04-20 14:35:14 +00:00
Exilat
44f18caf4d Update oc.json 2019-04-20 14:29:04 +00:00
Exilat
e1e0b8b254 Update oc.json for !611 and !691 2019-03-27 18:46:40 +00:00
Exilat
7babbce522 [i18n] Update oc.json 2019-03-15 17:23:30 +00:00
dave
130fb7ae1e #434 - fix plain text issue 2019-03-11 16:48:27 -04:00
Edijs
292cdfb24b Merge content types translations 2019-03-06 20:13:04 -08:00
Exilat
5a273d528f Update oc.json 2019-03-04 18:53:16 +00:00
Exilat
3e16b5a2e0 Update of the Occitan file.
Not at 100% but more complete then what it was.
2019-03-03 19:06:32 +00:00
Maxim Filippov
2c7406d9a8 Add OAuth Tokens management to settings 2019-02-28 04:04:26 +03:00
Exilat
d1614c432f Update oc.json 2018-10-25 05:54:35 +00:00
Exilat
68d90684c4 Update oc.json 2018-10-24 05:50:49 +00:00
Exilat
8c585b0291 Update of the oc.json file
Actualizacion del fichièr oc.json
2018-10-23 19:19:11 +00:00
Henry Jameson
0c14dd9575 More languages 2018-09-09 18:54:23 +03:00