699ee0891d
Changeable defaults for hideUserStats and hidePostStats
2018-09-04 00:48:14 +01:00
bdcbd110e4
Add option for hiding post statistics (e.g. repeats, favs)
2018-09-04 00:41:52 +01:00
dcb7e1ecf4
Add option for disabling counts (followers, statuses) in user profiles.
2018-09-04 00:32:25 +01:00
dc0b47e8bd
fix collapse link being too small
2018-09-03 23:30:07 +03:00
f9eb9e0b70
small fix for non-square gif avatars
2018-09-03 22:49:46 +03:00
6e64324d37
Fixed collapseMessageWithSubjectLocal always using instance-provided config.
2018-09-03 22:40:45 +03:00
d4f9d21857
Fix last place with usercard having wrong width
2018-09-03 22:23:53 +03:00
08b044c365
Fixed non-masked image looking weird in chrome.
2018-09-03 22:18:59 +03:00
a6047e0ad5
Kinda went back to using align-items: stretch. Fixed error message floating.
2018-09-03 22:12:18 +03:00
36101abc22
Simplified image sensitivity label
2018-09-03 18:52:07 +03:00
900aaefb98
Update users.js
2018-09-03 12:01:05 +00:00
fa477dd41f
show features panel only if not login
2018-09-03 16:02:06 +09:00
38b683b30c
update
2018-09-03 15:57:22 +09:00
049e2397b1
update
2018-09-03 15:23:09 +09:00
07ef43c7b5
debug
2018-09-03 14:55:40 +09:00
52fe01e4d8
mock features panel
2018-09-03 14:43:10 +09:00
20b0ffc0b9
Merge branch 'imvomitingasicodethisshit' into 'develop'
...
Made showing format selection optional and default to false
See merge request pleroma/pleroma-fe!329
2018-09-01 05:57:58 +00:00
d6240c25cf
small fix
2018-08-31 17:24:46 +03:00
17f30190e0
Made showing format selection optional and default to false
2018-08-31 17:00:41 +03:00
77e8933b2e
Fix mistakes
2018-08-31 16:13:43 +03:00
384c80e238
Change styles a bit, make pre-formatted blocks not overflow but scroll
2018-08-31 16:04:52 +03:00
f07e6b271c
Add styles for h1/2/3/4/5 tags in status html
2018-08-31 15:11:27 +03:00
f9bfe2ea37
post status form: styling fixes for content-type selector, align icons with selector
2018-08-31 04:23:06 +00:00
958acbab8d
Merge branch 'polish' into 'develop'
...
Another one of those MR that fixes many many small-to-medium things
Closes #92 , #75 , #122 , #52 , #72 , and #87
See merge request pleroma/pleroma-fe!324
2018-08-31 04:10:17 +00:00
2e37e8cf39
Pass user id to fetchFriends
...
It looks like the API that fetchFriends expects was changed, to require
an ID.
2018-08-31 04:07:25 +00:00
e71b0411aa
Merge branch 'post-button-labels' into 'develop'
...
Add labels to post buttons
See merge request pleroma/pleroma-fe!323
2018-08-31 04:04:44 +00:00
cabcb5c81b
i18n: make "plain text" translatable
2018-08-31 03:42:12 +00:00
9a43ba73e6
add the ability to select a post's content type
2018-08-31 03:42:11 +00:00
8c07e63f77
fix
2018-08-31 04:39:07 +03:00
46d8b55d44
Merge remote-tracking branch 'upstream/develop' into polish
...
* upstream/develop:
i18n: make "plain text" translatable
add the ability to select a post's content type
2018-08-31 04:20:40 +03:00
e99534ef71
added option for logo in navbar to follow color scheme of the rest of the site
...
also fixed potential mess-up between api/static configs
2018-08-31 04:06:00 +03:00
20a67e6809
i18n: make "plain text" translatable
2018-08-31 00:44:25 +00:00
38e3c2493d
add the ability to select a post's content type
2018-08-31 00:42:42 +00:00
63fdad8703
fix
2018-08-30 22:59:52 +03:00
1461a52ade
vodka translations
2018-08-30 20:45:50 +03:00
065d1c7f49
fix
2018-08-30 20:16:36 +03:00
3b9cb1384a
fix
2018-08-30 19:53:13 +03:00
fa4c4c9122
fixed #87
2018-08-30 18:23:43 +03:00
fa1116249d
fixup! panel styling cleanup
2018-08-30 17:13:54 +03:00
507d5bc444
fixup! Added logic to process reply to favorite request and update likes counter accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
2018-08-30 16:27:35 +03:00
1246463f96
fixes broken nsfw hider in notifications
2018-08-30 16:21:10 +03:00
fb7f65481e
restored "progress" cursor indicator for loading nsfw images
2018-08-30 16:11:31 +03:00
e58221fb87
fixed #72
2018-08-30 16:02:53 +03:00
b0e0686c7f
Added ability to hide certain types of notifications
2018-08-28 21:21:29 +03:00
66a22762c2
fixup! Separated tab-switcher into a reusable component. This depends on JSX addition
2018-08-28 16:22:49 +03:00
da362b2b88
minor style tweaks
2018-08-28 16:20:04 +03:00
330288b4cd
panel styling cleanup
2018-08-28 16:14:32 +03:00
c3b27ab4c2
moved replies filtering to "filter" category in settings, made it more consistent
2018-08-28 15:47:42 +03:00
cff4177bf3
settings page update
2018-08-28 15:38:07 +03:00
b48a3210a3
tabs for settings
2018-08-28 14:28:05 +03:00
8e560676f1
allow multiple file upload
2018-08-28 14:05:03 +03:00
68d15f665e
Show lock icon instead of hiding repeat button, tusky-style. Added hint
...
explaining what's going on. Fixes favorite button jumping left and right
depending on post visibility
2018-08-28 13:42:44 +03:00
226849b26e
Added logic to process reply to favorite request and update likes counter
...
accordingly. Should fix some of cases of doubled likes and likes counter not decrementing.
2018-08-27 23:15:58 +03:00
fd604dfd2a
fixed still-image not preserving original aspect ratio and resolution.
2018-08-27 22:40:30 +03:00
eacbd9b500
Separated tab-switcher into a reusable component. This depends on JSX addition
2018-08-27 22:22:25 +03:00
d2640d4bb5
Add titles to source/expand buttons
2018-08-27 12:55:46 +03:00
14c1704ea1
Add titles to post visibility icons
2018-08-27 12:55:46 +03:00
74a6df8a55
Match users using startsWith instead of match.
2018-08-26 13:51:21 +01:00
b68ebf3056
Match emoji using startsWith instead of match.
2018-08-26 13:50:36 +01:00
bc4f09b775
Merge branch 'serverside-frontend-configuration-2' into 'develop'
...
serverside-frontend-configuration-2
See merge request pleroma/pleroma-fe!312
2018-08-26 06:20:19 +00:00
54ac0dfefd
Preserve subject in replies.
2018-08-26 01:50:11 +01:00
a7c6007d54
Merge branch 'attachment-collapse' into 'develop'
...
When a post with a subject is collapsed, hide its attachments.
See merge request pleroma/pleroma-fe!316
2018-08-26 00:02:32 +00:00
5bb5ef43ef
Merge branch 'language-override' into 'develop'
...
Make interface language configurable from settings
Closes #36
See merge request pleroma/pleroma-fe!315
2018-08-26 00:01:33 +00:00
52ce86ed57
Don't use nsfw clickthrough if the post is collapsed by default.
2018-08-26 00:21:54 +01:00
c6913e3909
correct /static/config.json decoding
2018-08-26 07:01:56 +09:00
8b9e973a55
save /api/statusnet/config.json connection
2018-08-26 07:00:23 +09:00
a3cc78115c
rename apiStatusnetConfigSitePleromafe to apiConfig
2018-08-26 06:56:52 +09:00
a81c3b1324
fix typo
2018-08-26 06:54:03 +09:00
a7811e7bd9
Add a checkbox for marking a post's attachments as NSFW
2018-08-25 22:18:43 +01:00
d50440d802
When a post with a subject is collapsed, hide its attachments.
2018-08-25 20:33:44 +01:00
c1e4bfa90f
Make interface language configurable from settings
...
The locale can now be configured in settings and is stored in
Vuex. The changes are applied immidiately after selection. The list of
languages is taken from the messages file, which contains all the
available locales (and a new value, `interfaceLanguage`, to control
the translation of this option in the options menu)
Closes #36
2018-08-25 13:29:49 +03:00
30a6b7be5b
attachment: add support for rendering alt text on images
2018-08-25 00:32:10 +00:00
fe906cc3f0
Merge branch 'develop' into 'notifications'
...
# Conflicts:
# src/main.js
2018-08-24 23:00:56 +00:00
da96294866
Don't hide replies when inConversation.
2018-08-24 21:46:45 +01:00
60b115320f
Fix indentation
2018-08-24 20:19:22 +01:00
50b3bd22e6
Remove old implementation of isReply.
2018-08-24 20:08:49 +01:00
296ab54301
Add settings for changing the visibility of replies in the timeline.
2018-08-24 20:04:26 +01:00
14db3f279d
Merge branch 'feature/who-to-follow-panel-uses-suggestions-api' into 'develop'
...
Who to follow panel uses suggestions api
See merge request pleroma/pleroma-fe!294
2018-08-24 18:46:23 +00:00
0429963e63
Merge branch 'easy-japanese' into 'develop'
...
Easy Japanese translation
See merge request pleroma/pleroma-fe!305
2018-08-24 18:45:22 +00:00
71576947ed
Merge branch 'feature/update-russian-translation' into 'develop'
...
Update Russian translations
See merge request pleroma/pleroma-fe!313
2018-08-24 18:43:54 +00:00
b0568ca5c3
Merge branch 'center-bios' into 'develop'
...
Centre-align profile bios.
See merge request pleroma/pleroma-fe!311
2018-08-24 18:42:09 +00:00
81c04fac17
Update Russian translations
2018-08-24 21:21:14 +03:00
dfc5f170c6
update
2018-08-24 18:46:14 +09:00
13acdc4a00
fixed error not displaying for 500 error.
2018-08-22 15:51:03 +03:00
0647c1bb72
debug
2018-08-22 15:15:15 +09:00
54166c3ad3
update settings
2018-08-22 11:47:36 +09:00
41256045f2
revert main.js
2018-08-22 11:38:04 +09:00
2596f22814
Centre-align profile bios.
2018-08-21 19:16:03 +01:00
a196c3551a
Revert "Drop the entire thing about hidden "own" timeline since it doesn't necessarily"
...
This reverts commit 612aa56c8b
2018-08-21 00:21:35 +03:00
95e6bccec5
Revert "Unify button styles and use min-width"
...
This reverts commit 8f79193883
2018-08-20 18:06:29 +00:00
b97db4912d
error display
2018-08-20 20:45:54 +03:00
f9b0a95969
removed style for rounding bottom part of notifications because there's now
...
always "load more" footer
2018-08-20 20:08:21 +03:00
3ccea3442e
fix custom emoji in username, fix gif avatar not being animated when hovering on
...
the notification
2018-08-20 20:05:12 +03:00
35b912bce4
Merge remote-tracking branch 'upstream/develop' into notifications
...
* upstream/develop: (23 commits)
Rename expandCW to collapseMessageWithSubject.
fix indent
Add support for configurable CW clickthrough.
Merge upstream
fix lint issues
allow default visibility scope to be configured
Revert "storing entire config instead of each separate thing of it, so that future"
fixes hella ton of annoyances with file upload display
using custom ascend value as suggested here: https://github.com/fontello/fontello/issues/513#issuecomment-237551101 helped.
disable hinting because it breaks alignment on some icons (namely - locks)
fix for timeago being ass when post has replies. added hover colors for clickable icons on the right side. Reverted line-height to its original value
Configurable video looping, option to not to loop silent videos. Updated localization strings.
added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click
Made pausing TL updating configurable. Added styles for disabled checkboxes. Shuffled settings a bit b/c all the settings are in "Attachments" section depsite the fact not all of them are attachments-related.
storing entire config instead of each separate thing of it, so that future options won't be lost during reloads because developer forgot to update that list of settings to be persisted
fix potential stretched spurdo
fixed custom emoji in nickname. changed icons on right side to be more streamlined. adjusted CSS so that all text in header of post is on same baseline and all icons/images are middle-aligned.
Add validation of the imported theme and the corresponding warning message
Unify button styles and use min-width
Add German localization for theme import/export
...
2018-08-20 20:04:54 +03:00
9e78c64d5e
Hide initial desktop notifications spam when FE is opened and there's a lot of
...
unseen notifications.
2018-08-20 19:58:49 +03:00
fa66385c5b
Updated localization files
2018-08-20 19:06:04 +03:00
612aa56c8b
Drop the entire thing about hidden "own" timeline since it doesn't necessarily
...
contain all of the users posts (it doesn't contain DMs) even though it's "us".
Since this is a workaround anyway just fetch home timeline instead. It could end
up making more queries if user doesn't post that often.
2018-08-20 19:01:54 +03:00
3ec8e43a97
Rename expandCW to collapseMessageWithSubject.
...
Add option to config.json, disabled by default.
2018-08-20 03:41:40 +01:00
671db023da
fix indent
2018-08-20 03:08:39 +01:00
1121f32c48
Add support for configurable CW clickthrough.
2018-08-20 02:59:06 +01:00
9982376f9a
Merge branch 'feature/theme-export-import' into 'develop'
...
Theme import & export
Closes #119
See merge request pleroma/pleroma-fe!290
2018-08-20 00:03:35 +00:00
702dfcec10
Merge branch 'develop' into 'fixes-and-tweaks'
...
# Conflicts:
# src/i18n/messages.js
2018-08-19 23:59:15 +00:00
56ddeec8f3
Merge upstream
2018-08-19 01:23:03 +02:00
fe06beae18
fix lint issues
2018-08-18 17:06:07 +00:00
61d40f40ae
allow default visibility scope to be configured
2018-08-18 17:06:06 +00:00
99f849bd8c
Revert "storing entire config instead of each separate thing of it, so that future"
...
This reverts commit 18117c3bfa
2018-08-18 13:56:45 +03:00
0b6f9c62a1
fix
2018-08-18 13:41:23 +03:00
23a1000298
fix post search query to have id +1 because search is exclusive
2018-08-16 18:13:31 +03:00
6454837ea4
Merge remote-tracking branch 'upstream/develop' into notifications
...
* upstream/develop: (26 commits)
Update status.vue
Update retweet_button.js
Update retweet_button.vue
Use serverside html rendering in usernames and bios if available.
Update status.vue
Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
Hide all status actions if not logged in
hopefully, fix linter
Fixes broken custom emoji in autocomplete when proxying to remote BE
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
Remove trailing whitespace
Textarea is now focused when replying
the missing piece for invites system
Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme switcher select now has styled options that show preview of what theme's bg/fg colors are
fixed lint
cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
added ability to pick the style of highlighting
post-rebase fix, backported d7d787b84c
2018-08-16 13:59:01 +03:00
decc209fdc
fix lint
2018-08-16 13:57:16 +03:00
693eb4b717
cleanup, updated broken favorites look + localization strings
2018-08-16 13:41:45 +03:00
e8f7491003
fixed favoriting from notification column
2018-08-16 13:20:29 +03:00
ef04a78634
added workaround for broken favorites
2018-08-16 13:12:31 +03:00
627e227076
fixes hella ton of annoyances with file upload display
2018-08-15 14:53:40 +03:00
d94b77b863
fix for timeago being ass when post has replies. added hover colors for
...
clickable icons on the right side. Reverted line-height to its original value
2018-08-15 13:02:39 +03:00
0e5b74e3dd
Configurable video looping, option to not to loop silent videos. Updated
...
localization strings.
2018-08-15 12:51:21 +03:00
45478d4bed
i18n/messages.js: changed Folgende back to Follower
2018-08-15 10:29:19 +02:00
d2ec70c323
added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click
2018-08-15 11:20:40 +03:00
1dddce5624
updated german translation
2018-08-15 10:18:16 +02:00
87eee191b8
Made pausing TL updating configurable. Added styles for disabled checkboxes.
...
Shuffled settings a bit b/c all the settings are in "Attachments" section
depsite the fact not all of them are attachments-related.
2018-08-13 17:07:45 +03:00
18117c3bfa
storing entire config instead of each separate thing of it, so that future
...
options won't be lost during reloads because developer forgot to update that
list of settings to be persisted
2018-08-13 16:17:00 +03:00
d417cb35bb
fix potential stretched spurdo
2018-08-13 15:36:10 +03:00
4d112b70fd
fixed custom emoji in nickname. changed icons on right side to be more
...
streamlined. adjusted CSS so that all text in header of post is on same
baseline and all icons/images are middle-aligned.
2018-08-13 14:46:28 +03:00
ef515056b5
missing files and a plug for bad favs
2018-08-13 13:17:10 +03:00
ce88f351f7
Merge branch 'invites' into 'develop'
...
FE part of invites system
See merge request pleroma/pleroma-fe!297
2018-08-12 16:15:27 +00:00
27adde9887
Merge branch 'develop' into 'feature/accountHighlight'
...
# Conflicts:
# src/components/user_card_content/user_card_content.vue
2018-08-12 12:05:08 +00:00
d085cc8584
undo test condition
2018-08-12 14:15:09 +03:00
63650aec29
Added support for qvitter api fetching of notifications
2018-08-12 14:14:34 +03:00
db6ff4824a
Merge branch 'feature/focus_reply_form' into 'develop'
...
Focus textarea when clicking "reply"
See merge request pleroma/pleroma-fe!298
2018-08-12 10:48:08 +00:00
a64fbe661f
Merge branch 'fixSelectOptionStyling' into 'develop'
...
Fixes selects having unreadable text on some browsers/OSes.
Closes #123
See merge request pleroma/pleroma-fe!296
2018-08-12 10:47:19 +00:00
e21f78e519
Merge branch 'doNotAutoFetchOnUnfocusedTab' into 'develop'
...
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
See merge request pleroma/pleroma-fe!299
2018-08-12 10:45:36 +00:00
eeddceee6b
Merge branch 'fixRelativeEmojis' into 'develop'
...
Fixes broken custom emoji in autocomplete when proxying to remote BE
See merge request pleroma/pleroma-fe!300
2018-08-12 10:44:39 +00:00
01c5bae594
Merge branch 'feature/emoji-in-profiles' into 'develop'
...
Use serverside html rendering in usernames and bios if available.
See merge request pleroma/pleroma-fe!304
2018-08-12 10:40:57 +00:00
d1b3d7e90f
debug
2018-08-11 14:54:30 +09:00
e2dae87772
update
2018-08-11 14:50:40 +09:00
b7d1bb39e0
update
2018-08-11 14:35:04 +09:00
23cfec4332
Update messages.js
2018-08-10 07:04:25 +00:00
895ef525d2
Update status.vue
2018-08-09 16:47:08 +00:00
01652fc252
Update retweet_button.js
2018-08-09 16:46:18 +00:00
316692ee85
Update retweet_button.vue
2018-08-09 16:45:52 +00:00
876f7633fe
Use serverside html rendering in usernames and bios if available.
2018-08-09 12:52:34 +03:00
6cc1083287
フォロワーはインポートできない。
2018-08-09 07:30:22 +00:00
f8834ba1fb
Update messages.js
2018-08-09 07:20:35 +00:00
3398303c9b
Update messages.js
2018-08-09 06:59:23 +00:00
e60fde233b
Update status.vue
2018-08-08 14:39:22 +00:00
5cfc247c6b
Revert "Merge branch 'feature/hide-all-status-actions-if-not-logged-in' into 'develop'"
...
This reverts merge request !301
2018-08-06 09:08:50 +00:00
da36cd11e8
Hide all status actions if not logged in
2018-08-06 11:57:27 +03:00
d5efa10946
hopefully, fix linter
2018-08-06 09:52:07 +03:00
976444064f
Fixes broken custom emoji in autocomplete when proxying to remote BE
2018-08-06 09:45:22 +03:00
d3d5a84868
Made it so that unfocused tab doesn't autostream posts when scrolled to the top
2018-08-06 07:58:34 +03:00
88a81406e3
Remove trailing whitespace
2018-08-05 19:41:34 +00:00
fd484a1a62
Textarea is now focused when replying
2018-08-05 19:17:11 +00:00
9cebb00faa
the missing piece for invites system
2018-08-05 10:01:38 +03:00
3373d28701
Fixes selects having unreadable text on some browsers/OSes. Added bonus: theme
...
switcher select now has styled options that show preview of what theme's bg/fg
colors are
2018-08-05 09:18:04 +03:00
3d72c2b964
fixed lint
2018-08-05 05:44:02 +03:00
b04a9d1229
cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling
2018-08-05 05:41:37 +03:00
6a81aa2745
added ability to pick the style of highlighting
2018-08-05 05:18:04 +03:00
5e47c59615
debug
2018-08-02 19:16:48 +09:00
19e310fc67
lint
2018-08-02 18:38:43 +09:00
5900bccff3
debug
2018-08-02 18:34:12 +09:00
bcd499c372
who to follow panel uses /api/v1/suggestions
2018-08-02 17:57:00 +09:00
17f6eb18e7
Revert "Merge branch 'cw-clickthrough' into 'develop'"
...
This reverts merge request !291
2018-07-12 07:20:39 +00:00
d886ab752c
post-rebase fix, backported d7d787b84c
2018-07-06 20:19:02 +03:00
38d5226ad1
notifs fix
2018-07-06 20:14:39 +03:00
0714391aba
UI update
2018-07-06 20:14:36 +03:00
398eaaf79b
fixed the UI
2018-07-06 20:12:09 +03:00
8ccebbe156
both bugs fixed. it's reactive and no more conflicting cards
2018-07-06 20:12:09 +03:00
fa8c221f3a
moved style generator into separate file. notifications are highlighted too now.
2018-07-06 20:12:09 +03:00
f911182a2f
working, somewhat
2018-07-06 20:12:09 +03:00
148e691199
initial vers
2018-07-06 20:12:09 +03:00
2a87e29180
Add validation of the imported theme and the corresponding warning message
2018-07-04 14:25:40 +02:00
8f79193883
Unify button styles and use min-width
...
This seemed to be the same across multiple components anyway.
Switched to min-width to allow for buttons with longer text, e.g.
from other languages.
2018-07-04 13:49:31 +02:00
158342fc39
Fix lint warnings
2018-06-29 00:10:17 -07:00
b0cf050797
Add configuration option to enable click-through content warnings
2018-06-28 23:39:55 -07:00
ab86e87e85
Also hide attachments behind clickthrough.
2018-06-28 23:39:01 -07:00
65edcaf4b9
Differentiate content warning block if it is on lightbg
2018-06-28 23:39:01 -07:00
b3e122d31f
Carry forward content warnings in replies
2018-06-28 23:39:01 -07:00
0554cac113
Add click-to-show content warnings on posts
2018-06-28 23:39:01 -07:00
fdc64cfa8a
Add German localization for theme import/export
2018-06-28 03:28:33 +02:00
d2b79856c6
Add theme import feature
2018-06-28 03:28:23 +02:00
f36984c4a4
Refactor theme settings state initialization
2018-06-28 02:07:50 +02:00
29f69de240
Add theme export feature
2018-06-28 01:23:19 +02:00
c07adb7121
Merge branch 'patch-1' into 'develop'
...
Update messages.js / tiny typofix in fr version
See merge request pleroma/pleroma-fe!288
2018-06-25 06:07:47 +00:00
c2f6227092
Update messages.js / tiny typofix in fr version
2018-06-24 14:18:43 +00:00
6da86599a9
src/i18n/messages.js: French Translation for Post Scope UI tooltips
...
Co-authored-by: goofy
2018-06-24 16:14:47 +02:00
44428e8b09
Add warning/info text on appriopriate status scopes
2018-06-23 22:10:15 +02:00
05bc6fa8e8
Add title text with description to scope icons
2018-06-23 22:09:13 +02:00
556eb4b8a3
add unretweet action to statuses.js
2018-06-14 17:17:36 -04:00
d05fcfa1a8
Add unretweet support
2018-06-14 05:00:11 -04:00
d4f5b3feec
Use parents scope if available.
2018-06-12 19:28:48 +02:00
7707048bff
Merge branch 'feature/update-de-translation' into 'develop'
...
updated german translation
See merge request pleroma/pleroma-fe!269
2018-06-12 17:09:02 +00:00
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
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
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
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
c155110eed
messages: rename content warning to subject
2018-06-08 18:47:21 +00:00
d766125eca
Update messages.js
2018-06-08 14:08:07 +00:00
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
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
af47d51cd1
Merge branch 'develop' into 'patch-1'
...
# Conflicts:
# src/i18n/messages.js
2018-06-08 13:30:49 +00:00
scarlett