Commit Graph

169 Commits

Author SHA1 Message Date
Henry Jameson
0ca42bd3d6 Merge remote-tracking branch 'upstream/develop' into feature/scope_preferences
* upstream/develop: (36 commits)
  remove deploy stage
  remove deploy stage
  updated and completed German translation
  minor modification of Chinese translation
  update Chinese translation
  Add Chinese language
  Fix posting.
  Count spoiler text in the character count. Fixes #135.
  Added Irish (Gaeilge) Language
  Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan.
  simplify code
  adapt to destructive change of api
  Adds Occitan locale
  Updated italian translation
  Update oc.json
  Update oc.json
  Update of the oc.json file Actualizacion del fichièr oc.json
  Sort messages object by language code so that it's easier from the UI to browse them.
  explicitly set collapseMessageWithSubject to undefined
  Fall back to instance settings consistently
  ...
2018-11-26 04:33:41 +03:00
scarlett
c02a9089e1 explicitly set collapseMessageWithSubject to undefined 2018-10-21 19:42:38 +01:00
scarlett
d6ad08050a Fall back to instance settings consistently 2018-10-21 18:04:23 +01:00
scarlett
4cc1ed6171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into hide-statistics 2018-10-16 14:09:29 +01:00
Henry Jameson
ef968d8e1e now it actually works 2018-09-25 15:16:26 +03:00
Henry Jameson
455cd0d028 settings for scope/subject 2018-09-25 14:47:02 +03:00
Henry Jameson
9467462ef0 made FE work even without either api or static config 2018-09-17 18:54:08 +03:00
Henry Jameson
580aae1b54 Added more stuff that's actually being added to instanceConfig, simplified the whitelist. 2018-09-17 17:51:39 +03:00
Henry Jameson
82fa5d08c4 more refactoring 2018-09-17 17:51:39 +03:00
Henry Jameson
2db991fc7f some recategorization of options... 2018-09-17 17:51:39 +03:00
Henry Jameson
f1c16327b6 Initial version 2018-09-17 17:51:39 +03:00
scarlett
bdcbd110e4 Add option for hiding post statistics (e.g. repeats, favs) 2018-09-04 00:41:52 +01:00
scarlett
dcb7e1ecf4 Add option for disabling counts (followers, statuses) in user profiles. 2018-09-04 00:32:25 +01:00
Dingdreher
900aaefb98 Update users.js 2018-09-03 12:01:05 +00:00
kaniini
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
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
Henry Jameson
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
Henry Jameson
b0e0686c7f Added ability to hide certain types of notifications 2018-08-28 21:21:29 +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
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
kaniini
fe906cc3f0 Merge branch 'develop' into 'notifications'
# Conflicts:
#   src/main.js
2018-08-24 23:00:56 +00:00
scarlett
296ab54301 Add settings for changing the visibility of replies in the timeline. 2018-08-24 20:04:26 +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
Henry Jameson
b97db4912d error display 2018-08-20 20:45:54 +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
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
1121f32c48 Add support for configurable CW clickthrough. 2018-08-20 02:59:06 +01: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
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
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
0e5b74e3dd Configurable video looping, option to not to loop silent videos. Updated
localization strings.
2018-08-15 12:51:21 +03: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
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
Henry Jameson
8ccebbe156 both bugs fixed. it's reactive and no more conflicting cards 2018-07-06 20:12:09 +03:00
Henry Jameson
f911182a2f working, somewhat 2018-07-06 20:12:09 +03:00
Francis Dinh
556eb4b8a3 add unretweet action to statuses.js 2018-06-14 17:17:36 -04:00
William Pitcock
7389f07115 follow requests: refactor to properly leverage vuex 2018-06-07 01:24:31 +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
shpuld
573f01650b Copy parent status nsfw into retweeted_status 2018-04-16 18:19:42 +03:00
shpuld
208b2ed125 Additional check to make console shut up 2018-04-15 00:06:00 +03:00
shpuld
e88bb1a23e I broke timelines again, fixed now again (hopefully). 2018-04-14 22:13:28 +03:00
shpuld
3488141fdd Whoops, broke older statuses accidentally 2018-04-14 17:18:07 +03:00