Commit graph

4969 commits

Author SHA1 Message Date
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
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
kaniini
4ba4772e92 Merge branch 'cw-clickthrough' into 'develop'
Add support for configurable CW clickthrough

See merge request pleroma/pleroma-fe!310
2018-08-20 02:51:20 +00: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
65dfceae59 Merge branch 'fixes-and-tweaks' into 'develop'
Fixes and tweaks

See merge request pleroma/pleroma-fe!307
2018-08-20 00:02:59 +00:00
kaniini
702dfcec10 Merge branch 'develop' into 'fixes-and-tweaks'
# Conflicts:
#   src/i18n/messages.js
2018-08-19 23:59:15 +00:00
kaniini
d6b3394b79 Merge branch 'user_settings_tabs' into 'develop'
Add tabs to user settings

See merge request pleroma/pleroma-fe!308
2018-08-19 23:40:31 +00:00
Foxhkron
56ddeec8f3
Merge upstream 2018-08-19 01:23:03 +02:00
kaniini
5c3f6aebb9 Merge branch 'feature/default-scope' into 'develop'
Feature/default scope

See merge request pleroma/pleroma-fe!309
2018-08-18 17:09:37 +00: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
cc473df314 changed the only surviving and important test to accommodate for new notifications flow. 2018-08-16 14:46:05 +03:00
Henry Jameson
3afe65352b removed notification-relevant test because the functionality they are testing do
not exist anymore. Gotta write more tho...
2018-08-16 14:07:06 +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