Commit Graph

1527 Commits

Author SHA1 Message Date
lambda 97ae186aaa Merge branch 'improve-settings-ui' into 'develop'
Improve user settings ui

See merge request pleroma/pleroma-fe!273
2018-06-12 17:01:35 +00:00
lambda 5d59028ef7 Merge branch 'patch-1' into 'develop'
Hebrew Translation of "placeholder"

See merge request pleroma/pleroma-fe!278
2018-06-12 16:57:47 +00:00
lambda 6ea5cfe71e Merge branch 'feature/locked-accounts' into 'develop'
Feature/locked accounts

See merge request pleroma/pleroma-fe!274
2018-06-12 16:57:18 +00:00
lambda 2330170d23 Merge branch 'i18n/change-content-warning-to-subject' into 'develop'
messages: rename content warning to subject

See merge request pleroma/pleroma-fe!280
2018-06-12 16:56:34 +00:00
William Pitcock c155110eed messages: rename content warning to subject 2018-06-08 18:47:21 +00:00
Artik Banana d766125eca Update messages.js 2018-06-08 14:08:07 +00:00
lambda 71dcf120ed Merge branch 'tr-fix' into 'develop'
Translate username input placeholder

See merge request pleroma/pleroma-fe!275
2018-06-08 13:34:07 +00:00
lambda 278321db48 Merge branch 'l10n-french-newsettings' into 'develop'
Add French translations for the new user settings

See merge request pleroma/pleroma-fe!271
2018-06-08 13:33:00 +00:00
lambda af47d51cd1 Merge branch 'develop' into 'patch-1'
# Conflicts:
#   src/i18n/messages.js
2018-06-08 13:30:49 +00:00
lambda e2c5e4eb46 Merge branch 'develop' into 'develop'
Hebrew Translation

See merge request pleroma/pleroma-fe!277
2018-06-08 13:28:57 +00:00
Roger Braun 8c2a0191a5 Merge branch 'dr1ft/pleroma-fe-develop' into develop 2018-06-08 15:26:13 +02:00
Roger Braun d64293506c Make scope options optional, refactoring. 2018-06-08 15:25:48 +02:00
Astra ee1b60c9c5 Merge branch 'develop' of https://git.pleroma.social/dr1ft/pleroma-fe into develop 2018-06-07 17:33:28 -04:00
Astra ca95a108e3 should resolve a 3/4 things 2018-06-07 17:33:06 -04:00
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