Commit Graph

1463 Commits

Author SHA1 Message Date
Astra d62e702994 should resolve a 3/4 things 2018-06-07 17:31:43 -04:00
Artik Banana 72d9322c02 Update messages.js 2018-06-07 20:37:06 +00:00
Artik Banana 24eddeb3e1 Update messages.js 2018-06-07 20:28:43 +00:00
Artik Banana da0dcdaaf8 Update messages.js 2018-06-07 20:28:16 +00:00
Artik Banana 17aa44862b Update messages.js 2018-06-07 20:20:20 +00:00
Artik Banana da444e85ee Update messages.js 2018-06-07 19:56:25 +00:00
Roger Braun 72d7693f56 Update translation. 2018-06-07 19:53:08 +02:00
Astra a759378b4d more lint fixes 2018-06-07 05:18:54 -04:00
Astra f49229974a correct linter problems 2018-06-07 05:08:39 -04:00
Astra 92a8ca0011 crt's compose box changes 2018-06-07 05:03:50 -04:00
riking 21868a7f91 Add initial translations of username placeholder 2018-06-06 23:52:28 -07:00
riking da1112297a fix: enable translating login form placeholder 2018-06-06 23:44:11 -07:00
William Pitcock d7d787b84c user card: show that the account is locked if it is 2018-06-07 02:16:30 +00:00
William Pitcock 7389f07115 follow requests: refactor to properly leverage vuex 2018-06-07 01:24:31 +00:00
William Pitcock fd25f68741 config: fix typo 2018-06-07 01:13:58 +00:00
William Pitcock f3a27764aa add follow requests UI 2018-06-07 00:58:44 +00:00
William Pitcock b8d0a6a0ba backend interactor service: add approveUser and denyUser functions 2018-06-07 00:29:13 +00:00
William Pitcock 2cf28acfd1 api: add approveUser and denyUser functions 2018-06-07 00:29:01 +00:00
William Pitcock 4efb528a52 backend interactor service: implement fetchFollowRequests() 2018-06-06 22:29:02 +00:00
William Pitcock 4e64514aa9 api: add fetchFollowRequests() 2018-06-06 22:26:24 +00:00
Artik Banana 8a49174171 Update messages.js 2018-06-06 17:43:36 +00:00
Artik Banana dd437222d0 Update messages.js 2018-06-05 09:09:30 +00:00
Sebastian Huebner fb0f9f99af corrected a typo and changed/shortend delete_account_error text 2018-06-04 10:58:05 +02:00
User 32d7646db1 Fix the height of file inputs 2018-05-29 21:44:45 +02:00
User 890312a0dc Visually separate the settings items 2018-05-29 21:34:19 +02:00
William Pitcock 7a08ba43e2 user settings: enable locking/unlocking an account 2018-05-29 14:19:28 +00:00
chip 256ff7db6a Add French translations for the new user settings
Add French translations for the new user settings :
- Password change
- Follows export
- Account deletion
2018-05-26 21:56:59 +02:00
dtluna 3a227cb3b4 Update Russian translation 2018-05-26 12:16:22 +03:00
Sebastian Huebner 5b699bb7fb updated german translation 2018-05-25 11:23:31 +02:00
lambda 648f31f44c Merge branch 'feature/change-password' into 'develop'
Feature/change password

See merge request pleroma/pleroma-fe!268
2018-05-24 17:23:44 +00:00
Syldexia 5ae7fb871e Fix formatting 2018-05-21 23:01:33 +01:00
Syldexia e0ba6a5876 Added change password to user settings 2018-05-21 23:01:09 +01:00
Roger Braun f06fef26b1 Display visibility if available. 2018-05-20 18:28:01 +02:00
Roger Braun 959b2d9d66 Merge branch 'develop' into Syldexia/pleroma-fe-feature/account-deletion 2018-05-20 13:16:49 +02:00
lambda 28c60832c7 Merge branch 'i18n-fixes' into 'develop'
Pass the "Collapse" label throught the translation function

Closes #105

See merge request pleroma/pleroma-fe!266
2018-05-20 11:08:28 +00:00
chip fcc1ab1d85 Pass the "Collapse" label throught the translation function 2018-05-19 20:35:14 +02:00
lambda a9dbb8c0c2 Merge branch 'l10n-french-20180518' into 'develop'
Correct small typo in french translation

See merge request pleroma/pleroma-fe!265
2018-05-19 08:37:42 +00:00
chip 8bd561c285 Correct typo in french translation 2018-05-18 21:39:21 +02:00
lambda 5da881e98d Merge branch 'develop' into 'develop'
use es6 notation for exportFollows

See merge request pleroma/pleroma-fe!263
2018-05-18 10:45:08 +00:00
aka 3c525d6a3b use es6 notation for exportFollows 2018-05-18 07:34:36 -03:00
lambda 166d9294c4 Merge branch 'feature/follows-export' into 'develop'
Adds an option to export follows (fixed)

See merge request pleroma/pleroma-fe!261
2018-05-18 07:51:00 +00:00
pizzaiolo 9b86fc4dcd cleaning up some translations that broke the building 2018-05-17 13:24:48 +00:00
aka fed8781583 fix linting 2018-05-16 19:51:52 -03:00
Roger Braun 954e6e0763 Make nsfw image easier to understand. 2018-05-16 13:01:17 +02:00
pizzaiolo c8cdfda01c fix trailing comma 2018-05-16 10:56:46 +00:00
lambda c9e14d7eab Merge branch 'patch-5' into 'develop'
[i18n]Update messages.js

See merge request pleroma/pleroma-fe!259
2018-05-16 10:54:40 +00:00
lambda 59690670f9 Merge branch 'patch-7' into 'develop'
Added inputRadius french translation and improved french translation as discussed with Chip.

See merge request pleroma/pleroma-fe!260
2018-05-16 10:51:39 +00:00
Azurolu fc2bb10444 Improved french translation thanks to Chip's suggestions, added inputRadius' french translation. 2018-05-16 01:42:54 +00:00
Azurolu 1487474c18 Added inputRadius french translation and improved french translation as discussed with Chip. 2018-05-15 11:17:32 +00:00
Exilat 1ff089a175 Update messages.js 2018-05-15 05:14:59 +00:00