Commit Graph

190 Commits

Author SHA1 Message Date
Egor Kislitsyn 11716a7a53 second attempt to add subscribe module and fix race condition 2018-12-07 20:13:36 +07:00
Egor Kislitsyn a85d128d37 Revert "add subscribe module and fix race condition"
This reverts commit 07f1b8523e.
2018-12-07 18:53:40 +07:00
Egor Kislitsyn 07f1b8523e add subscribe module and fix race condition 2018-12-07 18:13:04 +07:00
Henry Jameson b555d617e4 removes hacks from notifications storage, adds api call to let server update
is_seen attribute
2018-12-02 13:36:11 +03:00
Roger Braun 9af204b293 Move login to oauth. 2018-10-26 15:16:23 +02: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 419744080f console.log cleanup 2018-09-17 19:16:58 +03:00
Henry Jameson e53f238278 undo rename because it makes less sense now. 2018-09-17 18:54:48 +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 40a175389a Removed warning. Added support for working without static/config.json 2018-09-17 18:00:56 +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
kaniini ed6abeacad Merge branch 'post-polish-fixes' into 'develop'
Post polish fixes

See merge request pleroma/pleroma-fe!333
2018-09-09 11:59:49 +00:00
kaniini 369fd648f6 Merge branch 'remove-outdated-settings' into 'develop'
Remove outdated settings

See merge request pleroma/pleroma-fe!335
2018-09-09 11:56:34 +00:00
Henry Jameson 5726be6830 fix 2018-09-08 05:16:25 +03:00
hakabahitoyo dbf24e1fbf Remove outdated settings 2018-09-04 11:15:00 +09:00
Hakaba Hitoyo 65115bfc7f features panes supports chat & gopher 2018-09-04 10:44:25 +09:00
scarlett 699ee0891d Changeable defaults for hideUserStats and hidePostStats 2018-09-04 00:48:14 +01: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
Hakaba Hitoyo 049e2397b1 update 2018-09-03 15:23:09 +09:00
Henry Jameson 17f30190e0 Made showing format selection optional and default to false 2018-08-31 17:00:41 +03:00
Henry Jameson 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
Henry Jameson b0e0686c7f Added ability to hide certain types of notifications 2018-08-28 21:21:29 +03: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
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
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
tsukada-ecsec dfc5f170c6 update 2018-08-24 18:46:14 +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
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
ensra 3ec8e43a97 Rename expandCW to collapseMessageWithSubject.
Add option to config.json, disabled by default.
2018-08-20 03:41:40 +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 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 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
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 63650aec29 Added support for qvitter api fetching of notifications 2018-08-12 14:14:34 +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 9cebb00faa the missing piece for invites system 2018-08-05 10:01:38 +03: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 f911182a2f working, somewhat 2018-07-06 20:12:09 +03:00
Vivian Lim b0cf050797 Add configuration option to enable click-through content warnings 2018-06-28 23:39:55 -07: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
Roger Braun d64293506c Make scope options optional, refactoring. 2018-06-08 15:25:48 +02:00
William Pitcock f3a27764aa add follow requests UI 2018-06-07 00:58:44 +00:00
Hakaba Hitoyo 2ade177d5a configurable who to follow panel 2018-05-05 00:20:19 +09:00
Hakaba Hitoyo 77ffa89464 Merge remote-tracking branch 'origin/feature/who-to-follow-panel-2' into feature/who-to-follow-panel-configurable 2018-05-04 23:50:14 +09:00
Hakaba Hitoyo 150b815407 lint 2018-04-29 18:09:49 +09:00
Hakaba Hitoyo b1d1c7cfc4 lint 2018-04-29 18:07:40 +09:00
Hakaba Hitoyo 2a6721ea56 redirect root by login or not 2018-04-29 17:55:23 +09:00
William Pitcock f4ee222e3c make nsfw censor image configurable 2018-04-22 09:10:10 -05:00
Hakaba Hitoyo b32573138b Add who-to-follow-panel 2018-02-24 23:04:44 +09:00
Hakaba Hitoyo fe1044dfdf Update main.js 2018-02-10 01:25:51 +00:00
Hakaba Hitoyo ebd8300e36 slove conflict 2018-02-10 10:17:58 +09:00
dtluna e49cf7b67a Add textlimit 2018-02-09 16:37:32 +03:00
dtluna e2248bcf4f Use `name` and `closed` from the backend 2018-02-09 16:02:26 +03:00
Hakaba Hitoyo 5dd4631860 debug 2018-02-04 08:43:31 +09:00
Hakaba Hitoyo 013f11497f slove-conflict 2018-02-04 08:36:10 +09:00
hakabahitoyo 95cba854f3 add instance specific panel 2018-02-04 00:27:33 +09:00
eal 36e68fba96 Merge branch 'develop' into feature/normal-emoji-completion 2018-02-01 18:19:36 +02:00
eal 90175a1872 Fix name clash on unicode and custom emoji 2018-02-01 18:12:23 +02:00
Roger Braun 92289e545a Move chat to sidebar. 2018-01-26 15:11:34 +01:00
eal b67c506062 Merge branch 'develop' into feature/normal-emoji-completion 2017-12-23 19:52:16 +02:00
eal 8f3926a096 Detect backend. 2017-12-23 11:31:43 +02:00
eal fe269b2cf9 Merge branch 'fix/gs-emoji-error' into 'develop'
Suppress emoji fetch error on gs.

See merge request pleroma/pleroma-fe!183
2017-12-07 21:42:00 +00:00
eal 1db1529dec Suppress emoji fetch error on gs. 2017-12-07 23:37:05 +02:00
eal 612fb18367 Add option for disabling chat. 2017-12-07 18:20:44 +02:00
Roger Braun 27be1e0fa3 Move chat to own module. 2017-12-05 11:47:10 +01:00
Roger Braun fbee80474b Basic frontend changes for chat. 2017-12-04 19:08:33 +01:00
Roger Braun 2691579ab7 Make default path configurable. 2017-11-22 16:28:05 +01:00
eal 581e3e836a Add completion for normal emoji. 2017-11-20 20:32:51 +02:00
shpuld d65d6e5da4 Clean up, use translations, persist theme, add more presets. 2017-11-18 13:13:51 +02:00
eal 29e32416bc Persist streaming setting between sessions. 2017-11-13 11:44:28 +02:00
eal 26416ed15c Revert to English timeago for latin script languages. 2017-11-09 09:45:02 +02:00
eal ceb13a6405 Add timeago locales. 2017-11-08 22:20:50 +02:00
Roger Braun 74b513122e Set locale from browser settings. 2017-11-07 15:23:00 +01:00
Roger Braun 7516cd859f Prepare for i18n. 2017-11-07 15:14:37 +01:00
eal ba9b04a8ba Use the API endpoint for emoji completion. 2017-10-19 23:39:21 +03:00
eal 447ec91176 Actually actually fix image url. 2017-09-19 22:58:15 +03:00
eal f4b1319eff Actually fix image url. 2017-09-19 22:54:54 +03:00
eal 2162ef20b0 Add emoji completion. 2017-09-19 22:43:20 +03:00
eal 9abfcb34ef Add tag timeline view. 2017-09-17 14:26:35 +03:00
Roger Braun 8b4f59e1f7 Try logging in with the existing cookie. 2017-09-02 19:50:02 +03:00
Shpuld Shpuldson acf3fd5d91 Add new user-settings component/route, add options to change name, bio, avatar, banner and bg. Add those options to api service and backend interactor service. 2017-08-02 22:09:40 +03:00
Shpuld Shpuldson 1a5ee95ee4 Add a config.json option for enabling registration, don't link and redirect away from register page when it's disabled. 2017-06-20 10:37:51 +03:00
Shpuld Shpuldson bfbc94d697 Move customizable terms-of-service into its separate .html file. 2017-06-19 16:35:35 +03:00
Shpuld Shpuldson 3785a863cb Update branch and fix conflicts. 2017-06-19 11:32:40 +03:00
Shpuld Shpuldson f915ae174d Add floating status-previews on reply-link mouseover in conversations and make them optional in the settings, fix a small visual inconsistency in muted statuses while editing the file already.. 2017-06-07 17:58:24 +03:00
Shpuld Shpuldson 65646c5a12 Add an option to initiate fetching older statuses automatically when scrolled 750 pixels or less from the bottom. 2017-06-03 18:51:55 +03:00
Shpuld Shpuldson 3a1ae3a30e Add a custom timeago.json for shorter timestamps, for example '15s' instead of '15 seconds ago' 2017-05-31 12:45:03 +03:00
Roger Braun a766e886f5 Add a registration form. 2017-04-15 18:29:46 +02:00
Roger Braun a53555254a Add word-based muting to settings / statuses. 2017-04-09 15:53:23 +02:00