Commit graph

975 commits

Author SHA1 Message Date
lambda
0683e37fa4 Merge branch 'feature/update-russian-translation' into 'develop'
Update Russian translation

See merge request pleroma/pleroma-fe!270
2018-06-12 17:03:24 +00:00
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
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
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
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
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
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
chip
fcc1ab1d85 Pass the "Collapse" label throught the translation function 2018-05-19 20:35:14 +02: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
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
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
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
aka
fae7a40aeb Adds an option to export follows 2018-05-13 20:47:08 -03:00
Syldexia
327b6fb5dc Added delete account section to user settings 2018-05-13 15:24:42 +01:00
Henry Jameson
dc33c0aaac alternate usercard 2018-05-12 16:17:04 +03:00
Henry Jameson
4c3d62da04 fixed autocomplete lacking highlight 2018-05-12 15:19:53 +03:00
Henry Jameson
55aeb5b4b2 fix 2018-05-12 15:19:53 +03:00
Henry Jameson
e93ce99198 small fix + white color for user-card + opaque outline for text 2018-05-12 15:19:53 +03:00
Henry Jameson
fc1283da83 fixed nsfw hider having very small height, some border-radii for consistency 2018-05-12 15:19:53 +03:00
Henry Jameson
57e91bc783 fix jumping inputbox's height 2018-05-12 15:19:53 +03:00
Henry Jameson
15a7151ade Entire area around user counters are clickable now, not just the header-link 2018-05-12 15:19:53 +03:00
Henry Jameson
61fd0b65d9 i18n 2018-05-12 15:19:53 +03:00
Henry Jameson
f1478935da user card no longer uncomfortably close to user name in timeline 2018-05-12 15:19:53 +03:00
Henry Jameson
bc85e5f0c1 Further usercard readibility. Made it visible which "tab" is actiavated - should
be enough to hint user that you can click "following" / "followers". Fixes #77
2018-05-12 15:19:53 +03:00
Henry Jameson
a6fa913f45 Input fields separate radii 2018-05-12 15:19:53 +03:00
Henry Jameson
008b36dc24 gave text some shadow-outline to make it more readable on white backgrounds +
fixed weird layout (WHY)
2018-05-12 15:19:53 +03:00
Henry Jameson
e23986e239 unnecessary styles removed (fixes transparent color userstyle) 2018-05-12 15:19:53 +03:00
Henry Jameson
2b64432f9a semi-transparent inputbox style 2018-05-12 15:19:53 +03:00
Henry Jameson
c46795c692 use semi-transparent faint color + fix 2018-05-12 15:19:53 +03:00
hakabahitoyo
36b1c09831 add space 2018-05-06 11:33:53 +09:00
Hakaba Hitoyo
d9d6a497d9 debug 2018-05-05 01:02:39 +09:00
Hakaba Hitoyo
2471b71aab osa-compatible who to follow provider 2018-05-05 00:53:40 +09:00
hakabahitoyo
0691af1367 debug 2018-05-05 00:43:18 +09:00
Hakaba Hitoyo
2ade177d5a configurable who to follow panel 2018-05-05 00:20:19 +09:00
Hakaba Hitoyo
77ffa89464 Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into feature/who-to-follow-panel-configurable 2018-05-04 23:50:14 +09:00
lambda
68cb614db9 Merge branch 'develop' into 'develop'
Added a complete Esperanto translation.

See merge request pleroma/pleroma-fe!240
2018-04-29 14:52:39 +00:00
lambda
bff20a29b7 Merge branch 'nb' into 'develop'
Add Norwegian localization

See merge request pleroma/pleroma-fe!241
2018-04-29 14:52:01 +00:00
lambda
805410b933 Merge branch 'feature/redirect-root-by-login-or-not' into 'develop'
Redirect root by login ro not login

See merge request pleroma/pleroma-fe!251
2018-04-29 14:51:15 +00:00
Roger Braun
462eeb90b9 Add message preset functionality. 2018-04-29 16:44:08 +02:00
Hakaba Hitoyo
150b815407 lint 2018-04-29 18:09:49 +09:00
Hakaba Hitoyo
b1d1c7cfc4 lint 2018-04-29 18:07:40 +09:00
Hakaba Hitoyo
2a6721ea56 redirect root by login or not 2018-04-29 17:55:23 +09:00
Roger Braun
3ffb17c0ae Merge branch 'develop' into csaurus/pleroma-fe-fix-chrome-auto-loading 2018-04-27 09:59:31 +02:00
Hakaba Hitoyo
bb92798b74 Collapse chat by default 2018-04-24 07:48:30 +00:00
Roger Braun
935b7745ea Fix nsfw in notifications again. 2018-04-23 19:22:28 +02:00
Roger Braun
39026f8bc3 Fix repeat nsfw hiding. 2018-04-23 19:07:47 +02:00
lambda
9557ec59a8 Update timeline.js 2018-04-22 20:16:28 +00:00
csaurus
59f98aecd9 Stop blink from loading more statuses with every scroll. 2018-04-22 16:12:34 -04:00
Hakaba Hitoyo
033170212f merge 2018-04-22 00:48:06 +09:00
morguldir
741cd8cb67 Add Norwegian localization 2018-04-21 02:19:55 +02:00
Tirifto
dcf07253bc Added Esperanto to the list of language codes. 2018-04-21 01:24:33 +02:00
Tirifto
acf96f207d Added a complete Esperanto translation. 2018-04-21 01:03:29 +02:00
Exilat
ef4e052ede Small Update messages.js [OC] 2018-04-19 04:57:36 +00:00
Shpuld Shpludson
cb240a3e95 Merge branch 'patch-5' into 'develop'
Translated the latest update to french

See merge request pleroma/pleroma-fe!237
2018-04-17 16:52:19 +00:00
eal
7ad837f506 Fix follow import typo. 2018-04-17 15:03:10 +00:00
shpuld
9c90a24133 Merge branch 'fix/no-nsfw-in-repeats' into develop 2018-04-16 18:24:31 +03:00
shpuld
573f01650b Copy parent status nsfw into retweeted_status 2018-04-16 18:19:42 +03:00
shpuld
ce0b551c59 some ugly hack to prevent the jump in form height when you input first character 2018-04-16 17:52:43 +03:00