eris/pleroma-fe
1
1
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity
1487 commits 24 branches 24 tags 16 MiB
Commit graph

1225 commits

Author SHA1 Message Date
Henry Jameson
da362b2b88 minor style tweaks 2018-08-28 16:20:04 +03:00
Henry Jameson
330288b4cd panel styling cleanup 2018-08-28 16:14:32 +03:00
Henry Jameson
c3b27ab4c2 moved replies filtering to "filter" category in settings, made it more consistent 2018-08-28 15:47:42 +03:00
Henry Jameson
cff4177bf3 settings page update 2018-08-28 15:38:07 +03:00
Henry Jameson
b48a3210a3 tabs for settings 2018-08-28 14:28:05 +03:00
Henry Jameson
8e560676f1 allow multiple file upload 2018-08-28 14:05:03 +03:00
Henry Jameson
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
Henry Jameson
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
Henry Jameson
fd604dfd2a fixed still-image not preserving original aspect ratio and resolution. 2018-08-27 22:40:30 +03:00
Henry Jameson
eacbd9b500 Separated tab-switcher into a reusable component. This depends on JSX addition 2018-08-27 22:22:25 +03:00
Ekaterina Vaartis
d2640d4bb5 Add titles to source/expand buttons 2018-08-27 12:55:46 +03:00
Ekaterina Vaartis
14c1704ea1 Add titles to post visibility icons 2018-08-27 12:55:46 +03:00
scarlett
74a6df8a55 Match users using startsWith instead of match. 2018-08-26 13:51:21 +01:00
scarlett
b68ebf3056 Match emoji using startsWith instead of match. 2018-08-26 13:50:36 +01:00
kaniini
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
scarlett
54ac0dfefd Preserve subject in replies. 2018-08-26 01:50:11 +01:00
kaniini
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
kaniini
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
scarlett
52ce86ed57 Don't use nsfw clickthrough if the post is collapsed by default. 2018-08-26 00:21:54 +01:00
Hakaba Hitoyo
c6913e3909 correct /static/config.json decoding 2018-08-26 07:01:56 +09:00
Hakaba Hitoyo
8b9e973a55 save /api/statusnet/config.json connection 2018-08-26 07:00:23 +09:00
Hakaba Hitoyo
a3cc78115c rename apiStatusnetConfigSitePleromafe to apiConfig 2018-08-26 06:56:52 +09:00
Hakaba Hitoyo
a81c3b1324 fix typo 2018-08-26 06:54:03 +09:00
scarlett
a7811e7bd9 Add a checkbox for marking a post's attachments as NSFW 2018-08-25 22:18:43 +01:00
scarlett
d50440d802 When a post with a subject is collapsed, hide its attachments. 2018-08-25 20:33:44 +01:00
Ekaterina Vaartis
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
William Pitcock
30a6b7be5b attachment: add support for rendering alt text on images 2018-08-25 00:32:10 +00:00
kaniini
fe906cc3f0 Merge branch 'develop' into 'notifications' 
# Conflicts:
#   src/main.js
 2018-08-24 23:00:56 +00:00
scarlett
da96294866 Don't hide replies when inConversation. 2018-08-24 21:46:45 +01:00
scarlett
60b115320f Fix indentation 2018-08-24 20:19:22 +01:00
scarlett
50b3bd22e6 Remove old implementation of isReply. 2018-08-24 20:08:49 +01:00
scarlett
296ab54301 Add settings for changing the visibility of replies in the timeline. 2018-08-24 20:04:26 +01:00
kaniini
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
kaniini
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
kaniini
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
kaniini
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
dtluna
81c04fac17 Update Russian translations 2018-08-24 21:21:14 +03:00
tsukada-ecsec
dfc5f170c6 update 2018-08-24 18:46:14 +09:00
Henry Jameson
13acdc4a00 fixed error not displaying for 500 error. 2018-08-22 15:51:03 +03:00
tsukada-ecsec
0647c1bb72 debug 2018-08-22 15:15:15 +09:00
tsukada-ecsec
54166c3ad3 update settings 2018-08-22 11:47:36 +09:00
tsukada-ecsec
41256045f2 revert main.js 2018-08-22 11:38:04 +09:00
scarlett
2596f22814 Centre-align profile bios. 2018-08-21 19:16:03 +01:00
Henry Jameson
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
William Pitcock
95e6bccec5 Revert "Unify button styles and use min-width" 
This reverts commit 8f79193883.
 2018-08-20 18:06:29 +00:00
Henry Jameson
b97db4912d error display 2018-08-20 20:45:54 +03:00
Henry Jameson
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
Henry Jameson
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
Henry Jameson
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
Henry Jameson
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
Henry Jameson
fa66385c5b Updated localization files 2018-08-20 19:06:04 +03:00
Henry Jameson
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
ensra
3ec8e43a97 Rename expandCW to collapseMessageWithSubject. 
Add option to config.json, disabled by default.
 2018-08-20 03:41:40 +01:00
ensra
671db023da fix indent 2018-08-20 03:08:39 +01:00
ensra
1121f32c48 Add support for configurable CW clickthrough. 2018-08-20 02:59:06 +01:00
kaniini
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
kaniini
702dfcec10 Merge branch 'develop' into 'fixes-and-tweaks' 
# Conflicts:
#   src/i18n/messages.js
 2018-08-19 23:59:15 +00:00
Foxhkron
56ddeec8f3
Merge upstream 2018-08-19 01:23:03 +02:00
William Pitcock
fe06beae18 fix lint issues 2018-08-18 17:06:07 +00:00
William Pitcock
61d40f40ae allow default visibility scope to be configured 2018-08-18 17:06:06 +00:00
Henry Jameson
99f849bd8c Revert "storing entire config instead of each separate thing of it, so that future" 
This reverts commit 18117c3bfa.

b/c something else uses same field but i want to fix that in another MR
 2018-08-18 13:56:45 +03:00
Henry Jameson
0b6f9c62a1 fix 2018-08-18 13:41:23 +03:00
Henry Jameson
23a1000298 fix post search query to have id +1 because search is exclusive 2018-08-16 18:13:31 +03:00
Henry Jameson
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
  notifs fix
  maybe i should actually add myself to contributors list?
  ...
 2018-08-16 13:59:01 +03:00
Henry Jameson
decc209fdc fix lint 2018-08-16 13:57:16 +03:00
Henry Jameson
693eb4b717 cleanup, updated broken favorites look + localization strings 2018-08-16 13:41:45 +03:00
Henry Jameson
e8f7491003 fixed favoriting from notification column 2018-08-16 13:20:29 +03:00
Henry Jameson
ef04a78634 added workaround for broken favorites 2018-08-16 13:12:31 +03:00
Henry Jameson
627e227076 fixes hella ton of annoyances with file upload display 2018-08-15 14:53:40 +03:00
Henry Jameson
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
Henry Jameson
0e5b74e3dd Configurable video looping, option to not to loop silent videos. Updated 
localization strings.
 2018-08-15 12:51:21 +03:00
Sebastian Huebner
45478d4bed
i18n/messages.js: changed Folgende back to Follower 2018-08-15 10:29:19 +02:00
Henry Jameson
d2ec70c323 added pointer cursor for nsfw placeholder. fixed nsfw videos requiring double-click 2018-08-15 11:20:40 +03:00
Sebastian Huebner
1dddce5624 updated german translation 2018-08-15 10:18:16 +02:00
Henry Jameson
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
Henry Jameson
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
Henry Jameson
d417cb35bb fix potential stretched spurdo 2018-08-13 15:36:10 +03:00
Henry Jameson
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
Henry Jameson
ef515056b5 missing files and a plug for bad favs 2018-08-13 13:17:10 +03:00
lambda
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
Henry
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
Henry Jameson
d085cc8584 undo test condition 2018-08-12 14:15:09 +03:00
Henry Jameson
63650aec29 Added support for qvitter api fetching of notifications 2018-08-12 14:14:34 +03:00
lambda
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
lambda
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
lambda
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
lambda
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
lambda
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
Hakaba Hitoyo
d1b3d7e90f debug 2018-08-11 14:54:30 +09:00
Hakaba Hitoyo
e2dae87772 update 2018-08-11 14:50:40 +09:00
Hakaba Hitoyo
b7d1bb39e0 update 2018-08-11 14:35:04 +09:00
Hakaba Hitoyo
23cfec4332 Update messages.js 2018-08-10 07:04:25 +00:00
Toromino
895ef525d2 Update status.vue 2018-08-09 16:47:08 +00:00
Toromino
01652fc252 Update retweet_button.js 2018-08-09 16:46:18 +00:00
Toromino
316692ee85 Update retweet_button.vue 2018-08-09 16:45:52 +00:00
eal
876f7633fe Use serverside html rendering in usernames and bios if available. 2018-08-09 12:52:34 +03:00
Hakaba Hitoyo
6cc1083287 フォロワーはインポートできない。 2018-08-09 07:30:22 +00:00
Hakaba Hitoyo
f8834ba1fb Update messages.js 2018-08-09 07:20:35 +00:00
Hakaba Hitoyo
3398303c9b Update messages.js 2018-08-09 06:59:23 +00:00
Toromino
e60fde233b Update status.vue 2018-08-08 14:39:22 +00:00
dtluna
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
dtluna
da36cd11e8 Hide all status actions if not logged in 2018-08-06 11:57:27 +03:00
Henry Jameson
d5efa10946 hopefully, fix linter 2018-08-06 09:52:07 +03:00
Henry Jameson
976444064f Fixes broken custom emoji in autocomplete when proxying to remote BE 2018-08-06 09:45:22 +03:00
Henry Jameson
d3d5a84868 Made it so that unfocused tab doesn't autostream posts when scrolled to the top 2018-08-06 07:58:34 +03:00
Toromino
88a81406e3 Remove trailing whitespace 2018-08-05 19:41:34 +00:00
Toromino
fd484a1a62 Textarea is now focused when replying 2018-08-05 19:17:11 +00:00
Henry Jameson
9cebb00faa the missing piece for invites system 2018-08-05 10:01:38 +03:00
Henry Jameson
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
Henry Jameson
3d72c2b964 fixed lint 2018-08-05 05:44:02 +03:00
Henry Jameson
b04a9d1229 cleanup, fixed self-highlighting in notifications, fixed incorrect hex code handling 2018-08-05 05:41:37 +03:00
Henry Jameson
6a81aa2745 added ability to pick the style of highlighting 2018-08-05 05:18:04 +03:00
hakabahitoyo
5e47c59615 debug 2018-08-02 19:16:48 +09:00
Hakaba Hitoyo
19e310fc67 lint 2018-08-02 18:38:43 +09:00
Hakaba Hitoyo
5900bccff3 debug 2018-08-02 18:34:12 +09:00
Hakaba Hitoyo
bcd499c372 who to follow panel uses /api/v1/suggestions 2018-08-02 17:57:00 +09:00
lambda
17f6eb18e7 Revert "Merge branch 'cw-clickthrough' into 'develop'" 
This reverts merge request !291
 2018-07-12 07:20:39 +00:00
Henry Jameson
d886ab752c post-rebase fix, backported d7d787b84c 2018-07-06 20:19:02 +03:00
Henry Jameson
38d5226ad1 notifs fix 2018-07-06 20:14:39 +03:00
Henry Jameson
0714391aba UI update 2018-07-06 20:14:36 +03:00
Henry Jameson
398eaaf79b fixed the UI 2018-07-06 20:12:09 +03:00
Henry Jameson
8ccebbe156 both bugs fixed. it's reactive and no more conflicting cards 2018-07-06 20:12:09 +03:00
Henry Jameson
fa8c221f3a moved style generator into separate file. notifications are highlighted too now. 2018-07-06 20:12:09 +03:00
Henry Jameson
f911182a2f working, somewhat 2018-07-06 20:12:09 +03:00
Henry Jameson
148e691199 initial vers 2018-07-06 20:12:09 +03:00
Ole Bertram
2a87e29180
Add validation of the imported theme and the corresponding warning message 2018-07-04 14:25:40 +02:00
Ole Bertram
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
Vivian Lim
158342fc39 Fix lint warnings 2018-06-29 00:10:17 -07:00
Vivian Lim
b0cf050797 Add configuration option to enable click-through content warnings 2018-06-28 23:39:55 -07:00
Vivian Lim
ab86e87e85 Also hide attachments behind clickthrough. 2018-06-28 23:39:01 -07:00
Vivian Lim
65edcaf4b9 Differentiate content warning block if it is on lightbg 2018-06-28 23:39:01 -07:00
Vivian Lim
b3e122d31f Carry forward content warnings in replies 2018-06-28 23:39:01 -07:00
Vivian Lim
0554cac113 Add click-to-show content warnings on posts 2018-06-28 23:39:01 -07:00
Ole Bertram
fdc64cfa8a
Add German localization for theme import/export 2018-06-28 03:28:33 +02:00
Ole Bertram
d2b79856c6
Add theme import feature 2018-06-28 03:28:23 +02:00
Ole Bertram
f36984c4a4
Refactor theme settings state initialization 2018-06-28 02:07:50 +02:00
Ole Bertram
29f69de240
Add theme export feature 2018-06-28 01:23:19 +02:00
lambda
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
goofy
c2f6227092 Update messages.js / tiny typofix in fr version 2018-06-24 14:18:43 +00:00
Haelwenn (lanodan) Monnier
6da86599a9
src/i18n/messages.js: French Translation for Post Scope UI tooltips 
Co-authored-by: goofy
 2018-06-24 16:14:47 +02:00
Ole Bertram
44428e8b09
Add warning/info text on appriopriate status scopes 2018-06-23 22:10:15 +02:00
Ole Bertram
05bc6fa8e8
Add title text with description to scope icons 2018-06-23 22:09:13 +02:00
Francis Dinh
556eb4b8a3 add unretweet action to statuses.js 2018-06-14 17:17:36 -04:00
Francis Dinh
d05fcfa1a8 Add unretweet support 2018-06-14 05:00:11 -04:00
Roger Braun
d4f5b3feec Use parents scope if available. 2018-06-12 19:28:48 +02:00
lambda
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
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
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
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
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