Commit Graph

1288 Commits

Author SHA1 Message Date
meireikei 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
kaniini 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
kaniini 84aa1ecdcd Merge branch 'feature/rich-text' into 'develop'
initial rich text authoring support

See merge request pleroma/pleroma-fe!325
2018-08-31 03:54:37 +00:00
William Pitcock cabcb5c81b i18n: make "plain text" translatable 2018-08-31 03:42:12 +00:00
William Pitcock 9a43ba73e6 add the ability to select a post's content type 2018-08-31 03:42:11 +00: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
kaniini 2dd99c7dd9 Merge branch 'emoji-shortcode-startswith' into 'develop'
For user and emoji shortcode autocomplete, match using startsWith() instead of match().

Closes #135

See merge request pleroma/pleroma-fe!320
2018-08-26 20:32:00 +00:00
kaniini 257da5c740 Merge branch 'remove-unused-settings' into 'develop'
Remove unused settings

See merge request pleroma/pleroma-fe!319
2018-08-26 20:31:25 +00: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
hakabahitoyo 7fc4506d29 remove-unused-settings 2018-08-26 17:32:58 +09: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
kaniini 256aa25a11 Merge branch 'reply-preserve-subject' into 'develop'
Preserve subject in replies.

See merge request pleroma/pleroma-fe!318
2018-08-26 01:22:13 +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
kaniini 9e111f14fd Merge branch 'nsfw-attachment-marking' into 'develop'
Add a checkbox for marking a post's attachments as NSFW

See merge request pleroma/pleroma-fe!317
2018-08-25 22:25:04 +00: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 673f0fca3f Merge branch 'notifications' into 'develop'
Support qvitter api notifications

Closes #129

See merge request pleroma/pleroma-fe!306
2018-08-24 23:04:36 +00:00
kaniini fe906cc3f0 Merge branch 'develop' into 'notifications'
# Conflicts:
#   src/main.js
2018-08-24 23:00:56 +00:00
kaniini 55650ff7ea Merge branch 'reply-visibility' into 'develop'
Add settings for changing the visibility of replies in the timeline.

See merge request pleroma/pleroma-fe!314
2018-08-24 21:51:54 +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
tsukada-ecsec bebd9c5ec8 revert 2018-08-22 11:35:56 +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