Compare commits

...

921 commits

Author SHA1 Message Date
Henry Jameson
b33f1a8e63 Merge branch 'splashscreen' into shigusegubu-vue3 2024-09-18 17:37:00 +03:00
Henry Jameson
711eb24504 cleanup 2024-09-18 17:36:50 +03:00
Henry Jameson
82936aed38 cleanup, styles, fox random, and better "animation" for orz 2024-09-18 03:37:59 +03:00
Henry Jameson
414947d755 margin for credit 2024-09-18 02:54:38 +03:00
Henry Jameson
189bb02436 a11y 2024-09-18 02:54:25 +03:00
Henry Jameson
ce7ac02871 better error log 2024-09-18 02:50:51 +03:00
Henry Jameson
d2f85f4f25 revert interface.js since it's an action it will be always asynchronous 2024-09-18 02:49:27 +03:00
Henry Jameson
6c6d356f70 fix obvious mistakes 2024-09-18 02:41:55 +03:00
HJ
7c8308a410 Apply 1 suggestion(s) to 1 file(s) 2024-09-17 23:19:35 +00:00
Henry Jameson
a4a5c15a83 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3 2024-02-22 18:46:59 +02:00
Henry Jameson
40d0534f92 Merge remote-tracking branch 'origin/admin-emoji-settings' into shigusegubu-vue3 2024-01-23 00:44:53 +02:00
Henry Jameson
bceb3da0ea Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3 2024-01-23 00:44:28 +02:00
Henry Jameson
f946ac961d Merge remote-tracking branch 'origin/admin-emoji-settings' into shigusegubu-vue3 2024-01-18 15:32:25 +02:00
Henry Jameson
c834a2ff3d Merge remote-tracking branch 'origin/admin-emoji-settings' into shigusegubu-vue3 2024-01-18 14:44:48 +02:00
Ekaterina Vaartis
46dab3bcb1 Rearrange stuff in accordance with comments on the MR, mostly
Also, add support for a custom message to the modified indicator
2024-01-17 22:41:39 +03:00
Henry Jameson
088f2de294 Merge remote-tracking branch 'origin/admin-emoji-settings' into shigusegubu-vue3 2024-01-08 17:48:58 +02:00
Henry Jameson
0dc170cfb8 Merge branch 'admin-emoji-settings' into shigusegubu-vue3 2024-01-08 17:48:42 +02:00
Henry Jameson
e155609fa0 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-12-13 23:55:41 +02:00
Henry Jameson
b59b6c132d undo all that crap 2023-12-13 22:35:19 +02:00
Henry Jameson
a3733eae60 fuck youuuuuuuuuuuuuuuu 2023-12-13 22:23:56 +02:00
Henry Jameson
e0eaf961c4 test SHIT 2023-12-13 22:18:28 +02:00
Henry Jameson
a2daac6dd2 test shit 2023-12-13 22:14:00 +02:00
Henry Jameson
38daf98559 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-12-13 22:04:53 +02:00
Henry Jameson
d779da7f3e Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-12-13 21:22:43 +02:00
Henry Jameson
42f55f5139 Merge branch 'admin-dashboard-fixes' into shigusegubu-vue3 2023-11-22 22:07:57 +02:00
Henry Jameson
85bfb31845 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-22 22:07:38 +02:00
Henry Jameson
f058a28f3b Merge branch 'admin-dashboard-fixes' into shigusegubu-vue3 2023-11-22 22:02:14 +02:00
Henry Jameson
0255e6e8b7 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-22 21:57:17 +02:00
Henry Jameson
1732a0800c Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-22 13:18:38 +02:00
Henry Jameson
5cbe1791c1 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-21 15:30:04 +02:00
Henry Jameson
db2c330b48 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-21 15:27:03 +02:00
Henry Jameson
df14c66341 debug 2023-11-20 13:34:06 +02:00
Henry Jameson
f3273465a6 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-20 00:22:01 +02:00
Henry Jameson
3af070a961 fix badge 2023-11-20 00:19:51 +02:00
Henry Jameson
ea274e2364 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-20 00:17:23 +02:00
Henry Jameson
1c2f470e73 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-19 17:03:11 +02:00
Henry Jameson
262bb12e6b Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-19 14:01:09 +02:00
Henry Jameson
0b3a03fbf1 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-16 22:09:13 +02:00
Henry Jameson
ff6f93f2e6 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-16 21:55:10 +02:00
Henry Jameson
a88f0521f0 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-16 20:45:29 +02:00
Henry Jameson
dcc57fc811 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-13 17:44:18 +02:00
Henry Jameson
359306623f Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-13 17:32:22 +02:00
Henry Jameson
199a00214f Merge branch 'admin-dashboard-fixes' into shigusegubu-vue3 2023-11-13 17:31:40 +02:00
Henry Jameson
e9bc8f020a Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-11-13 17:29:43 +02:00
Henry Jameson
44087e997e Merge branch 'admin-dashboard-fixes' into shigusegubu-vue3 2023-11-01 22:19:18 +02:00
Henry Jameson
c5811f32ef remove extraneous html stuff 2023-10-29 19:17:32 +02:00
Henry Jameson
d119a627c8 Merge branch 'fix-reports' into shigusegubu-vue3 2023-10-27 02:46:31 +03:00
Henry Jameson
3693dde1d5 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-10-26 15:48:13 +03:00
Henry Jameson
c8a4c7724b Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-10-26 15:43:05 +03:00
Henry Jameson
82a1a89d08 fix favicon 2023-10-26 15:27:41 +03:00
Henry Jameson
b8f344b22d Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-10-25 19:35:52 +03:00
Henry Jameson
1bb75a96d0 Merge branch 'notifications-thru-sw' into shigusegubu-vue3 2023-10-25 18:58:58 +03:00
Henry Jameson
5c86c35247 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3 2023-10-15 13:25:36 +03:00
Henry Jameson
3993d6f113 changelog 2023-10-11 22:49:12 +03:00
Henry Jameson
9bb6ab6ca5 Merge branch 'quotes-hide-card' into shigusegubu-vue3 2023-10-11 22:47:38 +03:00
Henry Jameson
9ed07e1087 Merge branch 'develop' into shigusegubu-vue3 2023-10-11 22:47:34 +03:00
Henry Jameson
0e8f894fcf Merge remote-tracking branch 'origin/tusooa/extra-notifications' into shigusegubu-vue3 2023-09-04 19:44:42 +03:00
Henry Jameson
232c5528b5 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3 2023-09-04 19:34:36 +03:00
Henry Jameson
e09a815602 Merge remote-tracking branch 'origin/tusooa/quote' into shigusegubu-vue3 2023-07-19 21:05:42 +03:00
Henry Jameson
350a3d1c84 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3 2023-07-19 21:05:36 +03:00
Henry Jameson
11f704ff70 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3 2023-05-27 16:42:08 +03:00
Henry Jameson
2e2d2bd5b5 Merge branch 'improve_settings_reusability' into shigusegubu-vue3 2023-05-08 22:06:23 +03:00
Henry Jameson
1279af3ff5 Merge branch 'improve_settings_reusability' into shigusegubu-vue3 2023-04-24 23:01:38 +03:00
Henry Jameson
e3d71db611 Merge branch 'improve_settings_reusability' into shigusegubu-vue3 2023-04-24 22:04:27 +03:00
Henry Jameson
6a77951b8d Merge branch 'improve_settings_reusability' into shigusegubu-vue3 2023-04-13 01:11:38 +03:00
Henry Jameson
c3b9b41106 Merge branch 'improve_settings_reusability' into shigusegubu-vue3 2023-04-13 00:04:26 +03:00
Henry Jameson
b36e907c1b use draft state instead of live state in that one place 2023-03-29 23:33:50 +03:00
Henry Jameson
85c79f666c Merge branch 'improve_settings_reusability' into shigusegubu-vue3
* improve_settings_reusability:
  better frontends tab, now you can set default frontend
  frontends tab initial implementation, now you can (re)install frontends! yay!
  fix
  handle db config disabled case
  localization strings
  added mass-draft-push and mass-draft-reset, small stylistic fixes
2023-03-29 23:31:33 +03:00
Henry Jameson
a883c2576a Merge branch 'improve_settings_reusability' into shigusegubu-vue3
* improve_settings_reusability:
  localization strings
  grouped settings/managed drafts support added
2023-03-22 12:48:40 +02:00
Henry Jameson
bd97a2dc00 Merge branch 'improve_settings_reusability' into shigusegubu-vue3
* improve_settings_reusability:
  fixes for diabled state, tri-state boolean and access control
  made draft-mode and source inject-able
  fixes
2023-03-22 00:01:14 +02:00
Henry Jameson
70c5f6bd8e Merge branch 'improve_settings_reusability' into shigusegubu-vue3
* improve_settings_reusability:
  modal update, initial localization
2023-03-21 10:27:38 +02:00
Henry Jameson
a010dd73e9 Merge branch 'improve_settings_reusability' into shigusegubu-vue3
* improve_settings_reusability:
  ChoiceSetting support added, added captcha settings
  limits tab, backend descriptions
  remove obsolete files
  lint
  setting admin settings works now. also now we have draftable settings
  initial admin settings prototype (WIP)
  initial implementation of an admin settings module
  lint
  fixes for stuff i missed
  minimize the rest of the sharedcomputedobject
  move websocket connection logic into module
  serverSideConfig renamed into profileSettingConfig to avoid confusion with serverSideStorage, reduced overall need for SharedComputedObject in settings tabs, moved copypaste code of "setting" type of helpers into a separate file.
2023-03-20 23:48:39 +02:00
Henry Jameson
45b2ff245f Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop:
  Translated using Weblate (Chinese (Simplified))
  Generalize IntegerSetting into NumberSetting, add Integer/Float wrappers
  Allow custom emoji reactions: add option to scale reaction buttons
  Fix user-profile route crash on pinned favorites route
  Hide custom emoji in reaction picker when BE does not advertise pleroma_custom_emoji_reactions
  Allow custom emoji reactions
2023-03-20 23:48:35 +02:00
Henry Jameson
085cbc62e7 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop: (79 commits)
  Fix display of theme checkboxes
  Make suggestor ignore users without valid names
  Give tab switcher a role
  Remove @touchstart in post status button
  Update babel monorepo to v7.21.0
  Make it possible to auto-select the first candidate in autocomplete
  Fix poll interaction
  Fix registration error with email language selected
  Add changelog for 2.5.1
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Japanese (ja_EASY))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Use class to style screenreader-only text
  Update Font Awesome
  Update dependency nightwatch to v2.6.11
  Update dependency eslint to v8.33.0
  Update dependency @vue/test-utils to v2.2.8
  ...
2023-03-09 23:18:07 +02:00
Henry Jameson
1b076e2179 reduce amount of customizations in git repo 2023-01-16 21:53:22 +02:00
Henry Jameson
71023491ed Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop: (93 commits)
  Fix mobile layout margin
  Update dependency eslint-plugin-n to v15.6.1
  Add status authors from search results to store
  Fix notification attachment icon overflow
  Debounce mute word setting
  Use bdi to isolate repeater name
  Display better error message for unauthenticated timelines
  Make modal easier to close if there is only one image
  Disable no-shorthand for certain props for better readability
  Use splice instead of delete
  Pick a better query selector
  Adjust query selector to actually get the popover now
  Use stylelint
  Update stylelint and support vue/scss
  Update dependency stylelint to v14
  Stop propogation for all top-bar buttons
  Fix emoji picker off-by-1 error
  Update dependency nightwatch to v2.6.6
  Update dependency @vue/test-utils to v2.2.7
  Update dependency sinon to v15
  ...
2023-01-16 21:44:58 +02:00
Henry Jameson
0cfd091f09 Merge branch 'fix-excessive-reregistrations' into shigusegubu-vue3
* fix-excessive-reregistrations:
  fix nested properties watcher being triggered far too often
2022-12-21 23:52:23 +02:00
Henry Jameson
5bc59001b6 Merge branch 'expand-notifications' into shigusegubu-vue3
* expand-notifications:
  a11y
2022-12-21 23:51:42 +02:00
Henry Jameson
d8a1f84aad Merge branch 'expand-notifications' into shigusegubu-vue3
* expand-notifications:
  add icon to allow expand collapsed (status-related) notifications
2022-12-19 22:20:47 +02:00
Henry Jameson
c019fc9dde Merge branch 'fix-private-nav' into shigusegubu-vue3
* fix-private-nav: (53 commits)
  fix private mode & timelines dropdown
  Translated using Weblate (Esperanto)
  Translated using Weblate (Korean)
  Translated using Weblate (French)
  Translated using Weblate (Korean)
  Translated using Weblate (French)
  Translated using Weblate (Arabic)
  Translated using Weblate (Korean)
  Translated using Weblate (Korean)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Dutch)
  Throw non-zero exit code if webpack build fails
  Update dependency @vue/test-utils to v2.2.6
  Fix not to show "Save changes" button in "Delete account" section
  Untranslated text "Users" in mute settings
  I stand with the chad tusooa
  Update dependency eslint to v8.29.0
  ...
2022-12-15 00:56:06 +02:00
Henry Jameson
80fb88ecbd Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop:
  fix tests
  fun restrained
  fix leaky journal by running uniq on addToCollection entries
  make better defaults for user popovers, closer to OG behavior
2022-11-27 00:19:09 +02:00
Henry Jameson
d16d754127 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop: (41 commits)
  lint
  Apply 1 suggestion(s) to 1 file(s)
  Use feed role for notifs and timelines
  Update dependency chai to v4.3.7
  Make notification panel a list of articles
  Handle properly 2-col and 3-col desktop notifications
  Make user panel and notification <aside>
  Make timeline a list of articles
  Add labels to mobile navs
  Add labels for timeline header
  Use <main> for main content
  Add title to mobile post button
  Update dependency eslint-plugin-n to v15.5.0
  Update dependency eslint-plugin-promise to v6.1.1
  Update Node.js to v16.18.1
  Update dependency eslint-plugin-vue to v9.7.0
  Update dependency eslint-plugin-n to v15.4.0
  Update dependency eslint to v8.26.0
  Update vue monorepo
  Update dependency css-minimizer-webpack-plugin to v4.2.2
  ...
2022-11-21 22:35:47 +02:00
Henry Jameson
463956cd3c Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  lint
  show counter in show new button on mobile
2022-11-01 23:26:03 +02:00
Henry Jameson
ddd6c9345e Merge branch 'emoji-popovers' into shigusegubu-vue3
* emoji-popovers:
  always focus search when opening emoji picker
2022-11-01 23:25:58 +02:00
Henry Jameson
b7afb50559 Merge branch 'minor-fixes-batch' into shigusegubu-vue3
* minor-fixes-batch:
  fix theme tab color indicators
2022-11-01 23:25:53 +02:00
Henry Jameson
859b547412 Merge branch 'minor-fixes-batch' into shigusegubu-vue3
* minor-fixes-batch:
  add new search to reaction picker and make hardcoded set... better
  use better color slot for selected pins #1193
  fix picked emoji not being highlighted #1196 + updated its CSS structure
  fix staff panel #1192
  Update dependency @vuelidate/core to v2.0.0
  Update dependency express to v4.18.2
  Update dependency autoprefixer to v10.4.12
2022-10-17 22:47:39 +03:00
Henry Jameson
82f47c0585 Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  use new color slot for badges
  add titles to mobile buttons
2022-10-17 21:51:47 +03:00
Henry Jameson
ceac379c9b Merge branch 'emoji-popovers' into shigusegubu-vue3
* emoji-popovers:
  update popover styles when caret updates
2022-10-17 21:24:17 +03:00
Henry Jameson
e6fbf4ce12 Merge branch 'emoji-popovers' into shigusegubu-vue3
* emoji-popovers:
  fix unit tests
2022-10-10 22:14:18 +03:00
Henry Jameson
9de6ac5abb Merge branch 'emoji-popovers' into shigusegubu-vue3
* emoji-popovers:
  better autocomplete handling, fix leak
  focus search input when opening emoji picker
2022-10-10 20:28:25 +03:00
Henry Jameson
3d7f5f7be8 Merge branch 'emoji-popovers' into shigusegubu-vue3
* emoji-popovers:
  use anchor for picker
  move keepOpen to picker
  some shitty initial implementation of emoji picker with popover
  fix blinking popup
  fix css
  cleanup
  moved popovers space outside app because otherwise it causes weird issues A LOT
  suggestor popover
2022-10-10 00:38:16 +03:00
Henry Jameson
085da87af3 Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  fix chevrons alignment
  fix alert dot
  move definitions for timeline header buttons to Panel.scss, now called rightside buttons
  Update dependency @vuelidate/validators to v2.0.0
  Remove lolex package
  Remove diff package
  Pin dependencies
  Update dependency sass to v1.55.0
2022-10-09 19:11:12 +03:00
Henry Jameson
b3279c58c4 Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  minor improvements
  fix buttons overlapping
2022-09-29 11:53:04 +03:00
Henry Jameson
4647cc672c Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  port changes to notifications
  cleanup
  added scrolltotop for mobile notifications
  fix scrollerref not setting properly
  apply same for scrolltop button
  refactor css for timeline buttons, make it a bit easier to tap them
2022-09-28 21:35:24 +03:00
Henry Jameson
f580929717 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop: (80 commits)
  Make suggestor suggest according to cldr annotations
  Make chunks named
  Use import() for emoji.json
  Add regional indicators
  Support filtering by keywords from cldr
  Display localized unicode emoji names
  Load unicode emoji annotations
  Extract language list to its own file
  using the half-shit approach since proper approach is full-shit
  Make unicode emoji phrases match with _
  Use console.info
  Fix non-square emojis being truncated
  Fix emoji picker lint
  Fix emoji picker lint
  Tweak efficiency when changing filter keywords in emoji picker
  Use trimmed keyword for filtering emojis
  Limit the width of unsupported multichar emojis
  Make emoji picker work with vue3
  Make StillImage react to src changes
  Lint
  ...
2022-09-22 11:14:46 +03:00
Henry Jameson
14ee21274e Merge branch 'from/develop/tusooa/grouped-emoji-picker' into shigusegubu-vue3
* from/develop/tusooa/grouped-emoji-picker: (38 commits)
  Make unicode emoji phrases match with _
  Use console.info
  Fix non-square emojis being truncated
  Fix emoji picker lint
  Fix emoji picker lint
  Tweak efficiency when changing filter keywords in emoji picker
  Use trimmed keyword for filtering emojis
  Limit the width of unsupported multichar emojis
  Make emoji picker work with vue3
  Make StillImage react to src changes
  Lint
  Add English translation for unicode emoji group names
  Add icons for unicode emoji groups
  Make emoji picker use grouped unicode emojis
  Generate grouped unicode emojis from unicode-emoji-json
  Scroll active tab header into view in emoji picker
  Clean up emoji picker css
  Use StillImage to render emojis in emoji picker
  Fix error on emoji picker first load
  Group emojis only by pack and remove pack: prefix
  ...
2022-09-01 00:37:16 +03:00
Tusooa Zhu
dbb67af62c
Make unicode emoji phrases match with _ 2022-08-31 16:03:15 -04:00
Tusooa Zhu
dee11b7ba8
Use console.info 2022-08-31 15:57:37 -04:00
HJ
815bb62b4a
Fix non-square emojis being truncated 2022-08-31 15:57:37 -04:00
Tusooa Zhu
16dd7278ee
Fix emoji picker lint 2022-08-31 15:57:37 -04:00
Tusooa Zhu
cb3e75ab98
Fix emoji picker lint 2022-08-31 15:57:37 -04:00
Tusooa Zhu
c1d04469ba
Tweak efficiency when changing filter keywords in emoji picker 2022-08-31 15:57:37 -04:00
Tusooa Zhu
ca8b86ae4f
Use trimmed keyword for filtering emojis 2022-08-31 15:57:37 -04:00
Tusooa Zhu
df87d40e28
Limit the width of unsupported multichar emojis 2022-08-31 15:57:37 -04:00
Tusooa Zhu
e6f5b102d5
Make emoji picker work with vue3 2022-08-31 15:57:37 -04:00
Tusooa Zhu
fe1446732a
Make StillImage react to src changes 2022-08-31 15:57:37 -04:00
Tusooa Zhu
de9114e618
Lint 2022-08-31 15:57:37 -04:00
Tusooa Zhu
6b1ce1b4a8
Add English translation for unicode emoji group names 2022-08-31 15:57:37 -04:00
Tusooa Zhu
8ddd787fe5
Add icons for unicode emoji groups 2022-08-31 15:57:37 -04:00
Tusooa Zhu
be646433ec
Make emoji picker use grouped unicode emojis 2022-08-31 15:57:37 -04:00
Tusooa Zhu
f9e77b684b
Generate grouped unicode emojis from unicode-emoji-json 2022-08-31 15:57:37 -04:00
Tusooa Zhu
4e8a5ff975
Scroll active tab header into view in emoji picker 2022-08-31 15:57:36 -04:00
Tusooa Zhu
571f08db04
Clean up emoji picker css 2022-08-31 15:57:36 -04:00
Tusooa Zhu
4324e81eb8
Use StillImage to render emojis in emoji picker 2022-08-31 15:57:36 -04:00
Tusooa Zhu
fc6923d423
Fix error on emoji picker first load
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
1b81699652
Group emojis only by pack and remove pack: prefix
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
149384c48d
Lint
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
2a59d63164
Lazy-load emoji picker in post form
When clicking the reply button, we used to load the whole emoji picker.
This causes a considerable delay even if the user is not going to use
the emoji picker. Now the content of the emoji picker is loaded only
after the user has explicitly opened the emoji picker.

Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
c82f19359e
Fix sticker picker heading tab
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
c175e84d88
Fix vertical scrollbar of emoji picker header
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
2b20908e48
Use StillImage for emoji group header
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
ab3b1188ec
Remove useless class disabled in emoji picker
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
85e0ec3b1b
Clean up unused variables
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
b49647de57
Fix scrol->highlight behaviour
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
010a3340d7
Clean up legacy code in emoji picker
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
ad116cdff4
Use lozad for lazy image loading
Ref: grouped-emoji-picker
2022-08-31 15:57:36 -04:00
Tusooa Zhu
99f0603607
Lint 2022-08-31 15:57:35 -04:00
Tusooa Zhu
c1692944b5
Optimise emoji picker loading process 2022-08-31 15:57:35 -04:00
Tusooa Zhu
2b977819aa
Load emoji properly on first showing 2022-08-31 15:57:35 -04:00
Tusooa Zhu
bf887a1a23
Load visible emoji groups when scrolling 2022-08-31 15:57:35 -04:00
Tusooa Zhu
c4dbfb2460
Display all emoji groups on emoji picker header 2022-08-31 15:57:35 -04:00
Tusooa Zhu
e629096e4c
Fix load more emoji action 2022-08-31 15:57:35 -04:00
Tusooa Zhu
6701192d18
Group custom emojis by pack in emoji picker 2022-08-31 15:57:35 -04:00
Henry Jameson
ee896525dc Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  fix veryfaint not applying
2022-08-31 01:19:35 +03:00
Henry Jameson
6997f82999 Merge branch 'naventry-unnest' into shigusegubu-vue3
* naventry-unnest:
  lint
  lint
2022-08-31 00:58:12 +03:00
Henry Jameson
bd9ca11a97 Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  make "up to date" icon even more faint to distinguish it from actual interactive elements
2022-08-31 00:52:16 +03:00
Henry Jameson
f70716c95c Merge branch 'naventry-unnest' into shigusegubu-vue3
* naventry-unnest:
  make custom router-link for nav-entry to un-nest the interactive elements
  a11y
2022-08-31 00:52:09 +03:00
Henry Jameson
e9adee4517 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop:
  Use dedicated indicator for non-ascii domain names
  Update dependency sinon-chai to v3
  Update dependency semver to v7
  Update dependency vue-router to v4.1.5
  Update dependency eslint to v8.23.0
  Update dependency vue-template-compiler to v2.7.10
  Update dependency @vue/babel-helper-vue-jsx-merge-props to v1.4.0
  Update dependency eslint-plugin-promise to v6.0.1
  Remove isparta
  Update dependency @babel/core to v7.18.13
2022-08-30 02:03:44 +03:00
Henry Jameson
74a72608da Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  add a favorites "timeline" shortcut
2022-08-30 00:53:37 +03:00
Henry Jameson
d40fc75415 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  refactor navigation-entry and use them in other nav items
2022-08-30 00:16:24 +03:00
Henry Jameson
a5c0dc6592 Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  lint
2022-08-24 22:46:50 +03:00
Henry Jameson
b3318471c3 Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  only mark as read if closed intentionally
  fix notifications
  use a bit more compact layout on mobile
  Update dependency eslint-plugin-vue to v9.4.0
2022-08-24 22:43:17 +03:00
Henry Jameson
13023ad29d Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  fix lists edit page
  change ugly checkbox to a list element that doesn't look too much out of place
  a11y
  squeeze/stretch pinned items as long as there's enough space for it, hide items that won't fitc
2022-08-24 20:34:48 +03:00
Henry Jameson
837d82a4b3 squeeze/stretch pinned items as long as there's enough space for it,
hide items that won't fitc
2022-08-24 19:57:02 +03:00
Henry Jameson
c915888701 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  lint
  fix being unable to edit timeline pins on mobile
  aria
  fix mobile side drawer causing issues
  Update dependency opn to v5
2022-08-23 22:18:41 +03:00
Henry Jameson
b2d5297b1a Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  fix links not being active by default
2022-08-23 15:37:22 +03:00
Henry Jameson
1e65ca4ef7 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  improve submenu and improve icon buttons hover effects
2022-08-23 13:26:47 +03:00
Henry Jameson
45103badee Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop:
  fix notices being under the navbar, also change offset to use variable
  fix modals not having proper z index
  reduce indexes to be below 9999 so that develop error messages appear above
  Do not allow to find by name in findUser()
  Use lookup endpoint to obtain users by nickname
  Use $ for id UserProfile routes
  Allow opening profile: multiChoiceProprties record, anonymous access
  Allow opening profile when clicking an avatar inside of user popover
2022-08-23 02:09:36 +03:00
Henry Jameson
5497b12f22 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  add an underline to the selected pin to improve accesibility
  Fix react & extra buttons not styled on tab-focus
  Fix popover not popping up
  Fix styling on Safari
  Use :focus-visible instead of :focus for focus markers
  Optimize Reply badge position
  Add badges to status interacting buttons
  Update dependency nightwatch to v2
  Update dependency eslint-plugin-n to v15.2.5
  Update dependency mocha to v10
  Update dependency karma-coverage to v2
  Update dependency sass to v1.54.5
  Update dependency karma-firefox-launcher to v2
  Update dependency vue-template-compiler to v2.7.9
  Pin dependencies
  Allow column width configuration: allow stretching navbar with columns
  Column width configuration: do not act on defaults, bound with on minmax --miniColumn
  refactor
  Allow column width configuration Group column configuration in settings Column width configuration: do not act on defaults
2022-08-23 02:09:14 +03:00
Henry Jameson
14be662918 Merge branch 'from/develop/tusooa/grouped-emoji-picker' into shigusegubu-vue3
* from/develop/tusooa/grouped-emoji-picker: (34 commits)
  Fix emoji picker lint
  Fix emoji picker lint
  Tweak efficiency when changing filter keywords in emoji picker
  Use trimmed keyword for filtering emojis
  Limit the width of unsupported multichar emojis
  Make emoji picker work with vue3
  Make StillImage react to src changes
  Lint
  Add English translation for unicode emoji group names
  Add icons for unicode emoji groups
  Make emoji picker use grouped unicode emojis
  Generate grouped unicode emojis from unicode-emoji-json
  Scroll active tab header into view in emoji picker
  Clean up emoji picker css
  Use StillImage to render emojis in emoji picker
  Fix error on emoji picker first load
  Group emojis only by pack and remove pack: prefix
  Lint
  Lazy-load emoji picker in post form
  Fix sticker picker heading tab
  ...
2022-08-18 11:50:40 +03:00
Tusooa Zhu
a3b01284f7
Fix emoji picker lint 2022-08-17 19:02:00 -04:00
Tusooa Zhu
b376a5b864
Fix emoji picker lint 2022-08-17 19:02:00 -04:00
Tusooa Zhu
7f84e17770
Tweak efficiency when changing filter keywords in emoji picker 2022-08-17 19:01:59 -04:00
Tusooa Zhu
724913cabd
Use trimmed keyword for filtering emojis 2022-08-17 19:01:59 -04:00
Tusooa Zhu
a521e9b33e
Limit the width of unsupported multichar emojis 2022-08-17 19:01:59 -04:00
Tusooa Zhu
a3821d0eca
Make emoji picker work with vue3 2022-08-17 19:01:59 -04:00
Tusooa Zhu
1a1d6b464e
Make StillImage react to src changes 2022-08-17 19:01:59 -04:00
Tusooa Zhu
baf6082a25
Lint 2022-08-17 19:01:59 -04:00
Tusooa Zhu
9d73d7f968
Add English translation for unicode emoji group names 2022-08-17 19:01:59 -04:00
Tusooa Zhu
6c7b65207c
Add icons for unicode emoji groups 2022-08-17 19:01:59 -04:00
Tusooa Zhu
28f33b3855
Make emoji picker use grouped unicode emojis 2022-08-17 19:01:59 -04:00
Tusooa Zhu
ee14424a58
Generate grouped unicode emojis from unicode-emoji-json 2022-08-17 19:01:56 -04:00
Tusooa Zhu
ebe517992c
Scroll active tab header into view in emoji picker 2022-08-17 19:01:20 -04:00
Tusooa Zhu
056f3f8bc5
Clean up emoji picker css 2022-08-17 19:01:20 -04:00
Tusooa Zhu
7c35b17d7f
Use StillImage to render emojis in emoji picker 2022-08-17 19:01:19 -04:00
Tusooa Zhu
347fe87071
Fix error on emoji picker first load
Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
1a5638238b
Group emojis only by pack and remove pack: prefix
Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
f50b3f5b05
Lint
Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
2161067423
Lazy-load emoji picker in post form
When clicking the reply button, we used to load the whole emoji picker.
This causes a considerable delay even if the user is not going to use
the emoji picker. Now the content of the emoji picker is loaded only
after the user has explicitly opened the emoji picker.

Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
f92a25cfab
Fix sticker picker heading tab
Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
f763624782
Fix vertical scrollbar of emoji picker header
Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
b9fcf8da11
Use StillImage for emoji group header
Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
c06b01db85
Remove useless class disabled in emoji picker
Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
e6fa4104e5
Clean up unused variables
Ref: grouped-emoji-picker
2022-08-17 19:01:19 -04:00
Tusooa Zhu
fa482135a7
Fix scrol->highlight behaviour
Ref: grouped-emoji-picker
2022-08-17 19:01:18 -04:00
Tusooa Zhu
cbe8a2a5d2
Clean up legacy code in emoji picker
Ref: grouped-emoji-picker
2022-08-17 19:01:18 -04:00
Tusooa Zhu
d9901d3914
Use lozad for lazy image loading
Ref: grouped-emoji-picker
2022-08-17 19:01:15 -04:00
Tusooa Zhu
5fb65a4b11
Lint 2022-08-17 19:00:06 -04:00
Tusooa Zhu
1cf2191593
Optimise emoji picker loading process 2022-08-17 19:00:06 -04:00
Tusooa Zhu
8629da50ca
Load emoji properly on first showing 2022-08-17 19:00:06 -04:00
Tusooa Zhu
3733e12b88
Load visible emoji groups when scrolling 2022-08-17 19:00:06 -04:00
Tusooa Zhu
c9557ef28c
Display all emoji groups on emoji picker header 2022-08-17 19:00:06 -04:00
Tusooa Zhu
d0b052a17e
Fix load more emoji action 2022-08-17 19:00:06 -04:00
Tusooa Zhu
16f01e1d3f
Group custom emojis by pack in emoji picker 2022-08-17 19:00:01 -04:00
Henry Jameson
03de3bf857 Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  oops
2022-08-17 21:35:08 +03:00
Henry Jameson
9165383f1c Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop:
  Refresh yarn.lock
2022-08-17 21:25:35 +03:00
Henry Jameson
47d6071d72 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  fix routes and tests
  fix lists not having pins in edit mode
  fix edit mode checkbox showing up for anon users
2022-08-17 21:25:23 +03:00
Henry Jameson
0be86b37c8 Merge branch 'scrolltotop' into shigusegubu-vue3
* scrolltotop:
  add "scroll to top" button to timelines and notifications
2022-08-17 21:12:12 +03:00
Henry Jameson
7ef6f8f6a0 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  create new list UI
2022-08-17 21:12:07 +03:00
Henry Jameson
6428efcb4d Merge branch 'from/develop/tusooa/webpack-5' into shigusegubu-vue3
* from/develop/tusooa/webpack-5: (31 commits)
  fix yarn lock
  Remove legacy code for chunksSortMode
  Add FIXME comment about html-webpack-plugin-after-emit
  Use exact webpack version in package.json
  Reintroduce css minimizer
  Fix double dot in generated asset names
  Update webpack plugins
  Use assets in favour of loaders
  Fix tests
  Make webpack 5 work
  Fix production builds
  Update vue-loader
  Update url-loader
  Update sass-loader
  Update raw-loader
  Update mini-css-extract-plugin
  Update inject-loader
  Update file-loader, html-webpack-plugin, http-proxy-middleware and postcss-loader
  Update css-loader to 5
  Update dependency cross-spawn to v7
  ...
2022-08-17 21:01:04 +03:00
Henry Jameson
b912aaa854 fix yarn lock 2022-08-17 21:00:35 +03:00
Henry Jameson
65ee66aeb9 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  forgot to actually add add/remove methods, lel. remove some consolelogs
2022-08-17 00:58:28 +03:00
Henry Jameson
64526db60e Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  lint
  List edit UI overhaul
  fix journal test
  fix list tests
  ignore invalid journal entries
  proper journal trimming + remove some old workaround to my local bad data
2022-08-17 00:50:03 +03:00
Henry Jameson
d479a0a01b proper journal trimming + remove some old workaround to my local bad data 2022-08-16 19:24:20 +03:00
Henry Jameson
e96af9769d Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  whoops, forgot the most important bit
2022-08-15 23:33:17 +03:00
Henry Jameson
45af86287b Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  fix
2022-08-15 23:31:14 +03:00
Henry Jameson
6ad00a239b Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  add and remove users to/from lists from their profile
  edit mode
  fix anon user issues
2022-08-15 23:20:03 +03:00
Henry Jameson
55241e0ee3 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  fix prod build again + fetch lists (and follow request) on login, stop fetching on logout, don't start fetching in components
2022-08-15 20:44:34 +03:00
Henry Jameson
8553ef02ff Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  fix prod build
2022-08-15 20:34:58 +03:00
Henry Jameson
d632f3ab76 Merge branch 'navigation-update' into shigusegubu-vue3
* navigation-update:
  lint
  limit amount of pins on desktop to 6 (for now)
  band-aid to prevent misclics on logout
  fixes, clear cache on logout
  let mobile users customize top bar as well
  fixes + fixes for anon users
  navigation refactored, used in mobile nav as well
  show pinned lists between timelines and rest
  you can now pin lists
  it works more or less well now
  ability to pin items in navigation menu, initial draft version
  add a todo for future
  server side storage support for collections + fixes
  update link in update notification to be a better one
  fixes
  more prefs storage work + move dontShowUpdateNotifs to prefs
  initial prefs storage work
2022-08-12 01:28:37 +03:00
Henry Jameson
fa4c827df6 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop: (22 commits)
  Fix lint stuff
  Lists implementation: make route naming consistent
  Lists implementation: tests, linter fix
  Lists implementation
  Update babel monorepo to v7.18.10
  clean up leftover
  Use empty array for emji instead
  Add default array for RichContent emoji
  Use RichContent component for Reports
  Use Select component
  Make linter happy
  Fix up and code review
  Fix setting report state, add proper error handling
  remove logs
  Fix report modal not working, add include_types
  remove mock data
  add proper state switcher
  wip
  separated component
  somewhat workign version still with fixture
  ...
2022-08-10 00:56:45 +03:00
Henry Jameson
bdbaf34418 Merge branch 'fix-chat-scroll' into shigusegubu-vue3
* fix-chat-scroll:
  fix chat scroll acting unwise
2022-08-09 01:46:57 +03:00
Henry Jameson
bfb3b4d8dc Merge branch 'been-awhile' into shigusegubu-vue3
* been-awhile:
  move pleroma-tan just a tiny bit lower
  art credit
  lint
  proper animation
  don't let function access `this`
  lint
  proper links and fix user detection
  don't show to anons, make it possible to disable notification instance-wide
  Apply 2 suggestion(s) to 1 file(s)
  Apply 2 suggestion(s) to 1 file(s)
  lint
  unit test + some refactoring
  refactoring
  shadow
  debug handlers for now
  server-side storage for flags
  Update dependency vue-i18n to v9.2.0
  initial scratch
2022-08-08 14:24:27 +03:00
Henry Jameson
f39563bdc5 Merge branch 'timeline-view-menu' into shigusegubu-vue3
* timeline-view-menu:
  fix bugs
  Apply 1 suggestion(s) to 1 file(s)
2022-08-04 23:33:47 +03:00
Henry Jameson
17686d8d71 Merge branch 'timeline-view-menu' into shigusegubu-vue3
* timeline-view-menu:
  change icons
  made quick settings into their own component, added quick view settings, added both to conversation view
2022-08-02 23:54:23 +03:00
Henry Jameson
1bab44249b Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop:
  Update dependency vue-router to v4.1.3
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (French)
  Translated using Weblate (French)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (French)
  Translated using Weblate (French)
  Add optional/required indicator for registration fields
2022-08-02 23:54:20 +03:00
Henry Jameson
f052dd124b Merge branch 'eslint-update' into shigusegubu-vue3
* eslint-update:
  "deal" with async promise executor, should be fine in these specific cases
  fix filesizeformat const/let stuff
  "fix" the sort function potentially not always outputting results
  deal with no-prototype-builtins
  --fix
  disable vue rule
  update eslint stuff
2022-08-01 02:35:35 +03:00
Henry Jameson
b6db7c35da Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop:
2022-08-01 02:35:25 +03:00
Henry Jameson
7413e1c82d Merge branch 'develop' into shigusegubu-vue3
* develop: (32 commits)
  Update Font Awesome to v6.1.2
  Update dependency chromedriver to v103
  Update dependency body-scroll-lock to v3
  Update vue monorepo
  Fix poll duration i18n
  Update dependency sass to v1.54.0
  Update dependency @vuelidate/validators to v2.0.0-alpha.31
  Update dependency @vue/test-utils to v2.0.2
  Update dependency @vuelidate/core to v2.0.0-alpha.43
  Fix tests
  Update dependency vue-router to v4.1.2
  Update dependency vue-i18n to v9.2.0-beta.40
  Update Node.js to v16
  Update Font Awesome to v6
  Update babel monorepo to v7.18.9
  Use node 16
  Update Node.js to v18
  Fix non-8bit string export problem
  Update dependency eslint-plugin-import to v2.26.0
  Update babel monorepo
  ...
2022-07-31 13:20:08 +03:00
Henry Jameson
f2c4a4d2b3 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  fix typo
2022-07-31 11:32:47 +03:00
Henry Jameson
8d42b18de5 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  fix errors in console
  pinned no longer needed
  popover stack
2022-07-31 01:48:40 +03:00
Henry Jameson
84f2074ea4 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  add stay-on-click prop to solve case of clicking user avatar in status popover
  fix settings tooltips
  vertical nudge for popovers, especially for overlay-centers ones
2022-07-31 00:22:30 +03:00
Henry Jameson
b053ba1222 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  make user popover options expert
  use same sizing for timeline dropdown as in the main nav
  fix avatar not zooming in profile page
2022-07-27 21:31:38 +03:00
Henry Jameson
296119b8dc Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  fix spacing in mentionsline
  add popovers to chats
2022-07-20 13:00:42 +03:00
Henry Jameson
828870e386 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  fix avatar not closing, add option to put popovers next to avatar instead of over it
2022-07-19 19:35:18 +03:00
Henry Jameson
9e2708b4eb Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  fix the incorrect rounding in nav list
  re-unfuck the timeline popover
  Revert "unify styling of timelines dropdown with other dropdown menus"
2022-06-29 21:42:07 +03:00
Henry Jameson
5794eeb5a9 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  close on avatar click again, add zooming as option
  fix basicusercard
  make hover popovers less annoying to close
  move tooltips setting
  unify styling of timelines dropdown with other dropdown menus
  put modals on top of navbar
2022-06-27 19:54:55 +03:00
Henry Jameson
ad176e0fc7 put modals on top of navbar 2022-06-27 19:00:38 +03:00
Henry Jameson
3d4b1329f2 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  add SK (Slovak) translation
  ReactButton: Workaround for android composition mode
  EmojiPicker: Workaround to search immediately on mobile
  Fix top bar input text colour
  Show underlay for mobile
  Fix tests
  Add English translations for correctly i18nized time units
  Delegate relativeTime plural rules to vue-i18n
  restore notifications page, fix z-index issues
  Make lint happy
  Add English translations for backup UI
  Add backup UI
  Add English translation for list aliases error
  Log errors when listing aliases
  Add changelog
  Add Engilsh translation for migration
  Add frontend ui for aliases and migration
  Change translation key
  Explain better what delete does in moderation menu
2022-06-27 14:49:56 +03:00
Henry Jameson
2bcd455691 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  update changelog for vue3/threecolumn/popovers changes
2022-06-27 14:48:23 +03:00
Henry Jameson
6f337b47fd Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  use nextrick with status popover updates
  fix invisible old popover, cleanup, add selection indicator in mentionlinks
2022-06-27 14:29:10 +03:00
Henry Jameson
873cd20d42 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  update status popover when its content changes (only status reference)
  slight z-index refactor and attempt at organizing it
2022-06-22 00:34:49 +03:00
Henry Jameson
8aee85dd6a Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  fix popovers not scrolling in mobile notifications
  fix spacings again
2022-06-21 15:58:13 +03:00
Henry Jameson
eb01004dd1 fix spacings again 2022-06-21 15:52:41 +03:00
Henry Jameson
1ff33a78a7 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  fix tests by just ignoring the html comments
  fix mentionsline extramentions lack of space
  don't show bookmark button for anon visitors
2022-06-21 01:40:57 +03:00
Henry Jameson
559886d844 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  don't stop propagation on settings modal open
  proper horizontal limit
  don't use async component for user popover to fix the incorrect initial position. for some reason same doesn't work with status popover...
2022-06-21 01:19:47 +03:00
Henry Jameson
48bcc81fd0 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  move media modal to the topmost layer
  optimization: only process resize/scroll events when popup is open
2022-06-21 00:14:23 +03:00
Henry Jameson
63eb6f0377 optimization: only process resize/scroll events when popup is open 2022-06-21 00:12:35 +03:00
Henry Jameson
a348f62cb4 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers:
  popover controls for user-card
  unify user popovers into a separate component
2022-06-16 17:10:15 +03:00
Henry Jameson
d4c17bab12 Merge branch 'disjointed-popovers' into shigusegubu-vue3
* disjointed-popovers: (39 commits)
  limit width of popover to slightly lesser than screen width
  don't hide on clicks in popover's content
  use user popovers in notifications as well
  properly center user popovers
  user popovers WIP
  fix tests
  fix popovers in modals
  recalculate position on scrolls
  remove duplicate buttons on post buttons
  fix animations, replace ugly old mentionlink tooltips with new usercard ones
  fix popovers so that all of them have shadows
  turns out it is needed still + some code cleanup
  vPadding is no longer needed
  hide popovers on scroll
  more fixes to chat popovers
  popup offsets should be fixed now
  force panel headers to be square on mobile (for now?)
  fix gap between panel heading and timeline menu
  Fix Open Chat button
  fix?
  ...
2022-06-15 04:08:49 +03:00
Henry Jameson
fecd752af8 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  stick chat scroll to bottom to help with OSK resizing the viewport
2022-05-22 12:19:09 +03:00
Henry Jameson
25ebaa287a Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  Fix virtual scrolling when the user has a lot of pinned statuses
  fix "allow discovery" setting misbehaving
2022-05-20 12:45:17 +03:00
Henry Jameson
9632d285dc Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  stick chats to bottom
2022-05-20 00:31:57 +03:00
Henry Jameson
ad7c101e36 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  try out fully hidden input field
  set/unset threecolumn mode on login/logout
2022-05-16 23:47:14 +03:00
Henry Jameson
654ddf0607 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  don't use wide mode for anon viewers
  don't show "up to date" in user profile TL
  fix inline conversation's shadow showing through outer header
  fix incorrect sticking in user profile page
  fix panel overlaps in firefox
  fix hidden input for file upload causing unintended scrolls
2022-05-09 23:26:25 +03:00
Henry Jameson
95fa0b4156 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  minor fixes
  sort and optimize panel.scss
  fix panel footer colors
2022-04-28 16:37:14 +03:00
Henry Jameson
de0f329192 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix mobile version
  improvements to chats view
2022-04-26 18:55:31 +03:00
Henry Jameson
4f9e2bf795 improvements to chats view 2022-04-26 18:50:11 +03:00
Henry Jameson
ac4cebaccd Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix for notices being glued together
2022-04-26 18:15:28 +03:00
Henry Jameson
7ff485306a Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  more cleanup/fixes, gap b/w panels and topbar is closer to original now
  more fixes for shoutbox
2022-04-26 18:13:11 +03:00
Henry Jameson
329cca98cd more cleanup/fixes, gap b/w panels and topbar is closer to original now 2022-04-26 18:11:46 +03:00
Henry Jameson
d53b961410 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  improvements and cleanup to input components
2022-04-26 17:31:42 +03:00
Henry Jameson
122857ce06 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  oops
2022-04-26 00:12:31 +03:00
Henry Jameson
bb18ff7fc3 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  make panel height property private since it relies on font size
  better formatting
  reduce height of post form by default
2022-04-26 00:11:33 +03:00
Henry Jameson
ce03aae971 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  unified how panel-footer works between regular timelines and user timeline
2022-04-25 23:50:55 +03:00
Henry Jameson
8af1c73e9c Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  switching to center because baseline looks extremely off
2022-04-22 00:29:29 +03:00
Henry Jameson
5ea122b7f3 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  cleanup & more fixes for alignments and sizing
2022-04-21 19:57:38 +03:00
Henry Jameson
c3dd8a39e8 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix panel headers on mobile
2022-04-21 00:40:15 +03:00
Henry Jameson
1df9d94cc7 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  cleanup
2022-04-21 00:28:02 +03:00
Henry Jameson
8b9dd07dbf Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  undo mistake
2022-04-21 00:22:02 +03:00
Henry Jameson
00d16cc415 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  relative units in line-height + some cleanup
2022-04-20 23:55:53 +03:00
Henry Jameson
a78339cebf Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  more em-sized fonts
2022-04-20 23:44:46 +03:00
Henry Jameson
19a22b40d9 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  cleanup and fixes
2022-04-20 23:23:08 +03:00
Henry Jameson
1d19844b3e Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fixes for mobile
2022-04-20 20:43:22 +03:00
Henry Jameson
97d07ed0f6 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  restore old chat inputbox behavior
2022-04-20 20:40:41 +03:00
Henry Jameson
06eba8751c Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix some chat errors/warnings that sometimes happen
  Fix incorrect close of a status popover when clicking Expand inside it
  fix tests
  fix hashtags by explicitly putting attributes
2022-04-20 20:24:09 +03:00
Henry Jameson
991a11079e Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix chat
2022-04-20 20:16:49 +03:00
Henry Jameson
a83d947262 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  i forgor
2022-04-20 20:03:27 +03:00
Henry Jameson
8baba5eb59 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  more fixes for timeline headers
  tons of fixes mainly aimed at panel headings
2022-04-20 19:57:38 +03:00
Henry Jameson
e157b8be63 tons of fixes mainly aimed at panel headings 2022-04-20 19:44:31 +03:00
Henry Jameson
a3fbf4c0cb Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix logoLeft not working at all
2022-04-20 01:25:45 +03:00
Henry Jameson
e1d7411897 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix scrollbars in dropdowns
  fix scrollbars in panel headers
2022-04-20 00:47:16 +03:00
Henry Jameson
b4312b80a9 fix scrollbars in panel headers 2022-04-20 00:46:04 +03:00
Henry Jameson
22cc5f185b fix scrollbars in dropdowns 2022-04-20 00:37:08 +03:00
Henry Jameson
3327b2d0b6 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fixate conversation heading
  fix overflow that sometimes happens in sidebar due to too wide file upload element
2022-04-20 00:01:27 +03:00
Henry Jameson
88c60b3873 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  localization updates
  properly ignore sticky elements when calculating offset because they technically are following main scroll
  unified layout-setting code and made an option to control or disable third column behavior
2022-04-12 22:01:26 +03:00
Henry Jameson
eae4582a5c Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix main scrollbar on chrome
2022-04-12 17:27:59 +03:00
Henry Jameson
6b30bb2b0b Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix main scrollbar on chrome
2022-04-12 17:24:26 +03:00
Henry Jameson
8c9ca02221 fix main scrollbar on chrome 2022-04-12 17:23:53 +03:00
Henry Jameson
81e39d3447 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix chats button alignment
  reduce chats jumpiness
2022-04-12 17:18:10 +03:00
Henry Jameson
b425c5bd33 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix post form/dropzone for good (?)
2022-04-12 01:22:54 +03:00
Henry Jameson
cec23e6232 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  deal with browsers that don't support hiding scrollbars (somewhat)
2022-04-12 00:20:00 +03:00
Henry Jameson
778384b609 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  enforce scroll to avoid jumpiness
2022-04-11 23:55:03 +03:00
Henry Jameson
f2f75690d7 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix dropdown menus
2022-04-11 23:50:04 +03:00
Henry Jameson
cfa3f27eef Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  more fixes for z-indexes in panels
  fix for chat shadow
  fixes for z-indexes
2022-04-11 23:37:33 +03:00
Henry Jameson
9db70d96b1 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix notifications scrolling the main column
2022-04-11 16:46:01 +03:00
Henry Jameson
d9d84b40d9 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix dropzone
  cleanup
2022-04-11 00:20:41 +03:00
Henry Jameson
1907e5b3f2 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  improvements to relative panel sizing
  fix chromium crashing on my machine :hyperjoy: LUL
  improvements to relative font sizes
  fix main post form having hidden emoji picker
2022-04-10 22:37:37 +03:00
Henry Jameson
ce4319e56c Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix horizontal scroll, make hovered column render stuff on top of other ones (popups, tooltips etc)
2022-04-10 21:32:35 +03:00
Henry Jameson
f5d103c1c7 fix horizontal scroll, make hovered column render stuff on top of other
ones (popups, tooltips etc)
2022-04-10 21:31:58 +03:00
Henry Jameson
5b71b33579 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  remove margins from underlay since it causes horizontal scroll on smaller screens
  underlay improvements
  Fix image cropper not closing correctly
2022-04-10 20:43:10 +03:00
Henry Jameson
5596599402 underlay improvements 2022-04-10 20:26:59 +03:00
Henry Jameson
cfa876d01a Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix new post button not working day1, minor stylistic fixes
  layout fixes
  fix extra padding in thread view
  chat fixes
  more fixes
  fix timeline scroll-to-top
  fix scrollable columns
  revert layout back to scrollable body
  revert timeline changes
2022-04-10 20:19:24 +03:00
Henry Jameson
5d6ed75fbd Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  restore margins for inline convos
  clean up and organize CSS, use ems for widths, use vars more
  fix notifs' shadow peeking in when closed on mobile
  Fix tab switcher not working when some tabs hidden
  fix scrollbars for real now
  Fix mobile nav link text colour
  Fix shrug text in muted status
2022-04-10 14:54:39 +03:00
Henry Jameson
8709e09809 fix scrollbars for real now 2022-04-08 13:34:11 +03:00
Henry Jameson
9aa457eeaf Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix chats, boost popover's z-index some more
2022-04-08 13:32:12 +03:00
Henry Jameson
cc7af66788 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  cleanup, fix some things, try to disable scrollbars on mobile
  fix mobile view
2022-04-08 10:17:46 +03:00
Henry Jameson
5f5f59d3ef fix mobile view 2022-04-07 16:39:32 +03:00
Henry Jameson
0fe0fc76a7 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  boost z-index of popover
  oops
2022-04-07 16:18:59 +03:00
Henry Jameson
cef6633c8a oops 2022-04-07 16:10:35 +03:00
Henry Jameson
785c3df7e1 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  make scrollbars use button roundness
2022-04-07 16:08:09 +03:00
Henry Jameson
c15b066bca Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fancy scrollbars
2022-04-07 16:04:50 +03:00
Henry Jameson
b836b27175 Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fancy scrollbars
2022-04-07 16:00:49 +03:00
Henry Jameson
d23f169173 fancy scrollbars 2022-04-07 16:00:28 +03:00
Henry Jameson
e86d8f07bc Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  options to enable scrollbars and disable sticky headers
  fix interactions page
2022-04-07 15:12:00 +03:00
Henry Jameson
d59a80064d Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  fix some scroll issues
2022-04-07 11:36:27 +03:00
Henry Jameson
4e74e9d08c Merge branch 'threecolumn' into shigusegubu-vue3
* threecolumn:
  Fix active popover style
  Use panel text instead of text for shoutbox icon
  Fix dropdown menu style inside panel header
  Fix phoenix sockets in dev mode
  Fix no reactivity on vuex 4 values
  fix tegulu
  heck
  teleport bread
  wide mode initial implementation + cleanup
  make chatlist header sticky
  fix random error that sometimes occurs
  cleanup & code splitting
  fix chat loading endlessly
  chats work and look a bit better
  fix main column having wild widths
  fixed tons of stuff, at least it looks normalish on desktop
  refactored how main app layout works
2022-04-07 10:34:17 +03:00
Henry Jameson
2d1690abef heck 2022-04-06 15:47:52 +03:00
Henry Jameson
12190b439c Merge branch 'fix-csp-vue3' into shigusegubu-vue3
* fix-csp-vue3:
  fix i18n for good??
  force runtime build of i18n
2022-04-06 15:46:10 +03:00
Henry Jameson
f4b521fedc ?? 2022-04-06 11:35:12 +03:00
Henry Jameson
cffee52a41 ? 2022-04-06 11:30:42 +03:00
Henry Jameson
5fa8dab246 Merge branch 'fix-csp-vue3' into shigusegubu-vue3
* fix-csp-vue3:
  fix CSP by compiling the i18n templates as well
  Fix phoenix at 1.6.2
2022-04-06 11:17:29 +03:00
Henry Jameson
789e022442 Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3
* origin/develop:
  Fix English translation of Shoutbox in features panel
2022-03-31 22:35:09 +03:00
Henry Jameson
79eedf4bf2 Merge branch 'vue3-no-compat' into shigusegubu-vue3
* vue3-no-compat:
  oops
2022-03-30 23:54:29 +03:00
Henry Jameson
9b63416e4a Merge branch 'vue3-no-compat' into shigusegubu-vue3
* vue3-no-compat:
  fix some mishaps i noticed during self-review
2022-03-30 23:52:30 +03:00
Henry Jameson
fb0ef07f87 Merge branch 'vue3-no-compat' into shigusegubu-vue3
* vue3-no-compat:
  fix importer
2022-03-30 18:00:57 +03:00
Henry Jameson
528d5e9ca4 fix importer 2022-03-30 18:00:24 +03:00
Henry Jameson
5ef2200715 Merge branch 'vue3-no-compat' into shigusegubu-vue3
* vue3-no-compat:
  make all clickable icons into actual buttons
2022-03-30 13:13:51 +03:00
Henry Jameson
c73afa5805 make all clickable icons into actual buttons 2022-03-30 12:33:56 +03:00
Henry Jameson
2b7b8e8839 Merge branch 'vue3-no-compat' into shigusegubu-vue3
* vue3-no-compat:
  fix emoji input warning spam
  fix error clear icon
  Add controlledShowingLongSubject and toggle in StatusContent props
2022-03-30 01:26:43 +03:00
Henry Jameson
86f9efc843 Merge branch 'vue3-no-compat' into shigusegubu-vue3
* vue3-no-compat:
  how did this get back??
2022-03-29 20:23:55 +03:00
Henry Jameson
1638d66d41 remove console log 2022-03-29 20:22:12 +03:00
Henry Jameson
c83f3eddab Merge branch 'vue3-no-compat' into shigusegubu-vue3
* vue3-no-compat:
  fix warning about custom component
  fix?
  fix some issues with trees
  removing uselsess stuff
  fix reset buttons in profile again
  fix spacing in poll expiration label
  remove unused props to fix test
2022-03-29 20:10:17 +03:00
Henry Jameson
03d9f44509 Merge branch 'vue3-no-compat' into shigusegubu-vue3
* vue3-no-compat:
  remove compat build
2022-03-29 16:28:45 +03:00
Henry Jameson
9a95786d1e Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  registration fixes
  re-fix i18n warnings again
  fix qr code
  lint + fixes for registration
  fix production build's reply not working in tree mode
2022-03-29 16:28:42 +03:00
Henry Jameson
672168ca0f fix??? 2022-03-29 12:41:34 +03:00
Henry Jameson
3cf92ee51e shit 2022-03-29 12:34:41 +03:00
Henry Jameson
60695b583a debug 2022-03-29 12:31:51 +03:00
Henry Jameson
7f3b678477 Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  lock down version?
2022-03-29 12:28:18 +03:00
Henry Jameson
6a69c546cc Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  manual lint
  Revert "fix weird thing i somehow missed"
  Revert "lint"
2022-03-29 12:04:24 +03:00
Henry Jameson
a7a7bfbd6c fix?? 2022-03-29 11:55:50 +03:00
Henry Jameson
c6dfa890b5 Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  fix weird thing i somehow missed
2022-03-29 11:47:40 +03:00
Henry Jameson
d1d7e8424f Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  lint
2022-03-29 10:26:41 +03:00
Henry Jameson
4b3f525a8e Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  fix misc warnings
  properly implement resettableAsyncComponent
  fix opacity control again
  rename some binding hooks according to new names
  fix warnings
  fix some more warnings
  remove some warnings
2022-03-29 00:02:23 +03:00
Henry Jameson
22f4cf1d4a Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  fix being unable to set/reset background (and possibly avatar/banner)
  fix background not showing
2022-03-28 15:02:01 +03:00
Henry Jameson
25fff86441 Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  fix tabs in search
2022-03-27 14:44:34 +03:00
Henry Jameson
deee9ab8df Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  fix optional color inputs
  fix opacity control
  fix font control
  fix (You) spacing
  fix shadow control in theme tab
  fix (roundness) ranges in theme tab
2022-03-27 14:21:14 +03:00
Henry Jameson
a2c15298d1 fix shadow control in theme tab 2022-03-27 13:31:29 +03:00
Henry Jameson
1d22d944a3 fix (roundness) ranges in theme tab 2022-03-27 13:28:59 +03:00
Henry Jameson
6794832725 Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  get rid of portal-vue
  port !1488 to vue3
  Remove debugging code
  Fix overlapping buttons in Theme settings
  Update dependency ruffle-mirror to v2021.12.31
  Update dependency babel-loader to v8.2.4
2022-03-27 12:59:24 +03:00
Henry Jameson
83845f1a01 Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  fix user-list-popover
  fix duplicate setting (most likely a merge issue)
  fix opening directly to filtering tab not working
  Fix notices not disappearing on their own
  fix another spacing issue
2022-03-27 12:43:22 +03:00
Henry Jameson
12c8093ac2 Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  fix forms closing in timelines
  fix minor renames
  woah ima stupid
2022-03-24 14:09:45 +02:00
Henry Jameson
e53447e110 Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again:
  fix checkboxes, specifically the NSFW one
2022-03-24 11:42:09 +02:00
Henry Jameson
f7c2cb95a0 Merge branch 'vue3-again' into shigusegubu-vue3
* vue3-again: (59 commits)
  cleanup console log
  fix i18n at places
  fix all the spacings i could find
  fix spacings in notifications
  fix dupe id
  fix animations
  cleanup
  fix capitalization (and localization of tooltips for scope icon)
  listeners aren't actually used
  fix selects in settings screen
  fix tabs not being able to be "disabled"
  fix avatars not opening inline card
  fix other weird route
  fix routes test
  skip user profile test for now https://github.com/vuejs/test-utils/issues/1382
  fix emoji input tests
  fix richcontent and its tests
  fix tests running
  fix mobile post button being too square
  fix selects
  ...
2022-03-24 09:33:00 +02:00
Henry Jameson
82793a5e8a Merge branch 'develop' into shigusegubu
* develop:
  quick fix for alignment in avatars, juggling multiple branches is confusing
2022-03-22 12:03:57 +02:00
Henry Jameson
b15543e414 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  fix even more issues with avatars
  Update dependency ora to v0.4.1
  Update dependency mini-css-extract-plugin to v0.12.0
  Update dependency karma-firefox-launcher to v1.3.0
  fix avatars in mobile view
2022-03-22 11:55:47 +02:00
Henry Jameson
874ec92764 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  improve the looks of bot indicator
  fix bot indicator appearing on retweeter avatar
  Update dependency localforage to v1.10.0
  Update dependency http-proxy-middleware to v0.21.0
  Update dependency eslint-plugin-standard to v4.1.0
  Update dependency eslint-plugin-import to v2.25.4
  Update babel monorepo to v7.17.8
  Update dependency iso-639-1 to v2.1.13
  Update dependency express to v4.17.3
  Update dependency eslint-plugin-promise to v4.3.1
  Update dependency eslint-loader to v2.2.1
  Update dependency cropperjs to v1.5.12
  Update dependency body-scroll-lock to v2.7.1
  Update babel monorepo
  Apply 1 suggestion(s) to 1 file(s)
  Update dependency @ungap/event-target to v0.2.3
2022-03-21 22:14:50 +02:00
Henry Jameson
321b2ca619 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Update package.json
  fix broken icons after FA upgrade
  Update Font Awesome
  Update dependency webpack-dev-middleware to v3.7.3
  Update dependency vuelidate to v0.7.7
  Pin dependency @kazvmoe-infra/pinch-zoom-element to 1.2.0
2022-03-15 21:19:10 +02:00
Henry Jameson
45cf22dec1 fix merge error 2022-03-14 09:59:30 +02:00
Henry Jameson
19290f06e3 Merge branch 'expert-settings-and-serverside' into shigusegubu
* expert-settings-and-serverside: (84 commits)
  lint
  Make media modal buttons larger
  Add English translation for hide tooltip
  Add hide button to media modal
  Lint
  Prevent hiding media viewer if swiped over SwipeClick
  Fix webkit image blurs
  Fix video in media modal not displaying properly
  Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
  Remove image box-shadow in media modal
  Clean up debug code for image pinch zoom
  Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
  Bump pinch-zoom-element version
  Clean up
  Check whether we swiped only for mouse pointer
  Scale swipe threshold with viewport width
  Update pinch-zoom-element
  Allow pinch-zoom to fill the whole screen
  Use native click for hiding overlay
  Reset position on swipe end even if we cannot navigate
  ...
2022-03-14 09:42:39 +02:00
Henry Jameson
2e47a5eae0 Merge branch 'expert-settings-and-serverside' into shigusegubu
* expert-settings-and-serverside:
  Update dependency shelljs to v0.8.5
  Do not mute bot posts in notifications
  Add bot indication to user icon on statuses
  Mute bot posts
2022-03-13 16:34:47 +02:00
Henry Jameson
6f7ebb5891 fix merge conflict 2022-03-13 12:22:14 +02:00
Henry Jameson
e928cef22a Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Update dependency v-click-outside to v2.1.5
2022-03-13 11:33:16 +02:00
Henry Jameson
cef6a44fa5 Merge branch 'expert-settings-and-serverside' into shigusegubu
* expert-settings-and-serverside:
  reduce the copypaste by making it more functional-style
  remove "experimental" label from streaming api
2022-03-13 11:33:12 +02:00
Henry Jameson
2469570c91 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Update dependency portal-vue to v2.1.7
  Update dependency lodash to v4.17.21
  Update dependency karma-spec-reporter to v0.0.33
  Update dependency karma-webpack to v4.0.2
  Update dependency karma-sourcemap-loader to v0.3.8
  Update dependency eslint-plugin-vue to v5.2.3
  Update dependency chromedriver to v87.0.7
  Update dependency @chenfengyuan/vue-qrcode to v1.0.2
  Pin dependencies
  Pin dependencies
2022-03-13 10:41:03 +02:00
Henry Jameson
877ab153a8 Merge remote-tracking branch 'tusooa/from/develop/tusooa/media-touch-actions' into shigusegubu
* tusooa/from/develop/tusooa/media-touch-actions:
  Make media modal buttons larger
2022-03-07 20:04:54 +02:00
Tusooa Zhu
deb6370007
Make media modal buttons larger 2022-03-06 18:38:57 -05:00
Henry Jameson
b40942557c Merge remote-tracking branch 'tusooa/from/develop/tusooa/tree-threading' into shigusegubu
* tusooa/from/develop/tusooa/tree-threading:
  Add English translations for fading ancestor option
  Make fading ancestors optional
  Update English translation for tree view settings
  Split conversation display style into two different settings
  Make 'Show full conversation' button have left border in embbeded mode
  Fix showingLongSubject not correctly propagated
  Fix timeline jump when scrolling
  Make replying and mediaPlaying controlled
  Clean up debug code for tree threading
  Fix virtual scrolling for tree threading
  Fix controlled status display toggles
  Add English translations for other replies count
  Add other replies count for reply list link
  Do not display replies inside status as link if there are no other replies
2022-03-06 23:42:04 +02:00
Henry Jameson
924a626108 Merge remote-tracking branch 'tusooa/from/develop/tusooa/media-touch-actions' into shigusegubu
* tusooa/from/develop/tusooa/media-touch-actions: (28 commits)
  Add English translation for hide tooltip
  Add hide button to media modal
  Lint
  Prevent hiding media viewer if swiped over SwipeClick
  Fix webkit image blurs
  Fix video in media modal not displaying properly
  Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
  Remove image box-shadow in media modal
  Clean up debug code for image pinch zoom
  Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
  Bump pinch-zoom-element version
  Clean up
  Check whether we swiped only for mouse pointer
  Scale swipe threshold with viewport width
  Update pinch-zoom-element
  Allow pinch-zoom to fill the whole screen
  Use native click for hiding overlay
  Reset position on swipe end even if we cannot navigate
  Make lint happy
  Prevent the click event from firing on content below modal
  ...
2022-03-06 23:40:21 +02:00
Henry Jameson
2e69cb773a Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Lint
  Add renovate.json
  fix placeholder attachments opening new tab
2022-03-06 23:38:18 +02:00
Tusooa Zhu
71de2dc1d5
Add English translations for fading ancestor option 2022-03-06 14:18:52 -05:00
Tusooa Zhu
16686dbb4c
Make fading ancestors optional 2022-03-06 14:18:52 -05:00
Tusooa Zhu
55552ef273
Update English translation for tree view settings 2022-03-06 14:18:52 -05:00
Tusooa Zhu
4027b3f456
Split conversation display style into two different settings
linear => linear (now default)
simple_tree => tree / conversationTreeAdvanced=false
tree => tree / conversationTreeAdvanced=true
2022-03-06 14:18:52 -05:00
Tusooa Zhu
2d519a0822
Make 'Show full conversation' button have left border in embbeded mode 2022-03-06 14:18:44 -05:00
Tusooa Zhu
dcb2270487
Add English translation for hide tooltip 2022-03-03 12:52:24 -05:00
Tusooa Zhu
2da80c2752
Add hide button to media modal 2022-03-03 12:51:13 -05:00
Tusooa Zhu
43c4635b10
Lint 2022-03-03 12:47:30 -05:00
Tusooa Zhu
24ff4559c3
Prevent hiding media viewer if swiped over SwipeClick 2022-03-03 12:47:30 -05:00
Tusooa Zhu
8b17677410
Fix webkit image blurs 2022-03-03 12:47:30 -05:00
Tusooa Zhu
89e4b17ed7
Fix video in media modal not displaying properly 2022-03-03 12:47:30 -05:00
Tusooa Zhu
21bcdacb10
Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403 2022-03-03 12:47:30 -05:00
Tusooa Zhu
6780f48b8b
Remove image box-shadow in media modal
The box-shadow causes an image to be very blurry on Webkit browsers
(experienced: Konqueror, Safari; heard of: Chrome) when scaled up
if the initial size of the image is much smaller than the actual size
(e.g. when viewing a very long picture).

The shadow is not really obvious anyway.
2022-03-03 12:47:30 -05:00
Tusooa Zhu
c42bd48db2
Clean up debug code for image pinch zoom 2022-03-03 12:47:30 -05:00
Tusooa Zhu
6827dabfb2
Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
2022-03-03 12:47:30 -05:00
Tusooa Zhu
1141ac22b2
Bump pinch-zoom-element version 2022-03-03 12:47:30 -05:00
Tusooa Zhu
358c7a5909
Clean up 2022-03-03 12:47:30 -05:00
Tusooa Zhu
884f183c3f
Check whether we swiped only for mouse pointer 2022-03-03 12:47:30 -05:00
Tusooa Zhu
e04779ae83
Scale swipe threshold with viewport width 2022-03-03 12:47:29 -05:00
Tusooa Zhu
e5c73fa4c7
Update pinch-zoom-element 2022-03-03 12:47:29 -05:00
Tusooa Zhu
99c96fc414
Allow pinch-zoom to fill the whole screen 2022-03-03 12:47:29 -05:00
Tusooa Zhu
288bb5355b
Use native click for hiding overlay
The pointerup strategy is unsuccessful, as some other overlays
(Firefox's Inspect Element) will pass down pointerup events.
2022-03-03 12:47:29 -05:00
Tusooa Zhu
6f1c8a4296
Reset position on swipe end even if we cannot navigate 2022-03-03 12:47:29 -05:00
Tusooa Zhu
cdd1437a48
Make lint happy 2022-03-03 12:47:29 -05:00
Tusooa Zhu
2b657ef91e
Prevent the click event from firing on content below modal 2022-03-03 12:47:29 -05:00
Tusooa Zhu
6b16b0ee56
Add missing swipe click component 2022-03-03 12:47:29 -05:00
Tusooa Zhu
94aa3f4675
Clean up 2022-03-03 12:47:29 -05:00
Tusooa Zhu
3931f867e8
Add swipe-click handler to media modal
Now swiping will correctly change the current media, and with a good
preview. Clicking without swiping closes the overlay.
2022-03-03 12:47:28 -05:00
Tusooa Zhu
e6a4464001
Use pinch-zoom-element for pinch zoom functionality 2022-03-03 12:47:28 -05:00
Tusooa Zhu
996cdf6470
Add pan threshold 2022-03-03 12:47:28 -05:00
Tusooa Zhu
2c243a5d62
Handle pinch action 2022-03-03 12:47:28 -05:00
Tusooa Zhu
4970a3c4a6
Preview swipe action 2022-03-03 12:47:28 -05:00
Tusooa Zhu
b95dc3b03e
Make media modal be aware of multi-touch actions
Originally the media viewer would think every touch is a swipe (one-finger
touch event), so we would encounter the case where a two-finger scale event
would incorrectly change the current media. This is now fixed.
2022-03-03 12:47:28 -05:00
Henry Jameson
374df875ee Merge branch 'from/develop/tusooa/tree-threading' into shigusegubu
* from/develop/tusooa/tree-threading: (45 commits)
  Fix showingLongSubject not correctly propagated
  Fix timeline jump when scrolling
  Make replying and mediaPlaying controlled
  Fix virtual scrolling for tree threading
  Clean up debug code for tree threading
  Fix controlled status display toggles
  Add English translations for other replies count
  Add other replies count for reply list link
  Do not display replies inside status as link if there are no other replies
  Add English translation for position of other replies button pref
  Make position of other replies button a pref
  Add English translation for show all conversation button improvement
  Improve "show full conversation" interaction
  Make other replies button stretch along the row
  Optimise thread ancestor borders
  Optimise thread ancestor display style
  Reset thread open state when collapsed
  Clean up
  Highlight ancestor of the current status when diving back to top
  Add English translation for Misskey-style tree view
  ...
2022-02-28 20:17:00 +02:00
Tusooa Zhu
8bcf38d5b3
Fix showingLongSubject not correctly propagated 2022-02-28 13:11:02 -05:00
Tusooa Zhu
f0cf2c79f6
Fix timeline jump when scrolling
Ref: tree-threading
2022-02-28 13:11:02 -05:00
Tusooa Zhu
71f3162f5d
Make replying and mediaPlaying controlled
$refs is not a reliable way to deal with child components under
tree threading as it is not reactive, but the children may change at
any time. The only good way seems to be making these states aggregated on
the conversation component.

Ref: tree-threading
2022-02-28 13:11:02 -05:00
Tusooa Zhu
470c96f49e
Clean up debug code for tree threading 2022-02-28 13:11:02 -05:00
Tusooa Zhu
9eb6d48f69
Fix virtual scrolling for tree threading
Ref: tree-threading
2022-02-28 13:11:02 -05:00
Tusooa Zhu
fe57afd183
Fix controlled status display toggles 2022-02-28 13:11:02 -05:00
Tusooa Zhu
64d20d1b0f
Add English translations for other replies count 2022-02-28 13:11:02 -05:00
Tusooa Zhu
1931595a6e
Add other replies count for reply list link 2022-02-28 13:10:41 -05:00
Tusooa Zhu
7b4043b91b
Do not display replies inside status as link if there are no other replies 2022-02-28 13:10:10 -05:00
Henry Jameson
0c8a018376 local merge conflict resolution 2022-02-28 18:32:57 +02:00
Henry Jameson
e6cf9efe69 Merge branch 'expert-settings-and-serverside' into shigusegubu
* expert-settings-and-serverside:
  lint
  pre-emptively wipe serverside settings on logout
  fix errors in choicesetting
  fix typos in profile page
  hidden away more settings when logged out
  fix settings behaving erratically and not updating properly
  fix stripping rich content not working
  revert changes related to streaming/firehose setting, reword it so it's not confused with websocket streaming
  fix firefox rendering (??????????)
  revert to using local setting for default nsfw since backend is broken
  better phrasing
  new defaults
  expert settings toggle + server-side settings
2022-02-28 18:26:37 +02:00
Henry Jameson
af34c25512 Merge remote-tracking branch 'tusooa/from/develop/tusooa/tree-threading' into shigusegubu
* tusooa/from/develop/tusooa/tree-threading: (48 commits)
  Fix showingLongSubject not correctly propagated
  Fix timeline jump when scrolling
  Make replying and mediaPlaying controlled
  Clean up debug code for tree threading
  Fix virtual scrolling for tree threading
  Fix controlled status display toggles
  Add English translations for other replies count
  Add other replies count for reply list link
  Add English translation for position of other replies button pref
  Make position of other replies button a pref
  Add English translation for show all conversation button improvement
  Improve "show full conversation" interaction
  Make other replies button stretch along the row
  Optimise thread ancestor borders
  Optimise thread ancestor display style
  Reset thread open state when collapsed
  Clean up
  Highlight ancestor of the current status when diving back to top
  Add English translation for Misskey-style tree view
  Implement Misskey-style tree view
  ...
2022-02-28 18:25:12 +02:00
Tusooa Zhu
075342a4ea
Fix showingLongSubject not correctly propagated 2022-02-27 14:15:45 -05:00
Tusooa Zhu
4a4844a372
Fix timeline jump when scrolling
Ref: tree-threading
2022-02-27 14:15:26 -05:00
Tusooa Zhu
fa9fcb1751
Make replying and mediaPlaying controlled
$refs is not a reliable way to deal with child components under
tree threading as it is not reactive, but the children may change at
any time. The only good way seems to be making these states aggregated on
the conversation component.

Ref: tree-threading
2022-02-27 14:15:09 -05:00
Tusooa Zhu
e1bcb09379
Clean up debug code for tree threading 2022-02-27 14:14:38 -05:00
Tusooa Zhu
27dbfecf47
Fix virtual scrolling for tree threading
Ref: tree-threading
2022-02-27 14:14:35 -05:00
Tusooa Zhu
79dc1295c8
Fix controlled status display toggles 2022-02-27 14:12:36 -05:00
Tusooa Zhu
b7253279a0
Add English translations for other replies count 2022-02-27 14:12:04 -05:00
Tusooa Zhu
236abccff3
Add other replies count for reply list link 2022-02-27 14:11:40 -05:00
Tusooa Zhu
6d8ae1a432
Add English translation for position of other replies button pref 2022-02-27 14:11:22 -05:00
Tusooa Zhu
b948f05123
Make position of other replies button a pref 2022-02-27 14:11:21 -05:00
Tusooa Zhu
75d06bf2d7
Add English translation for show all conversation button improvement 2022-02-27 14:10:56 -05:00
Tusooa Zhu
bd6beb9245
Improve "show full conversation" interaction
Now we only show that button when there are other statuses out of sight
(other toplevel statuses exist outside of the current thread tree).
2022-02-27 14:10:43 -05:00
Tusooa Zhu
68cb443e90
Make other replies button stretch along the row 2022-02-27 14:10:25 -05:00
Tusooa Zhu
4a9d043300
Optimise thread ancestor borders 2022-02-27 14:10:01 -05:00
Tusooa Zhu
bc6053a8b8
Optimise thread ancestor display style 2022-02-27 14:10:01 -05:00
Tusooa Zhu
210325570c
Reset thread open state when collapsed 2022-02-27 14:10:01 -05:00
Tusooa Zhu
d48c45f59d
Clean up 2022-02-27 14:10:01 -05:00
Tusooa Zhu
cad008e351
Highlight ancestor of the current status when diving back to top 2022-02-27 14:09:47 -05:00
Tusooa Zhu
6ab84a0952
Add English translation for Misskey-style tree view 2022-02-27 14:09:30 -05:00
Tusooa Zhu
afb7c749b1
Implement Misskey-style tree view
Now the tree will be always rooted at the highlighted status, and
all its ancestors shown linearly on the top.

Enhancement: If an ancestor has more
than one reply (i.e. it has a child that is not on current status's
ancestor chain), we are given a link to root the thread at that status.
2022-02-27 14:09:30 -05:00
Tusooa Zhu
644aced2dd
Remove horizontal border and thicken vertical border in a thread tree 2022-02-27 14:09:29 -05:00
Tusooa Zhu
9d26dc9a2c
Make dive/undive button clickable along the whole row 2022-02-27 14:09:29 -05:00
Tusooa Zhu
6c6f824591
Optimize thread border radius 2022-02-27 14:09:29 -05:00
Tusooa Zhu
5b77177931
Optimize thread display 2022-02-27 14:09:29 -05:00
Tusooa Zhu
690e979ff2
Fix the bug where toggleShowingTall does not work 2022-02-27 14:09:28 -05:00
Tusooa Zhu
c5301b4831
Fix status undefined in parentOf 2022-02-27 14:08:47 -05:00
Tusooa Zhu
34569e01da
Add English translations for max depth in thread 2022-02-27 14:08:33 -05:00
Tusooa Zhu
ad5bbec28c
Add settings for max depth in thread 2022-02-27 14:08:33 -05:00
Tusooa Zhu
268d3533f9
Use mergedConfig properly 2022-02-27 14:08:33 -05:00
Tusooa Zhu
3d0ebaf54b
Fallback to simpleTree style 2022-02-27 14:08:14 -05:00
Tusooa Zhu
6c20c5dd52
Undive when collapsed 2022-02-27 14:08:04 -05:00
Tusooa Zhu
3535ca49b5
Clean up 2022-02-27 14:07:47 -05:00
Tusooa Zhu
f9d67d8c8a
Lint 2022-02-27 14:07:39 -05:00
Tusooa Zhu
f6e9461f16
Add English translation for simple tree 2022-02-27 14:07:32 -05:00
Tusooa Zhu
ae883c759a
Add simple tree style navigation 2022-02-27 14:07:14 -05:00
Tusooa Zhu
14134cc281
Add English translation for diving 2022-02-27 14:06:59 -05:00
Tusooa Zhu
612c12ef53
Add dive functionality 2022-02-27 14:06:58 -05:00
Tusooa Zhu
3228326a44
Add English translations for diving 2022-02-27 14:06:30 -05:00
Tusooa Zhu
13172dea89
Support diving into one status in a conversation 2022-02-27 14:06:30 -05:00
Tusooa Zhu
d45d0e05a5
Make status display controlled 2022-02-27 14:06:15 -05:00
Tusooa Zhu
0ebb012d5e
Add English translations for message threading 2022-02-27 14:06:00 -05:00
Tusooa Zhu
242e2891c5
Make show full thread message account for numbers 2022-02-27 14:06:00 -05:00
Tusooa Zhu
d10acfd993
Implement thread folding/expanding 2022-02-27 14:05:59 -05:00
Tusooa Zhu
576327d215
Add tree-style thread display 2022-02-27 14:05:25 -05:00
Henry Jameson
5db8112cd5 Merge remote-tracking branch 'tusooa/from/develop/tusooa/media-touch-actions' into shigusegubu
* tusooa/from/develop/tusooa/media-touch-actions: (26 commits)
  Lint
  Prevent hiding media viewer if swiped over SwipeClick
  Fix webkit image blurs
  Fix video in media modal not displaying properly
  Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
  Remove image box-shadow in media modal
  Clean up debug code for image pinch zoom
  Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
  Bump pinch-zoom-element version
  Clean up
  Check whether we swiped only for mouse pointer
  Scale swipe threshold with viewport width
  Update pinch-zoom-element
  Allow pinch-zoom to fill the whole screen
  Use native click for hiding overlay
  Reset position on swipe end even if we cannot navigate
  Make lint happy
  Prevent the click event from firing on content below modal
  Add missing swipe click component
  Clean up
  ...
2022-02-21 16:59:08 +02:00
Tusooa Zhu
4eab7a135b
Lint 2022-02-20 22:58:02 -05:00
Tusooa Zhu
d8bf931e06
Prevent hiding media viewer if swiped over SwipeClick 2022-02-20 22:56:42 -05:00
Tusooa Zhu
b8e4b8478e
Fix webkit image blurs 2022-02-20 22:56:31 -05:00
Tusooa Zhu
1e9cbb2da1
Fix video in media modal not displaying properly 2022-02-20 22:56:16 -05:00
Tusooa Zhu
544899f41a
Add changelog for https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403 2022-02-20 22:56:01 -05:00
Tusooa Zhu
3a618465be
Remove image box-shadow in media modal
The box-shadow causes an image to be very blurry on Webkit browsers
(experienced: Konqueror, Safari; heard of: Chrome) when scaled up
if the initial size of the image is much smaller than the actual size
(e.g. when viewing a very long picture).

The shadow is not really obvious anyway.
2022-02-20 22:55:12 -05:00
Tusooa Zhu
c6de55b558
Clean up debug code for image pinch zoom 2022-02-20 22:54:12 -05:00
Tusooa Zhu
ff78cc1255
Bump @kazvmoe-infra/pinch-zoom-element to 1.2.0 on npm
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403
2022-02-20 22:53:56 -05:00
Tusooa Zhu
1a067e2bd6
Bump pinch-zoom-element version 2022-02-20 22:53:26 -05:00
Tusooa Zhu
7f91fb153b
Clean up 2022-02-20 22:53:26 -05:00
Tusooa Zhu
ecdfc698fd
Check whether we swiped only for mouse pointer 2022-02-20 22:53:26 -05:00
Tusooa Zhu
872619c9cd
Scale swipe threshold with viewport width 2022-02-20 22:53:26 -05:00
Tusooa Zhu
f1e4bd7651
Update pinch-zoom-element 2022-02-20 22:53:26 -05:00
Tusooa Zhu
500867c010
Allow pinch-zoom to fill the whole screen 2022-02-20 22:53:26 -05:00
Tusooa Zhu
98e1be19ec
Use native click for hiding overlay
The pointerup strategy is unsuccessful, as some other overlays
(Firefox's Inspect Element) will pass down pointerup events.
2022-02-20 22:53:25 -05:00
Tusooa Zhu
fe691f8cb4
Reset position on swipe end even if we cannot navigate 2022-02-20 22:53:25 -05:00
Tusooa Zhu
104677860b
Make lint happy 2022-02-20 22:53:25 -05:00
Tusooa Zhu
bc67ba06bb
Prevent the click event from firing on content below modal 2022-02-20 22:53:25 -05:00
Tusooa Zhu
1f44cc9089
Add missing swipe click component 2022-02-20 22:53:25 -05:00
Tusooa Zhu
98baae9709
Clean up 2022-02-20 22:53:25 -05:00
Tusooa Zhu
43b285893a
Add swipe-click handler to media modal
Now swiping will correctly change the current media, and with a good
preview. Clicking without swiping closes the overlay.
2022-02-20 22:53:24 -05:00
Tusooa Zhu
42ef082ff6
Use pinch-zoom-element for pinch zoom functionality 2022-02-20 22:53:24 -05:00
Tusooa Zhu
3648a82f3f
Add pan threshold 2022-02-20 22:53:24 -05:00
Tusooa Zhu
a4253c0543
Handle pinch action 2022-02-20 22:53:24 -05:00
Tusooa Zhu
470cec3a6b
Preview swipe action 2022-02-20 22:53:24 -05:00
Tusooa Zhu
dc186d8b53
Make media modal be aware of multi-touch actions
Originally the media viewer would think every touch is a swipe (one-finger
touch event), so we would encounter the case where a two-finger scale event
would incorrectly change the current media. This is now fixed.
2022-02-20 22:51:54 -05:00
Henry Jameson
5620117f56 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  fix #1133
2022-02-20 17:12:39 +02:00
Henry Jameson
20fd73f6b9 Merge branch 'fix-pinned-statuses' into shigusegubu
* fix-pinned-statuses:
  only for user TL
  removed file because that logic has been removed
2022-02-20 00:57:50 +02:00
Henry Jameson
f5f6365fb7 Merge branch 'fix-pinned-statuses' into shigusegubu
* fix-pinned-statuses:
  lol, lmao, that was some shit, this is much easier and works all the time
  fix pinned statuses appearing at the bottom of user timeline (and possibly fetching new ones there)
2022-02-20 00:42:09 +02:00
Henry Jameson
5076c96b89 Merge branch 'fix-mentions-new-bugs' into shigusegubu
* fix-mentions-new-bugs:
  new unit tests
  fix unit tests
  enable link handling in user bios to fix links not having _blank
  add emoji to chat titles
  use rich content in interaction lists
2022-02-19 23:05:03 +02:00
Henry Jameson
e68745ffee Merge branch 'fix-mentions-new-bugs' into shigusegubu
* fix-mentions-new-bugs:
  more spacing fixes
2022-02-11 15:11:13 +02:00
Henry Jameson
104f650a1e Merge branch 'fix-mentions-new-bugs' into shigusegubu
* fix-mentions-new-bugs:
  more spacing fixes
  more spacing/wrapping fixes
2022-02-11 15:06:28 +02:00
Henry Jameson
592ed9ce33 Merge branch 'proper-attachments' into shigusegubu
* proper-attachments:
  improve unknown attachment handling
2022-02-10 15:44:43 +02:00
Henry Jameson
976d12c0a0 more spacing/wrapping fixes 2022-02-09 23:34:06 +02:00
Henry Jameson
26f2736c77 defaults! 2022-02-04 14:23:38 +02:00
Henry Jameson
c08542bee4 Merge branch 'fix-mentions-new-bugs' into shigusegubu
* fix-mentions-new-bugs:
  fix overflows
2022-02-04 14:21:12 +02:00
Henry Jameson
7451f996f3 Merge branch 'fix-mentions-new-bugs' into shigusegubu
* fix-mentions-new-bugs:
  better approach to unescaping
2022-02-03 23:14:12 +02:00
Henry Jameson
40cdbf3e6f Merge branch 'fix-mentions-new-bugs' into shigusegubu
* fix-mentions-new-bugs:
  fix amps in links
  make chat messages behave same as posts for animated gifs
  support width/height img attributes
  lint
  better phrasing?
  options to disable (You)s and highlighting of yourself
  fix poast mentions tripping
  fix alignment issues
2022-02-03 23:00:07 +02:00
Henry Jameson
ca79122c0b Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Fix lint warning in filtering_tab.vue
  Fix Follow button missing on follow list
  Hide mention link avatar by default
  Add English translation for mention link prefs
  Make mention link prefs ui more intuitive
  Add option to fade domains in mention link
  Make avatar unselectable
  Add option to display user avatar in mention link
  Make (You) unselectable
  Style properly usernames without tooltips
  Add pref for whether to display full user names and tooltips
  Add a pref for whether to display mention as icon or text
2022-02-03 23:00:01 +02:00
Henry Jameson
5b2a802921 Merge branch 'proper-attachments' into shigusegubu
* proper-attachments:
  changelog
  fix too-many-attachments in notifications column
2022-01-24 21:47:46 +02:00
Henry Jameson
29586795ec Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Update CHANGELOG.md
  undo accidental change when merging
  Improve the user card for deactivated users
  Update CHANGELOG.md
  Update CHANGELOG.md
  Apply 1 suggestion(s) to 1 file(s)
  Allow canceling a follow request
  Simple policy reasons for instance specific policies
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Korean)
  Translated using Weblate (Japanese (ja_PEDANTIC))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Italian)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Italian)
2022-01-24 21:47:34 +02:00
Tusooa Zhu
a08785904d
Fix showingLongSubject not correctly propagated 2021-11-22 12:22:32 -05:00
Henry Jameson
67efa635c5 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  entity_normalizer: Escape name when parsing user
2021-11-16 19:49:37 +02:00
Henry Jameson
39ea72d6cd Merge branch 'develop' into shigusegubu
* develop: (61 commits)
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Basque)
  Added translation using Weblate (Vietnamese)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Basque)
  Translated using Weblate (Polish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Polish)
  Translated using Weblate (Spanish)
  Added translation using Weblate (Indonesian)
  Translated using Weblate (Spanish)
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  ...
2021-11-04 18:26:21 +02:00
HJ
694c3ffec2 Merge branch 'simplePolicy_reasons_for_instance_specific_policies' into 'develop'
Simple policy reasons for instance specific policies

See merge request pleroma/pleroma-fe!1263
2021-10-22 15:19:26 +00:00
Tusooa Zhu
fe0e7bd63c
Fix timeline jump when scrolling
Ref: tree-threading
2021-09-16 10:05:07 -04:00
Tusooa Zhu
78f573af47
Make replying and mediaPlaying controlled
$refs is not a reliable way to deal with child components under
tree threading as it is not reactive, but the children may change at
any time. The only good way seems to be making these states aggregated on
the conversation component.

Ref: tree-threading
2021-09-16 00:34:14 -04:00
Tusooa Zhu
12ed9a1799
Fix virtual scrolling for tree threading
Ref: tree-threading
2021-09-16 00:34:14 -04:00
Tusooa Zhu
0b576b64e2
Clean up debug code for tree threading 2021-09-10 15:24:23 -04:00
Tusooa Zhu
708633d6b1
Fix controlled status display toggles 2021-09-10 15:10:10 -04:00
Tusooa Zhu
59a2f65a33
Add English translations for other replies count 2021-09-10 15:10:10 -04:00
Tusooa Zhu
c069a9f799
Add other replies count for reply list link 2021-09-10 15:10:10 -04:00
Tusooa Zhu
c634e15305
Do not display replies inside status as link if there are no other replies 2021-09-10 15:10:03 -04:00
Tusooa Zhu
a1404f7735
Add English translation for position of other replies button pref 2021-09-09 00:26:08 -04:00
Tusooa Zhu
70ec3ad09e
Make position of other replies button a pref 2021-09-09 00:26:08 -04:00
Tusooa Zhu
8a4c0bfa18
Add English translation for show all conversation button improvement 2021-09-09 00:26:08 -04:00
Tusooa Zhu
00cc721344
Improve "show full conversation" interaction
Now we only show that button when there are other statuses out of sight
(other toplevel statuses exist outside of the current thread tree).
2021-09-09 00:26:08 -04:00
Tusooa Zhu
a917bdc34b
Make other replies button stretch along the row 2021-09-09 00:26:08 -04:00
Tusooa Zhu
4648bc6f72
Optimise thread ancestor borders 2021-09-09 00:26:08 -04:00
Tusooa Zhu
5643314922
Optimise thread ancestor display style 2021-09-09 00:26:08 -04:00
Tusooa Zhu
89761743b8
Reset thread open state when collapsed 2021-09-09 00:26:07 -04:00
Tusooa Zhu
e01445b1d9
Clean up 2021-09-09 00:26:07 -04:00
Tusooa Zhu
5a37ea5a8e
Highlight ancestor of the current status when diving back to top 2021-09-09 00:26:07 -04:00
Tusooa Zhu
1fdba77ae5
Add English translation for Misskey-style tree view 2021-09-09 00:26:07 -04:00
Tusooa Zhu
7dd5e0fc8e
Implement Misskey-style tree view
Now the tree will be always rooted at the highlighted status, and
all its ancestors shown linearly on the top.

Enhancement: If an ancestor has more
than one reply (i.e. it has a child that is not on current status's
ancestor chain), we are given a link to root the thread at that status.
2021-09-09 00:26:07 -04:00
Tusooa Zhu
38a67cc2e2
Remove horizontal border and thicken vertical border in a thread tree 2021-09-09 00:26:07 -04:00
Tusooa Zhu
2c91a020bc
Make dive/undive button clickable along the whole row 2021-09-09 00:23:48 -04:00
Tusooa Zhu
2a6f0c4a34
Optimize thread border radius 2021-09-09 00:23:48 -04:00
Tusooa Zhu
f8d25d2c2a
Optimize thread display 2021-09-09 00:23:48 -04:00
Tusooa Zhu
b7e179c1fe
Fix the bug where toggleShowingTall does not work 2021-09-09 00:23:47 -04:00
Tusooa Zhu
46feecee70
Fix status undefined in parentOf 2021-09-09 00:23:09 -04:00
Tusooa Zhu
9029344e1f
Add English translations for max depth in thread 2021-09-09 00:22:53 -04:00
Tusooa Zhu
891fb00107
Add settings for max depth in thread 2021-09-09 00:22:53 -04:00
Tusooa Zhu
640d3041ef
Use mergedConfig properly 2021-09-09 00:22:32 -04:00
Tusooa Zhu
28469988dd
Fallback to simpleTree style 2021-09-09 00:22:15 -04:00
Tusooa Zhu
ac464be063
Undive when collapsed 2021-09-09 00:21:37 -04:00
Tusooa Zhu
c221805695
Clean up 2021-09-09 00:21:23 -04:00
Tusooa Zhu
49398566d3
Lint 2021-09-09 00:21:14 -04:00
Tusooa Zhu
9ccc374feb
Add English translation for simple tree 2021-09-09 00:21:00 -04:00
Tusooa Zhu
ad5c0abe14
Add simple tree style navigation 2021-09-09 00:20:51 -04:00
Tusooa Zhu
ff59c5a785
Add English translation for diving 2021-09-09 00:20:29 -04:00
Tusooa Zhu
93bcee9516
Add dive functionality 2021-09-09 00:20:22 -04:00
Tusooa Zhu
f0c717ce5f
Add English translations for diving 2021-09-09 00:19:15 -04:00
Tusooa Zhu
4f775b6be4
Support diving into one status in a conversation 2021-09-09 00:19:15 -04:00
Tusooa Zhu
436597a906
Make status display controlled 2021-09-09 00:19:15 -04:00
Tusooa Zhu
e6120df550
Add English translations for message threading 2021-09-09 00:19:15 -04:00
Tusooa Zhu
a4a0858110
Make show full thread message account for numbers 2021-09-09 00:19:15 -04:00
Tusooa Zhu
b1f4b1bff3
Implement thread folding/expanding 2021-09-09 00:19:15 -04:00
Tusooa Zhu
814a27749a
Add tree-style thread display 2021-09-09 00:19:15 -04:00
Henry Jameson
5f51e4a2ec Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix spacing before hashtags
2021-08-23 21:37:43 +03:00
Henry Jameson
586aee51a8 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  very minimalist hashtaglink implementation, also you can middle-click mentions now.
  fix tests
2021-08-23 20:59:12 +03:00
Henry Jameson
a7d85f0967 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix expanded mentions spacing
2021-08-18 20:58:50 +03:00
Henry Jameson
93288d9e89 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  hopefully final fix for spacings
2021-08-18 20:54:39 +03:00
Henry Jameson
5fa4a16352 Merge branch 'proper-attachments' into shigusegubu
* proper-attachments:
  play gifs when hovering over notification
  add attachment counter
  better media modal loading
2021-08-16 01:36:17 +03:00
Henry Jameson
e2ecc1a4f8 add attachment counter 2021-08-16 01:11:16 +03:00
Henry Jameson
0cb3826e86 better media modal loading 2021-08-16 01:02:56 +03:00
Henry Jameson
42dd1d8611 Merge branch 'proper-attachments' into shigusegubu
* proper-attachments:
  ability to move attachments around when making a new post
  inline description display
  add media description into media modal
  add key attribute to make image refresh in media modal to give feedback when images are still loaded
  fix "+X more" sticking
  fix video attachments in notifications not having pointer cursor
  replace poll with an icon in notifications
  fix long posts double-fading in notifications
  fix links sticking to mentionsline
  fix console errors
2021-08-15 21:06:07 +03:00
Henry Jameson
e75eef4ae2 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix tests
  prevent infinite update loops
  remove obsolete tests
  removed useless code, review change, fixed bug with tall statuses
  fixed mentions line again
2021-08-15 02:59:30 +03:00
Henry Jameson
3c4c33c8ee fixed mentions line again 2021-08-14 21:55:38 +03:00
Henry Jameson
de30e0bf1a Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  remove old emoji added, everything emoji-bearing uses RichContent now
  richcontent support in polls, user cards and user profiles
  support richcontent in polls
2021-08-13 13:13:46 +03:00
Henry Jameson
f96ffe3699 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix tests, add performance test (skipped, doesn't assert anything), tweak max mentions count
  made the code responsible for showing unwritten mentions actually work
  remove new options for style and separate line, now groups all chained mentions on a mentionsline regardless of placement. fixes spacing
2021-08-12 23:01:29 +03:00
Haelwenn
ff37dbbd23 Merge branch 'develop' into 'simplePolicy_reasons_for_instance_specific_policies'
# Conflicts:
#   src/i18n/nl.json
2021-07-23 03:47:39 +00:00
Henry Jameson
b345e06984 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix tests
2021-06-22 21:13:29 +03:00
Henry Jameson
b9ec78e454 Merge branch 'proper-attachments' into shigusegubu
* proper-attachments:
  lint
  fix description colliding with extra-long text
2021-06-22 20:47:59 +03:00
Henry Jameson
ed9091082a Merge branch 'proper-attachments' into shigusegubu
* proper-attachments:
  don't stretch columns when uploading media
  fix videos not stretching to container
  fix videos and related not having working drag controls
  fix z-indexes
2021-06-22 20:37:29 +03:00
Henry Jameson
5a94c410f0 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix non-notifying mentions and original mention display
2021-06-22 20:25:48 +03:00
Henry Jameson
a0330483cf Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix not escaping some stuff
  fix rich images
2021-06-18 21:43:12 +03:00
Henry Jameson
5b9f88e8b9 Merge branch 'proper-attachments' into shigusegubu
* proper-attachments:
  whoops
2021-06-18 17:39:37 +03:00
Henry Jameson
08ce9ba30b Merge branch 'proper-attachments' into shigusegubu
* proper-attachments:
  better attachments in uploading (grid layout)
  better handling of unknown files, better upload display
  better compact attachments
  merged in compact notifs and improved upon it
  gallery in post status form!
  gallery now supports flash, fixes for flash component. refactored media modal
  refactored attachments and gallery. All attachments now are in gallery.
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox
  compact notifs
2021-06-18 17:33:54 +03:00
Henry Jameson
55682ea93f Merge branch 'settings-and-filtering' into shigusegubu
* settings-and-filtering:
  Use proper setting name
  Use cleaner instance config check for shoutbox setting
  Make locale language cleaner
  Don't shorten shoutbox to SB
  Fix lint error
  Update CHANGELOG.md
  New option: Hide shoutbox
2021-06-16 14:32:23 +03:00
Henry Jameson
6fb9e22561 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix chats again
2021-06-16 12:44:20 +03:00
Henry Jameson
779c753f99 debug t.map not a function 2021-06-16 12:34:24 +03:00
Henry Jameson
932e9747b2 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  added tests just in case
2021-06-16 02:12:41 +03:00
Henry Jameson
ddce5e15f2 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  added tests just in case
  fixed "invisible" spans inside links
2021-06-16 01:44:50 +03:00
Henry Jameson
1427df3442 added tests just in case 2021-06-16 01:44:29 +03:00
Henry Jameson
3cace0fe09 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fixed bug with hashtags
2021-06-15 14:50:15 +03:00
Henry Jameson
7ab5a1c8f8 Merge branch 'fix-themes-select' into shigusegubu
* fix-themes-select:
  Fixed mergedConfig misbehaving on first boot
  lint
2021-06-14 10:58:50 +03:00
Henry Jameson
d7700ba944 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  lint
  do the impossible, fix the unfixable
2021-06-14 10:35:35 +03:00
Henry Jameson
3cb7123897 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  more fixes
  fix mentions in chats
  fix chats messages
2021-06-13 22:23:20 +03:00
Henry Jameson
1696810b07 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  refactored line converter, untied its logic from greentexting, better handling of broken cases
  Apply 1 suggestion(s) to 1 file(s)
2021-06-13 15:24:38 +03:00
Henry Jameson
01a249e3c7 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  refactored line converter, untied its logic from greentexting, better handling of broken cases
2021-06-13 13:30:17 +03:00
Henry Jameson
8c2a6af36a refactored line converter, untied its logic from greentexting, better
handling of broken cases
2021-06-13 13:30:05 +03:00
Henry Jameson
b5217e992d Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fixed a bug + made a testcase out of it
2021-06-12 21:50:29 +03:00
Henry Jameson
cabb595ead Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix next relply-row bleeding through popover
2021-06-12 20:52:09 +03:00
Henry Jameson
fb3f7649df Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  lint
  review + fixes
2021-06-12 20:44:58 +03:00
Henry Jameson
95bc2532df Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  cleanup
  restructure and tests
  fix tags gluing
  fix color of reply row, fix overflow in status-popover
  fix long post fader
  change how "first" line is determined. Allow one mention in the beginning for hellthread style
  cleanup
2021-06-12 19:56:44 +03:00
Henry Jameson
3fbf6fc5ac Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  lint & cleanup
  fix #935
  fixed console errors, improved user-selecting, added cyantexting
  fix infinite loop
  better handling of hellthreads with mentions at bottom
  stylistic changes
  Hellthread(tm) Certified
  don't hide mentions for OPs
  mentions on same line as replies
  use icon instead of symbol for @ in mentions links
  stylistic improvements for single-line mentions
  proper cachin of headTailLinks, show mentions in notificaitons always
  moved mentions onto reply line, replies moved below post body
  Moved greentext to RichContent, improved how first mentions are restored, now shows mentions not uh, mention in post body
2021-06-11 12:20:10 +03:00
Henry Jameson
109a90ba49 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix long posts having weird gradient
  lint
2021-06-08 19:37:36 +03:00
Henry Jameson
49439af879 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix repeats having wrong mentions
  fix console errors
2021-06-08 17:17:12 +03:00
Henry Jameson
d2f9a4a1e6 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  fix repeats having wrong mentions
  fix console errors
2021-06-08 17:05:39 +03:00
Henry Jameson
b4814d900c fix repeats having wrong mentions 2021-06-08 17:05:20 +03:00
Henry Jameson
e2b24a9894 fix console errors 2021-06-08 17:05:16 +03:00
Henry Jameson
7ca3e22b5f proper position 2021-06-08 16:42:02 +03:00
Henry Jameson
5e88e2a9a4 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  missing localization
2021-06-08 16:37:46 +03:00
Henry Jameson
59d8a3bd92 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  change defaults
  bump limit to a saner one
  moved mentions into a separate component - MentionLine, added collapsing of mentions when there's too many of 'em
  fix empty spaces again
  configurable mentions placement
  moving mentions into separate row
  moved transparent button styles into button itself
2021-06-08 16:34:12 +03:00
Henry Jameson
637a7c1e9f Merge branch 'settings-and-filtering' into shigusegubu
* settings-and-filtering:
  Rearranged settings, moved more stuff to filtering where apllicable. Changed how filering works.
2021-06-08 16:33:50 +03:00
Henry Jameson
421c7fe0a8 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  tweaking the spacings
2021-06-08 01:25:22 +03:00
Henry Jameson
71068fae7e Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  remove weird vertical align
2021-06-08 01:22:15 +03:00
Henry Jameson
5081133d9d Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  faint @
2021-06-08 00:06:45 +03:00
Henry Jameson
e9117fe1f0 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  better modifier, no background for unhighlighted mentions
2021-06-08 00:04:51 +03:00
Henry Jameson
1c3f0dc0d0 Merge branch 'fix-themes-select' into shigusegubu
* fix-themes-select:
  fix theme selection not working
2021-06-07 23:55:27 +03:00
Henry Jameson
4e528fc143 Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  smaller mentions
  new mentions look
  fix tall emojis being cropped
2021-06-07 23:55:23 +03:00
Henry Jameson
d6821c003e Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  localization
2021-06-07 20:26:17 +03:00
Henry Jameson
6071301b0c Merge branch 'better-still-emoji' into shigusegubu
* better-still-emoji:
  moved some post styles into status body since they inferfere with usernames
  fixed some strange error
  lint
  renamed StatusText to StatusBody for clarity, fixed chats
  new component - StatusText, to separate post's text from its attachments
  some docs, added richcontent to usernames in status, updated stillImage to allow scale of "gif" label
  lint, fix warnings
  made getAttrs correctly handle both ' and "
  mention link
  more tests
  move styles to richcontent
  fix emoji processor not leaving string as-is if no emoji are found
  lint
  fix escaped apostrophes
  [WIP] MUCH better approach to replacing emojis with still versions
2021-06-07 20:04:52 +03:00
Henry Jameson
9f24faaa94 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Remove unused shoutbox channel state from side drawer
  This setting didn't actually do anything
  Use old value to discover if Shoutbox is available until we ship a new release that's declaring the feature as "shout"
  Keep channel name the same for backwards compatibility
  Rename legacy PleromaFE Chat functionality to "Shout"
2021-06-04 12:13:22 +03:00
Henry Jameson
9e46b13169 Merge branch 'fix-favico-badge-chrome' into shigusegubu
* fix-favico-badge-chrome:
  handle multiple favicons (different sizes)
2021-06-02 12:49:30 +03:00
Henry Jameson
71ad7e467e Merge branch 'fix-settings-anon' into shigusegubu
* fix-settings-anon:
  better approach
  fix BooleanSetting and ChoiceSetting not working properly on initial launch as anon visitor (would show all as changed, empty selects)
2021-06-02 12:22:35 +03:00
Henry Jameson
e3ff47f901 Merge branch 'fix-favico-badge-chrome' into shigusegubu
* fix-favico-badge-chrome:
  fix favico badge not working on chrome
2021-06-02 12:16:02 +03:00
Henry Jameson
0d75ee35f3 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (83 commits)
  fix warnings
  fix warnings
  oops
  remove "leak ur cookiz"
  Implement right sidebar option as user option
  Translated using Weblate (German)
  Translated using Weblate (Italian)
  Translated using Weblate (German)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (Korean)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (Spanish)
  Translated using Weblate (Dutch)
  Translated using Weblate (Dutch)
  Translated using Weblate (German)
  ...
2021-06-01 11:30:43 +03:00
Henry Jameson
dda7631679 Merge branch 'flash-support' into shigusegubu
* flash-support:
  better label, better error handling
2021-04-13 00:10:38 +03:00
Henry Jameson
21719c4f2d Merge branch 'flash-support' into shigusegubu
* flash-support:
  do not load ruffle multiple times!
  translate a variable name to American English from Australian English
  linting
  whooops dropped my monstercondo
2021-04-12 01:16:44 +03:00
Henry Jameson
dbc1e11834 whooops dropped my monstercondo 2021-04-12 00:02:46 +03:00
Henry Jameson
defb81b250 Merge branch 'flash-support' into shigusegubu
* flash-support:
  Play-on-click, layout improvements.
  No longer need to put ruffle stuff in source tree. Made ruffle not use polyfills also.
  experimental flash support through ruffle
2021-04-12 00:01:07 +03:00
Henry Jameson
3e6a454498 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (60 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Russian)
  Translated using Weblate (Italian)
  Translated using Weblate (French)
  Translated using Weblate (Russian)
  Translated using Weblate (Italian)
  Translated using Weblate (French)
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Japanese)
  Translated using Weblate (Italian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Norwegian Bokmål)
  ...
2021-04-05 02:50:15 +03:00
Ilja
ab620e2cff Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into simplePolicy_reasons_for_instance_specific_policies 2021-03-20 08:56:21 +01:00
Henry Jameson
a2d1fb977c Merge branch 'settings-import-export' into shigusegubu
* settings-import-export:
  fix some css problems + tiny bit cleaning up
2021-03-11 15:15:07 +02:00
Henry Jameson
fc73ed68da Merge branch 'settings-import-export' into shigusegubu
* settings-import-export:
  cleanup + fix
  extra protection to not write what we don't know
  lint
  better error/warnings
  implemented import/export for themes
  changed importexport into a service instead of component for simplicity
  fixed another problem with p's broken theme causing theme editor to become unusable
  Cleaned up panel-footer. No longer uses header styles since those look and work ugly.
2021-03-09 02:39:52 +02:00
Henry Jameson
fc13715ca4 Merge branch 'websocket-fixes' into shigusegubu
* websocket-fixes:
  streamlined WS flow, reduced spam amount related to WS reconnections
  WIP some work on making errors less spammy
2021-03-09 02:39:46 +02:00
Henry Jameson
7b856a4b4c Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (42 commits)
  Apply 1 suggestion(s) to 1 file(s)
  Make it possible to localize user highlight options
  remove shoutbox test hacks
  fix shoutbox header, use custom scroll-to-bottom system, remove vue-chat-scroll, temporarily add chat test hack
  update changelog with 2.3.0
  change icons around
  Translated using Weblate (Japanese)
  Update timeline_quick_settings.js
  add screen_name_ui to tests
  separate screen_name and screen_name_ui with decoded punycode
  Update CHANGELOG.md
  add basic validation for statusless status notifications
  changelog mention
  fix chat unread badge
  update shelljs to get rid of warnings on build
  save a few characters
  focus input in emoji picker and react picker
  fix vue warnings
  add only to wording
  basic loggedin check for reply filtering
  ...
2021-03-09 02:39:40 +02:00
Henry Jameson
94e93935bd Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (77 commits)
  Add myself to .mailmap
  Translated using Weblate (Japanese)
  Translated using Weblate (Italian)
  Translated using Weblate (Russian)
  User card: use general.role instead of card-specific roles
  Translated using Weblate (Italian)
  Translated using Weblate (Korean)
  Translated using Weblate (Japanese)
  Translated using Weblate (Japanese)
  Translated using Weblate (Japanese)
  Translated using Weblate (Japanese)
  Translated using Weblate (Spanish)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (French)
  Translated using Weblate (Norwegian Bokmål)
  Ensure poll.voters_count doesn't fallback to poll.votes when it's 0
  Make bot label localizable
  ...
2021-02-20 20:47:50 +02:00
Henry Jameson
2df4683dc5 Merge remote-tracking branch 'origin/websocket-fixes' into shigusegubu
* origin/websocket-fixes:
  fixed few-posts TLs when streaming is enabled
  fix not being able to re-enable sockets until page refresh
  added notices for ws events
  add success global notice style/level
  fix local dev websockets
2021-01-14 01:14:23 +02:00
Henry Jameson
e0105aa115 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (36 commits)
  Translated using Weblate (Italian)
  fix changing reported status on same user
  Add report button to status ellipsis menu
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Polish)
  Translated using Weblate (Russian)
  Translated using Weblate (Russian)
  Translated using Weblate (Russian)
  Translated using Weblate (Spanish)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Italian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Italian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Russian)
  ...
2021-01-14 01:14:16 +02:00
Henry Jameson
966ea715b0 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Added Traditional Chinese to language swithcer
  Newer chromedriver works on MacOS aarch64
  make with-load-more not use computeds when they don't work for it
  update changelog with latest release
  simplified code, review
  change your log
  theme ui
  Basic no-wallpaper support
2021-01-01 20:25:30 +02:00
Henry Jameson
0710b6cb11 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  fix remote follow button style
  Disable horizontal textarea resize
  Add uk.json in messages.js
  Display upload limit on the Features panel
  use title html for poll options before vote
  fix recent mistakes in react button
  update changelog
  move external source button to extra buttons, make expand button easier to click and highlight on hover
  make click blocking actually work
  block clicks in blank area of timeline menu, fix 'up-to-date' align
  remove vertical align, update changelog
  fix the close button on global notices
  refactor error handling in profile tab
2020-12-17 11:35:56 +02:00
Ilja
8fa8d17a83 Code review fixes
* The v-for for the reasons now have an actual unique key so it doesn't throw errors any more
* Some small touch ups on the css. Most importantly the "vertical-align: text-top;"
2020-12-13 15:50:17 +01:00
Henry Jameson
26ca3fb5d5 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (119 commits)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Russian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Russian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Ukrainian)
  ...
2020-12-06 12:45:58 +02:00
Ilja
dddfadacd1 Improve transaltion
* I chose a better label for the N/A
* I added Dutch translations, I don't feel comfortable enough for other languages
2020-11-28 14:08:41 +01:00
Ilja
a5fac743f2 Add css
* I added an .scss file and moved the css from the vue file to there
* I added new css obviously
* the tables have a smal padding left
* the first column is 180px wide
  * This should be more than enough for an instance with 26 characters in it's name, which is already starting to get rare when I check my DB
2020-11-28 13:53:49 +01:00
Ilja
6cf98da91e Fix for code review
* js object keys aren't quoted any more
* when no reason is given, it will be shown in the FE (and is localised)
* the js function I wrote
  * is now of the form `const name = (e) => {}` instead of `function name(e) {}`
  * doesn't use an extra `else` nesting any more
2020-11-28 11:59:40 +01:00
Ilja
c3ddd0c832 Make reasons show
* If BE nodeinfo sends a mrf_simple_info and/or quarantined_instances_info, we'll try to get the reason for each instance for each policy and show it in the about page
2020-11-22 12:05:10 +01:00
Henry Jameson
d8ac75f58a Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  changelong
  Fix pinned statuses and perhaps some other stuff
  update changelog
  Remove title from index.html, title is now from server generated meta
  changelog mention
  fix emoji not working in profile field names
  change method of fix to rounding
  changelog
  prevent call to scroll if the value doesn't change because firefox is stupid
  Update CHANGELOG.md
  wrap react button icon to a span to fix popover overflow
  Update CHANGELOG.md to match master
  change favicon dimensions for high res, add handling when favicon isn't available
  remove the favicon changes
  make badge just a ball, make it use theming
  add favicon badge for unread notifs
2020-11-17 20:44:06 +02:00
Henry Jameson
893741c363 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Fix the chat scroll behavior for vertical screens.
  fix mobile badge alignment
  change approach to disable all, enable some
  fix mobile navbar hitboxes
  Instead of blocking all interaction, only block interaction in places that matter
  added comment
  fix chat heading not being aligned and using wrong styles
  fix chat badge and unify styles across all badges including follow request count.
  change logo to svg
  Update CHANGELOG.md
  update changelog for optimistic chat posting
  fix test
  move from using timestamps to ids when tracking last seen in chats
  Apply 1 suggestion(s) to 1 file(s)
  Optimistic message sending for chat
2020-11-08 14:56:51 +02:00
Henry Jameson
0733d17cd5 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  document thie this. check
  Apply 1 suggestion(s) to 1 file(s)
  change input blocking to use css
  update changelog
  update changelog
  block clicks for a second when timeline moves
  fix back button size, fix missing chat notifications being marked as read too eagerly, fix promiseinterval erroring when not getting a promise
2020-11-01 19:58:15 +02:00
Henry Jameson
5ab02e1668 Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes:
  fix build warnings
  lint
  remove 'md' size that doesn't exist
2020-11-01 16:47:43 +02:00
Henry Jameson
a5631bbf2d Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes:
  fix #992
2020-11-01 16:40:53 +02:00
Henry Jameson
4b3e9b4d77 Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes:
  fix chat count
2020-10-31 14:00:18 +02:00
Henry Jameson
dcc01511a8 Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes:
  fix play-on-hover gifs issues
  fix preview spinner
  Refactor desktop navbar into a component, change layout to grid for better compatibility with search field and simpler CSS
2020-10-29 22:55:14 +02:00
Henry Jameson
41d08653b5 Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes:
  fix play-on-hover gifs issues
  fix preview spinner
  Refactor desktop navbar into a component, change layout to grid for better compatibility with search field and simpler CSS
2020-10-29 22:22:07 +02:00
Henry Jameson
e03d624e22 fix play-on-hover gifs issues 2020-10-29 22:15:02 +02:00
Henry Jameson
71130599ab fix preview spinner 2020-10-29 22:15:02 +02:00
Henry Jameson
84ad944734 Refactor desktop navbar into a component, change layout to grid for
better compatibility with search field and simpler CSS
2020-10-29 22:15:02 +02:00
Henry Jameson
2470a85f03 Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes:
  fix play-on-hover gifs issues
  fix preview spinner
  Refactor desktop navbar into a component, change layout to grid for better compatibility with search field and simpler CSS
2020-10-29 21:45:00 +02:00
Henry Jameson
e51da88112 fix play-on-hover gifs issues 2020-10-29 21:44:44 +02:00
Henry Jameson
50192f2b1b fix preview spinner 2020-10-29 21:44:44 +02:00
Henry Jameson
018c2db186 Refactor desktop navbar into a component, change layout to grid for
better compatibility with search field and simpler CSS
2020-10-29 21:44:44 +02:00
Henry Jameson
46fda5338c Merge branch 'various-css-fixes' into shigusegubu
* various-css-fixes:
  fix play-on-hover gifs issues
  fix preview spinner
  Refactor desktop navbar into a component, change layout to grid for better compatibility with search field and simpler CSS
  fix lain's issue in reaction picker
  Update and fix avatar shadow in user card
2020-10-29 21:40:37 +02:00
Henry Jameson
e3319608aa fix play-on-hover gifs issues 2020-10-29 21:40:02 +02:00
Henry Jameson
cfdf79bee0 fix preview spinner 2020-10-29 21:40:02 +02:00
Henry Jameson
c6eb301b1d Refactor desktop navbar into a component, change layout to grid for
better compatibility with search field and simpler CSS
2020-10-29 21:13:31 +02:00
Henry Jameson
b583b3d291 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (38 commits)
  >boxes
  better icon for picker
  fix settings tabs on mobile, update follow request badge
  update & unify the navbars heights
  improved side-drawer alignments
  improved the semantics for our icon scale, fixed preview, fixed navbar desktop
  Translated using Weblate (Chinese (Simplified))
  make subjectline input use size=1 for compatibility with CJK fonts
  fontello aftermath
  bye bye fontello
  lint
  rotate the shackle of the lock for better accessibility
  come on and slam
  fix attachment remove pointer
  remaining changes...
  more replacements + small renames
  More stuff. Buttons in user card's corner now have MUCH bigger hitboxes
  cancel -> times
  chevrons-downs, settings
  more FA5 stuff with small related refactoring
  ...
2020-10-28 23:27:43 +02:00
Ilja
56d85654b1 Make it work with English translations 2020-10-25 10:50:41 +01:00
Ilja
8f966a7122 Make minter happy 2020-10-24 22:05:08 +02:00
Ilja
916f61014f Add backwards compat as poc for quarantined instances 2020-10-24 21:34:33 +02:00
Ilja
8ef93aedda First poc for quarantined instances
* I made a table instead of a list
* I'm pretty sure I need to extract the css to somewhere else, but unsure where atm
* All the other lists also need to be done in the same way obviously
* I'm not sure yet what would happen when it gets strings instead of tuples (the way old be's will give) but I'm pretty sure it will give some sort of error and wont display properly
  * Does it need backwards compatibility for older BE's?
2020-10-23 15:37:32 +02:00
Henry Jameson
98bba032ee Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (50 commits)
  fix/leftover-emoji-checkboxes-in-settings
  Apply 1 suggestion(s) to 1 file(s)
  Translated using Weblate (Spanish)
  Translated using Weblate (Persian)
  Translated using Weblate (Persian)
  Translated using Weblate (Polish)
  update changelog
  Stop click propagation when unhiding nsfw
  Fix Follow Requests title style
  Translated using Weblate (Persian)
  Translated using Weblate (Persian)
  Translated using Weblate (French)
  Added translation using Weblate (Persian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Italian)
  Translated using Weblate (English)
  Translated using Weblate (English)
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  ...
2020-10-11 21:10:14 +03:00
Henry Jameson
ce7f3e7a27 Merge branch 'feat/custom-virtual-scrolling' into shigusegubu
* feat/custom-virtual-scrolling:
  invert hasAudio logic
  re-add the option, comment confusing part of setAudio
  fix red line in conversations
  Apply 1 suggestion(s) to 1 file(s)
  dont fail when opening a conversation link
  remove comments, update changelog
  experiment with storing heights in vuex
  fix build errors
  fix expanded threads disappearing
  cap virtual scroll index before use
  fix lint
  make hiding more efficient, make hiding not do its thing for reply forms or playing videos
  make playing videos stop the suspending
  remove mapgetters from status related components
  Perf test tools
  add missing css line
  remove extra reflow causing calls
2020-09-22 21:24:54 +03:00
Henry Jameson
8e76a1dc53 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (23 commits)
  change icon to a megaphone
  change side drawer to use shoutbox name
  update changelog
  Fix chat messages being missed when the streaming is disabled and the messages are sent by both participants simultaneously
  Fix the chat list order and last message timestamp updates
  change a eslint disable to nextline only
  fix vue warnings and errors
  Translated using Weblate (Basque)
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  Translated using Weblate (Spanish)
  Do not show desktop notifications for your own chat messages
  Add hacky functionality to open specific settings tabs
  Password reset no longer informs user of errors or account existence
  add changelog entry
  hide poll when subject collapsed, but show poll icon
  update changelog for autocomplete fixes
  update changelog with 2.1.0, fix Add -> Added in older releases
  Rewrite word split imperatively for control
  wip start
  ...
2020-09-17 23:24:03 +03:00
Shpuld Shpuldson
917ba17fe2 Merge branch 'develop' into feat/custom-virtual-scrolling 2020-09-16 10:19:38 +03:00
Shpuld Shpuldson
5a447cc2ad invert hasAudio logic 2020-09-04 15:31:22 +03:00
Shpuld Shpuldson
14e6c0354d re-add the option, comment confusing part of setAudio 2020-09-04 13:54:35 +03:00
Shpuld Shpuldson
5405d391c6 Merge branch 'feat/custom-virtual-scrolling' of git.pleroma.social:pleroma/pleroma-fe into feat/custom-virtual-scrolling 2020-09-04 12:09:33 +03:00
Shpuld Shpuldson
eef21e9c0f fix red line in conversations 2020-09-04 12:09:19 +03:00
Shpuld Shpludson
81f454b4f2 Apply 1 suggestion(s) to 1 file(s) 2020-09-04 06:12:58 +00:00
Shpuld Shpuldson
785d1e79a1 dont fail when opening a conversation link 2020-09-01 00:03:27 +03:00
Shpuld Shpuldson
f76c1518e5 remove comments, update changelog 2020-08-31 15:22:39 +03:00
Shpuld Shpuldson
acc3d6c0d2 Merge branch 'develop' into feat/custom-virtual-scrolling 2020-08-31 15:14:48 +03:00
Shpuld Shpuldson
936fe56818 update with develop 2020-08-26 10:38:24 +03:00
Henry Jameson
c1b0596d5c Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  fix tests by removing only and adding empty func for notification tests
  EntityNormalizer: Normalize thumbnail url.
  Translated using Weblate (Italian)
  show tag name in title for tag timelines
  fixed
  lint
  fix lain's bug
  fix reply popovers being too slim
  fixed some issues related to user avatar
  revert change to form resize logic
  Fix last line having slightly cut-off low-hanging parts of characters
  work around incorrect styles ordering in status popover
  fix issues with reply-link
  Fix muted notifications
  treat field name as text
2020-08-19 22:46:30 +03:00
Henry Jameson
90e92247c3 fix 2020-08-06 16:59:19 +03:00
Henry Jameson
668e10418d Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (29 commits)
  more broken reply improvements
  lint
  bring back red stripe
  remove unnecessary border-radius
  i am an idiot sandwich
  lint
  add stylelint to CI/npm, only one file for now.
  more fixes
  Let's serve the README image from GitLab
  fix oops
  fix non-timeline routes breaking current/previous timeline
  bump node to 10 for stylint
  neater way to do hover thing with still image
  refactor status
  separate status scss into another file
  Make the single line mode is consistent with status-content line height
  Ensures the minimized modal is always 50px above the mobile browser bottom bar regardless of whether or not it is visible.
  resume last lasttime instead of always friends/public
  Use bock-scroll-lock directive for the settings modal
  Add body 100% width for the preview, refactor the modalActivated watcher, use body scroll lock for the setting tab content
  ...
2020-08-06 16:54:56 +03:00
Henry Jameson
cf50da5830 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (69 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Polish)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  update poll to post status form on deleting option
  ChatPanel: Rename `chat` to `shoutbox`.
  update icon to hopefully look fine on both browsers
  Translated using Weblate (Polish)
  Translated using Weblate (Polish)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Esperanto)
  Translated using Weblate (Japanese)
  Translated using Weblate (Hebrew)
  Translated using Weblate (Irish)
  Translated using Weblate (French)
  Translated using Weblate (Basque)
  ...
2020-07-27 22:02:02 +03:00
Henry Jameson
38c4766e5f fix chrome69 2020-07-12 16:19:42 +03:00
Henry Jameson
13bab19494 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Apply suggestion to src/components/chat_list/chat_list.vue
  Add the single-line prop to StatusContent and use it for chat list items
  Remove direct style manipulations in favor of classes
  Undo the promise rejection on the json parser error in promisedRequest
  Add the empty chat list placeholder.
  Disable status preview in the chat posting form
  Address feedback
  Add Chats
2020-07-10 12:17:55 +03:00
Shpuld Shpuldson
68153f0ce9 experiment with storing heights in vuex 2020-07-10 11:21:02 +03:00
Henry Jameson
08bf5b9843 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  After Store: Correctly decode UTF-8 encoded base64 strings.
2020-07-09 20:56:43 +03:00
Henry Jameson
4e8499abad Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (38 commits)
  give notification timeago a min width
  streamline profile image api, update reset ui for all profile images to match avatar, remove unnecessary stuff
  corrected tos.html location
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Italian)
  Translated using Weblate (Finnish)
  Apply suggestion to src/components/staff_panel/staff_panel.js
  StaffPanel: Move staff loading to panel creation.
  Apply suggestion to src/boot/after_store.js
  fix preview opening automatically
  After Store: Correctly handle preloaded HTML
  remove console log
  fix issue on posting another status
  remove unnecessary code
  add more ways to set description
  fix edge case of videos and unknown files together
  fix modal types check being broken
  don't close preview on post, move visibility notices above the preview where they belong
  remove contenttype check from content type watcher
  ...
2020-07-08 20:03:52 +03:00
Shpuld Shpuldson
232e36cf43 fix build errors 2020-07-08 17:40:14 +03:00
Shpuld Shpuldson
96851e10ce update branch with develop 2020-07-08 16:19:18 +03:00
Henry Jameson
7d81d11338 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (41 commits)
  Apply suggestion to src/components/notifications/notifications.js
  fix height for emoji panel of settings modal
  Add bookmarks
  FE part of BE issue 1586 provide index md
  change alert popup alpha
  add follow request users to store
  make the addNotice dispatch return the notice
  change storage error one-off into a global notice system
  remove accidental log
  revert accidental change in instance.js
  update the message and changelog
  catch localforage error and let the application work, add an alert for user to dismiss
  document the 'mark-as-read-detection' system
  allow overscrolling enough to not have FAB block interactables
  add initial fetching back in a more streamlined way
  remove unnecessary fetchAndUpdate, change notifications fetcher to not double fetch
  change Show New text to Reload when flushing
  Make use of backend reply filtering
  update changelog for reply-to strikethrough
  add no-statusId support for status popover
  ...
2020-07-05 15:46:34 +03:00
Henry Jameson
cb0fa60756 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop:
  Changelog: Add info about push notifications.
  ServiceWorker: Use clearer variable names
  fix huge emoji in usernames
  Service Worker: Extract messages to own module.
  Linting + docs
  ServiceWorker: Use loader to only notification messages.
  NotificationUtils: Add tag to notifications.
  ServiceWorker: Don't show message via sw if a client is active.
  ServiceWorker: Grab the notification and display it with i18n.
  NotificationUtils: Extract preparation of notification object.
2020-06-19 16:50:44 +03:00
Henry Jameson
eb10e7edf6 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (40 commits)
  Poll, StatusContent: Move emoji css to status body.
  remove recentqueries thing
  fix width of long field value
  change key-value to look like one
  revert import style
  return the correct promise type from action
  update changelog
  remove search blocker, fix debounce params
  resume the previous emoji size for now
  restyle the fields
  Update popover.js
  update changelog
  disable subject field when posting
  remove log whoops
  fix popovers cutting off in notifications, port popover changes from chats mr
  Changelog: Add info about poll option emoji.
  changelog
  Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
  Polls: Construct an html field during normalization.
  fix #866
  ...
2020-06-19 15:50:43 +03:00
Henry Jameson
aeae52ed24 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (30 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Russian)
  add fade-in fade-out
  remove useless captures
  update changelog
  changelog
  attempt to fix that one bug with submitting on copy-pasting
  add better visual indication for dropping files, make dropzone bigger
  Messages: DRY things up a bit.
  Apply suggestion to CHANGELOG.md
  Update changelog.
  Linting.
  MediaUpload: Correctly handle multiple uploads.
  Messages: Load languages asynchronously.
  MediaUpload: Allow drag-and-drop of multiple files at once
  Autocomplete domain mutes from list of known instances
  indent 2
  Fix the cropped button shadow in 2FA settings
  Translated using Weblate (Italian)
  Translated using Weblate (Estonian)
  ...
2020-06-11 11:23:25 +03:00
Shpuld Shpuldson
a72a155098 update develop 2020-06-10 18:36:12 +03:00
Henry Jameson
ba07b01cda Merge branch 'settings-modal' into shigusegubu
* settings-modal: (23 commits)
  move helpers out of tabs directory
  changelog
  alignment fixes
  Update CHANGELOG.md
  StillImage: Make it work properly in both firefox and chrome.
  ReactButton: Change the combined emoji (heart) to a simple one.
  Linting fixes.
  Settings: Keep a local version of the mutedWordsString
  MediaModal: Close on browser navigation events.
  StatusContent: Try to get hashtag from dataset first.
  Docs: Change wrong documentation.
  EntityNormalizerSpec: More fixes.
  EntityNormalizerSpec: Test new behavior.
  EntityNormalizer: Add colons to emoji alt text.
  fixed case in class name
  The sidebarRight option wasn't being read
  Use consistent naming for Pleroma-FE in README
  Remove mention of GNU Social
  lint
  multiple fixes
  ...
2020-06-07 07:47:53 +03:00
Shpuld Shpuldson
b7275f3985 fix merge problems 2020-06-03 19:34:25 +03:00
Henry Jameson
63ba4b8f4f Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  track if settings modal has been opened once
2020-06-02 01:11:36 +03:00
Henry Jameson
0b288bf96f Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  fixed tab not hiding
2020-05-29 13:39:42 +03:00
Henry Jameson
0d44cf01b4 Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  fixed the remaining issues
2020-05-29 13:18:19 +03:00
Henry Jameson
fed9ddd397 fixed the remaining issues 2020-05-28 21:26:33 +03:00
Henry Jameson
db2d3d9c8c Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  fixes. sorry for bad commit message i'm tired
  lint
  Move modal frame parts away from modal-content into modal, improve error handling
  moved multiChoiceProperties where it fits better
2020-05-27 12:39:13 +03:00
Henry Jameson
2dc01c6549 Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  oops
2020-05-25 19:57:42 +03:00
Henry Jameson
64e4fdaeaa Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  fix for a previous fix
  improve big spinner visibility
  Change flex for tab switcher lines to always have some small space reserved
  increase gap between buttons in titlebars
  fix icon changing color
  fix sidebar not closing in mobile
  lint
  lint
2020-05-25 17:24:42 +03:00
Henry Jameson
721fde9f3f Merge branch 'settings-modal' into shigusegubu
* settings-modal:
  remove timeout, was meant for testing
  fix tests. user-profile didn't have tab-switcher compnent imported!!
  fix cursor on desktop, add modal link on mobile
  Improve settings-modal async loading, update vue to 2.6.11 to be able to use Vue.observable, to implmement resettable async component
  icons update
  scroll to top when switching tabs
  added "settings saved" notice back
  eslint --fix + small fix
  cleanup
  split modal's content into another component, add lazy loading
  misc fixes
  Multiple fixes for CSS, added proper auth checking
  moved stuff from settings, cleaned up naming for tabs, added close and peek
  initial work on settings modal
2020-05-25 16:38:06 +03:00
Henry Jameson
071b3c13e6 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (95 commits)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Russian)
  Translated using Weblate (Polish)
  Translated using Weblate (Dutch)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  Translated using Weblate (German)
  ...
2020-05-23 02:27:43 +03:00
Henry Jameson
b5afffdac4 Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (28 commits)
  Update CHANGELOG.md
  don't dismiss a rejected follow request on server
  mark single notifs as seen properly on server
  follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
  Add support for follow request notifications
  Update CHANGELOG.md
  Update CHANGELOG.md
  Prioritize custom emoji a lot and boost exact matches to the top
  Allow emoji suggestions based on a match anywhere in the emoji name, but improve sorting
  Refactor status showing/hiding code for better handling of edge cases and easier comprehension
  Fix user names with the RTL char in notifications
  Fix pagination
  Update CHANGELOG.md
  don't dismiss a rejected follow request on server
  mark single notifs as seen properly on server
  follow request bugfixes, wrong text, notifs not being marked as read, approving from follow request view
  Update CHANGELOG.md
  remove with_move param
  Add support for follow request notifications
  Update CHANGELOG.md
  ...
2020-05-02 19:53:41 +03:00
Shpuld Shpuldson
291c15581a fix expanded threads disappearing 2020-04-24 11:25:20 +03:00
Henry Jameson
3527c14625 fix list after conflict 2020-03-25 18:38:06 +02:00
Henry Jameson
f881d6d2b5 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Prevent overflow for long usernames/domains
  fix tests
  fix last issue
  prioritize disabled opacity over transparent keyword
  fix several issues related to opacity
  mention status preview fix in changelog
  fix trasparency problems in some cases (purple headers)
  add status unavailable message when status can't be loaded in status preview
  Fix captcha input and disable ALL the helpers
2020-03-25 18:37:32 +02:00
Shpuld Shpuldson
1640841013 cap virtual scroll index before use 2020-03-18 14:23:37 +02:00
Shpuld Shpuldson
686a8e1cfc fix lint 2020-03-17 15:28:34 +02:00
Shpuld Shpuldson
5292832d6d update with develop 2020-03-17 14:45:05 +02:00
Shpuld Shpuldson
99e60f1821 make hiding more efficient, make hiding not do its thing for reply forms or playing videos 2020-03-17 14:43:33 +02:00
Shpuld Shpuldson
42e43511de make playing videos stop the suspending 2020-03-11 19:10:39 +02:00
Shpuld Shpuldson
ed4825da0b remove mapgetters from status related components 2020-03-02 08:13:27 +02:00
Henry Jameson
6595083003 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Update CHANGELOG.md
  Update CHANGELOG.md
  Apply suggestion to src/modules/instance.js
  Fix/popover performance
  make theme loading work with source-only presets
  remove bloat from themes
  update using variables
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  Apply suggestion to static/themes/pleroma-dark.json
  make panel header highlight less harsh
  update pleroma-dark and pleroma-light
  stop using customTheme in user card, instead use color slots. fix for opacity inheritance polluting inheritors
  Fix user activation/deactivation, deletion, and role assignment in the moderation menu
2020-02-29 15:35:46 +02:00
Shpuld Shpuldson
a1e136f4e3 Merge branch 'fix/popover-performance' into feat/custom-virtual-scrolling 2020-02-27 10:59:22 +02:00
Shpuld Shpuldson
45117d6151 Perf test tools 2020-02-27 10:57:05 +02:00
Shpuld Shpuldson
39a6b430d2 add missing css line 2020-02-25 18:57:08 +02:00
Henry Jameson
3d307def02 Merge remote-tracking branch 'upstream/fix/popover-performance' into shigusegubu
* upstream/fix/popover-performance:
  make use of menu themes
2020-02-21 00:12:36 +02:00
Shpuld Shpuldson
7e5620ea07 make use of menu themes 2020-02-20 21:02:40 +02:00
Henry Jameson
0d4abd244a Merge remote-tracking branch 'upstream/fix/popover-performance' into shigusegubu
* upstream/fix/popover-performance:
  make it easier to use status previews with hover
2020-02-20 19:36:42 +02:00
Shpuld Shpuldson
741c2b0d02 make it easier to use status previews with hover 2020-02-20 16:49:06 +02:00
Henry Jameson
c960bb6d55 Merge remote-tracking branch 'upstream/fix/popover-performance' into shigusegubu
* upstream/fix/popover-performance:
  fix offset Y bug
  clean up and fixes, change popover padding -> margin
  fix centering of certain dropdowns
  update changelog
  remove unused popover target from portal experiment
  fix mistakes
  remove popper references
  separate bounds x/y
  remove v-tooltip completely
  make more components use new popover, fix some things
  rewrite popover because v-tooltip is slow as heck
2020-02-19 14:44:34 +02:00
Henry Jameson
87e15c9cd2 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  fix changelog. kenomo didn't happen.
  EmojiInput tests should be checking the input value on the last input event, not the first
  Add onInput() function as listener for input events, remove unnecessary compositionupdate listener
  after_store: Fix failing to parse nodeinfo when mrf transparency is disabled
2020-02-19 14:41:40 +02:00
Shpuld Shpuldson
e7a793a966 fix conflict 2020-02-19 11:05:05 +02:00
Shpuld Shpuldson
238afc4c01 fix offset Y bug 2020-02-19 08:51:55 +02:00
Shpuld Shpuldson
16302b5630 clean up and fixes, change popover padding -> margin 2020-02-19 08:49:04 +02:00
Shpuld Shpuldson
813d121cdd fix centering of certain dropdowns 2020-02-18 11:47:34 +02:00
Henry Jameson
c6063a128e Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Refactor i18n messages for MRF policy disclosure
  Improve default ToS
2020-02-18 00:25:03 +02:00
Henry Jameson
c7ae982115 Merge branch 'themes-accent' into shigusegubu
* themes-accent:
  update headers in switcher to better separate the subsections
  paper theme, updated todo, lol
  improve the display of disabled buttons
  attempt to fix some bugs with shadows control
  fix #774
  revert emoji reaction style
2020-02-18 00:24:31 +02:00
Shpuld Shpuldson
abf8121638 remove extra reflow causing calls 2020-02-17 16:25:06 +02:00
Shpuld Shpuldson
db9471cd3e update with develop 2020-02-17 15:53:53 +02:00
Shpuld Shpuldson
0723c07571 update changelog 2020-02-17 12:03:29 +02:00
Shpuld Shpuldson
f007a795ac remove unused popover target from portal experiment 2020-02-17 11:48:14 +02:00
Shpuld Shpuldson
b19d51c3dc fix mistakes 2020-02-17 11:34:56 +02:00
Shpuld Shpuldson
3e971f0f25 remove popper references 2020-02-17 11:14:22 +02:00
Shpuld Shpuldson
10fc666a49 separate bounds x/y 2020-02-17 10:14:06 +02:00
Shpuld Shpuldson
7ac1a4a9fe remove v-tooltip completely 2020-02-16 09:58:05 +02:00
Shpuld Shpuldson
3c136c241f make more components use new popover, fix some things 2020-02-14 09:05:33 +02:00
Henry Jameson
0cabfe225b Merge branch 'themes-accent' into shigusegubu
* themes-accent:
  fix pressed button in top bar
2020-02-13 21:56:05 +02:00
Shpuld Shpuldson
94eeca3e7e Merge branch 'develop' into fix/popover-performance 2020-02-12 19:23:07 +02:00
Shpuld Shpuldson
5262676e0e rewrite popover because v-tooltip is slow as heck 2020-02-12 19:22:40 +02:00
Henry Jameson
fb2fd32517 Merge branch 'themes-accent' into shigusegubu
* themes-accent:
  dismiss warning when selecting other themes, fix collapsed attachments link color
  properly clear theme
  fixed transparent + semi-transparent inheritance case
  post-merge fix
  fix v2 breezy themes having messed up pressed buttons. updated v2.1 breezy themes to have derived colors instead of fixed ones.
  Emoji Reactions - fixes and improvements
  MRF Keyword Policy Disclosure
  Include non-gallery attachments and distinguish between images and videos
  Indicate whether collapsed statuses contain gallery media or link preview cards
  Add option text
  Add `with_move` param for fetching notification
  Change to hide User migrates tab when allow following move
  Add setting for allow_following_move
2020-02-12 01:29:57 +02:00
Henry Jameson
08c0694a5b fixed transparent + semi-transparent inheritance case 2020-02-11 18:21:03 +02:00
Henry Jameson
ba8cbd6ca7 Merge branch 'themes-accent' into shigusegubu
* themes-accent:
  don't use cache for theme data
2020-02-11 10:43:53 +02:00
Henry Jameson
25f785770c Merge branch 'themes-accent' into shigusegubu
* themes-accent: (83 commits)
  fix and update changelog
  fix/remove contrast ratios
  removed base16-related code
  fix warning stylings
  fixed eslint, made `mod` work properly depending on context including in shadows
  Better Disabled buttons support. Mammal theme fixes. Implemented proper context-aware `mod` argument - now checks lightness of "variant" color. needs retesting tho
  updated preview to account for underlay
  update button toggled state, apply it to emoji reactions
  removed one color TODO
  add theme to list
  Kenomo (see: #624) theme. Ability to define link color for post contents. Fixes
  fix rgba function, whoops
  lint
  fix rgba css generation, add some tests to automatically verify that themes are generated properly
  fix transparent color not affecting downstream slots
  fix icons in menus
  improved selectedMenu again
  popover/selected menu improvements
  separate actual theme data from theme framework
  revert fgText -> text after some consideration. case was fixed already in other way
  ...
2020-02-11 10:09:54 +02:00
Henry Jameson
b3500842aa Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Fix one click nsfw unhide on videos
  Escape HTML from display name and subject fields
2020-02-09 21:32:40 +02:00
Henry Jameson
913e513097 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  add emoji reactions to changelog
  fix emoji reaction classes broken in develop
  review changes
  Fix password and email update
  remove unnecessary anonymous function
  Apply suggestion to src/services/api/api.service.js
  remove logs/commented code
  remove favs count from react button
  remove mock data
  change emoji reactions to use new format
  clean up code, fix prediction bug
  usable-but-buggy: picker, adding/removing reaction on click, search, styles
  wip commit, add basic popover for emoji reaction select
  add fetching for emoji reactions, draft design
2020-01-28 20:44:32 +02:00
Henry Jameson
0f743af271 Merge remote-tracking branch 'upstream/feat/custom-virtual-scrolling' into shigusegubu
* upstream/feat/custom-virtual-scrolling:
  whoops
  fix data property being called the wrong name in conversation
  fix warnings and console errors
  fix minor bugs
  make virtual scrolling optional in case people want to be able to ctrl-f all page
  rename hidden stuff to virtualHidden, remove log
  add custom solution for virtual scrolling to ease ram and cpu use when scrolling for a long time
2020-01-27 23:39:41 +02:00
Henry Jameson
948fd2086b Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (21 commits)
  Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
  Fix missing TWKN when logged in, but server is set to private mode.
  Fix follower request fetching
  Add domain mutes to changelog
  Implement domain mutes v2
  change changelog to reflect actual release history of frontend
  Fix #750 , fix error messages and captcha resetting
  Optimize Notifications Rendering
  update CHANGELOG
  Use last seen notif instead of first unseen notif for sinceId
  Add AMOLED dark theme
  mfa fix
  unify showimmideately
  Some error handling
  wire up staff accounts with correct store data
  remove unused fallback
  Add user migrates filter to interactions
  change the expression of `move`
  Fix target account link
  Add view for moves notifications
  ...
2020-01-27 23:32:54 +02:00
Shpuld Shpuldson
f73e107a76 whoops 2020-01-15 19:21:11 +02:00
Shpuld Shpuldson
bbd964753e fix data property being called the wrong name in conversation 2020-01-15 18:47:14 +02:00
Shpuld Shpuldson
ac8df82bb7 fix warnings and console errors 2020-01-15 18:41:38 +02:00
Shpuld Shpuldson
2a9356209b fix minor bugs 2020-01-15 18:08:37 +02:00
Shpuld Shpuldson
c49b8e2089 make virtual scrolling optional in case people want to be able to ctrl-f all page 2020-01-15 17:01:18 +02:00
Shpuld Shpuldson
42f8fb2dca rename hidden stuff to virtualHidden, remove log 2020-01-15 16:37:08 +02:00
Shpuld Shpuldson
9eae4d07c1 add custom solution for virtual scrolling to ease ram and cpu use when scrolling for a long time 2020-01-15 15:17:05 +02:00
Henry Jameson
75bdeab0a0 Merge branch 'streaming' into shigusegubu
* streaming: (51 commits)
  toggle_activation api is also deprecated
  use vuex action
  refactor toggleActivationStatus
  replace setActivationStatus api with new one
  use flex for stickers
  i18n/update-ja_easy
  Use a centralized fallback for missing values and use instance.federating instead of instance.federation.enabled
  Add fallback in case BE does not report federating status in nodeinfo
  The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
  Logic should be to hide TWKN if not federating OR if instance is not public
  Finally trust eslint
  More lint
  More lint
  Lint
  mfa: removed unused code
  increase icon width a little bit in the nav panel
  add icons to nav panel
  Revert "Merge branch 'revert-96cab6d8' into 'develop'"
  Support "native" captcha
  Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
  ...
2019-12-26 13:21:53 +02:00
Henry Jameson
51e5487acc Merge branch 'streaming' into shigusegubu
* streaming:
  fix desktop notifications not working with streaming
2019-12-12 18:54:36 +02:00
Henry Jameson
2faf54bf8d Revert "debug"
This reverts commit e7e12b3c1e.
2019-12-12 18:54:31 +02:00
Henry Jameson
e7e12b3c1e debug 2019-12-12 18:49:02 +02:00
Henry Jameson
7390651b37 Merge branch 'streaming' into shigusegubu
* streaming:
  fix deletes causing errors
2019-12-12 18:00:21 +02:00
Henry Jameson
46fc537c22 Merge branch 'streaming' into shigusegubu
* streaming:
  Option to enable streaming
  better wrapper for websocket
  Updated streaming and improved error-handling, some more refactoring to api
  improved initial notifications fetching
  initial streaming work
  Backend Interactor service overhaul, removed the need for copypasting
2019-12-10 23:08:50 +02:00
Henry Jameson
b6b7bc5852 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (24 commits)
  Remove whitespace hack on empty post content
  Change output directory of fontello
  add html-webpack-plugin to karma config
  use another fork of fontello-webpack-plugin
  add animate-spin class
  remove needless code
  use another approach for versioning font files
  versioning the font resources through webpack
  fix "can't find property of undefined" errors in mrf transparency panel
  move mention button right next to mute button
  restore muted users collapsing logic on other user’s profiles
  [i18n] Improve easy/pedantic Japanese switching
  Normalize profile fields
  backend interactor service: implement startFetchingFollowRequest
  show badge visibility user setting checkbox only if needed
  Use kana+kanji as default for Japanese translation
  Remove outdated changelog file
  Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)
  use yarn, try to restart pipeline
  tests + updates
  ...
2019-12-10 23:08:45 +02:00
Henry Jameson
31aabd5fc7 Merge branch 'greentext-strikes-back' into shigusegubu
* greentext-strikes-back:
  eslint
  making dtluna proud or disgusted
  Made it optional
  Fix regex, tag detector condition
  adds greentext, also small fixes
  achieve the perfect speeeeen in media-upload
2019-11-14 15:19:13 +02:00
Henry Jameson
45a1d30bd6 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (29 commits)
  add hideISP to defaultState of config module
  add changelog entry
  mrf transparency panel: refactor to use vuex mapState
  mrf transparency panel: remove unneeded components{}
  boot: cleanup resolveStaffAccounts
  lint
  about: add MRF transparency panel
  about: add staff panel
  about page: fix hiding of instance-specific panel, flow ToS and ISP better
  nav panel: add link to about page
  redirect /remote-users/:username@:hostname -> /users/:id, /remote-users/:hostname/:username -> /users/:id
  clear filter on reopen, fix error message in console
  reset position when reopening emoji picker
  eslint fix
  fix not being able to see unicode emojis when there few of them when searching on emoji-a-ton instances
  replace sanity button with loading on scroll
  fix search not working, use computer property instead of state
  fix eslint warnings
  Lightbox/modal multi image improvements - #381
  '/api/pleroma/profile/mfa' -> '/api/pleroma/accounts/mfa'
  ...
2019-11-11 00:26:13 +02:00
Henry Jameson
4f72a995a2 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (27 commits)
  remove needless ref
  show preview popover when hover numbered replies
  refactor conditions
  do not make too many nested div
  add fetchStatus action
  refactor status loading logic
  split status preview popover into a separate component
  uninstall mobile-detect library
  listen both events
  minor css fix
  restrict distance at top side only
  set different trigger event in desktop and mobile by default
  fix eslint warnings
  fix popper go behind the top bar
  migrate Popper to v-popover
  fix popper go behind the top bar
  fix eslint warnings
  reset font-size to normal text size using rem
  use top placement by default
  hide status preview popper when hover popper content
  ...
2019-10-29 09:22:14 +02:00
Henry Jameson
1b349bca01 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  fix loadEmojiInsane button submitting the form
  fix scrolling to attachments bottom
2019-10-27 19:28:54 +02:00
Henry Jameson
6a5d57d2fe Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (32 commits)
  set flex-shrink and flex-basis explicitly
  set flex amount correctly
  update flex-grow calculation logic
  keep image natural ratio in gallery row
  populate gallery row height without getting width
  refactor using Set
  clean up
  update event name
  update condition
  move modal animation keyframes definition
  migrate viewClass prop to class attribute
  fix eslint errors
  fix message input not auto-focusing bug
  revert changes to render modal into portal
  use higher css specificity
  fix eslint warnings
  remove needless ref definition
  render modals into the “modal” portal
  remove needless console.log
  remove needless importing
  ...
2019-10-27 19:28:50 +02:00
Henry Jameson
75734bb057 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  Reserve space for emoji picker button in emoji input
2019-10-15 09:28:01 +03:00
Henry Jameson
9e0c14bb33 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  fix orders of a buttons
  revert lint autofix
  fix position account actions
  removed unused code
  update css
  remove unused code
  change icon
  fix follow request on search page
  updated user_card
  Revert "added acccount_actions component"
  [i18n] spanish new strings translations
  added acccount_actions component
  revert font
  use `repeats` intead `boosts`
  fontello/ added `eye` icon
  added support hide\show reblogs from a specific user
2019-10-15 09:27:54 +03:00
Henry Jameson
d839e16222 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  fix picker not filling on opening, removed console log
2019-10-10 20:01:37 +03:00
Henry Jameson
71041e7c27 Merge branch 'settings-refactor' into shigusegubu
* settings-refactor:
  another missed thing
2019-10-09 22:51:18 +03:00
Henry Jameson
203f12d521 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  moved emoji fetching from user to instance since it's its state anyway
  always preload first batch of emoji to avoid unnecessary UI jumps
2019-10-09 22:51:02 +03:00
Henry Jameson
b64d7ec9c5 Merge branch 'settings-refactor' into shigusegubu
* settings-refactor:
  fix! i noticed it!!
2019-10-09 00:01:49 +03:00
Henry Jameson
d6a7f46480 Merge branch 'emoji-optimizations' into shigusegubu
* emoji-optimizations:
  eslint
  fixed emoji picker showing up beyond viewport
  start loading emoji when picker is open
  remove the "textbox grows the 'wrong' way" behavior, replace it with more conditions to scroll to bottom
  arbitrary limit with option to overcome it
  emoji picker gradual render
  moved emoji stuff away from after-store and into users module since we only need emoji after login
2019-10-08 21:41:45 +03:00
Henry Jameson
4f34d2b168 forgot this one 2019-10-07 20:49:35 +03:00
Henry Jameson
0e16dd1bcc sgsgb commit url 2019-10-07 20:46:31 +03:00
Henry Jameson
8e1fa16925 Merge branch 'settings-refactor' into shigusegubu
* settings-refactor:
  removed unused thing
  Replaced most trivial checkboxes with Checkbox component
  replace checkboxes in user-settings with Checkbox component
  Fix tests, more replacing with mergedConfig
  fixed default values for multi-choice configurations, should also fix warnings
  Removed all whole mess of manual watch/data declaration, now fully automatic
  created mergedConfig getter to avoid obnoxious checks for undefined everywhere
2019-10-07 20:45:35 +03:00
Henry Jameson
26e8d5ac3b Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Move the epigraph after the heading so MkDocs can pick up the heading
  Add links to directions in the beginning of CONFIGURATION.md
  CI: trigger doc rebuild on commits to develop
  update admin url
  update copy
  add trailing slash to admin url
  open in a new tab
  add admin link to the side drawer
  add admin link to nav
  add gauge icon
  fix regex shortcode problem
  i18n/Update Pedantic Japanese Messages
  i18n/Update Japanese Messages
  reset post status form only when reply user is changed
  Small refactoring in who to follow page
  Feature/Add _Allow user discovery services_ preference
  Added a setting to hide follow/follower count from the user profile
2019-10-07 20:45:13 +03:00
Henry Jameson
0a5147edf2 Merge branch 'emoji-mastoapi' into shigusegubu
* emoji-mastoapi:
  use mastoapi emoji endpoint since it's already sorted, should speed things up on instances with tons of emoji
  fix tests
2019-09-26 21:38:57 +03:00
Henry Jameson
c651d48a8c use mastoapi emoji endpoint since it's already sorted, should speed things up on
instances with tons of emoji
2019-09-26 21:38:03 +03:00
Henry Jameson
644ac2df56 Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update: (48 commits)
  eslint
  fix emoji inputs in user-settings, styles update
  bump z-index so that picker/suggest doesn't get overlapped by mobile button
  Scroll emoji picker into view if it's obstructed
  very important fix
  comment, cleanup and improve autoresize/autoscroll
  Fix formatting in oc.json
  avoid using global class
  fix logo moving bug when lightbox is open
  Reserve scrollbar gap when body scroll is locked
  setting display: initial makes trouble, instead, toggle display: none using classname
  lock body scroll
  add body-scroll-lock directive
  install body-scroll-lock
  wire up props with PostStatusModal
  rename component
  recover autofocusing behavior
  refactor MobilePostStatusModal using new PostStatusModal
  add new module and modal to post new status
  remove needless condition
  ...
2019-09-25 20:27:46 +03:00
Henry Jameson
5ffb01410d Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  fix
2019-09-25 08:43:16 +03:00
Henry Jameson
aa3b402523 Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  account for parent padding, too
2019-09-25 08:36:51 +03:00
Henry Jameson
4ca4fd9f7c Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  forgotten file
2019-09-25 00:22:13 +03:00
Henry Jameson
6a206457fe Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  WIP: fixed autoscroll, restructured Post Status Form's resize method "a bit"
2019-09-25 00:19:55 +03:00
Henry Jameson
04b8e8f118 Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  fix some bugs
2019-09-24 00:08:13 +03:00
Henry Jameson
3364c8fe01 Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  autoscroll post form on typing + some minor improvements
  split spam mode into two separate options (one in settings page)
  Apply suggestion to src/components/emoji_input/emoji_input.js
  changelog
  Update docs/USER_GUIDE.md
  docs update
  unit test for emoji input, for now covering only insertion mechanism
2019-09-23 22:13:39 +03:00
Henry Jameson
63f575ef8a Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  fix bottom-left icons being too damn wide
  improved post form's icons at bottom display
  updated logic for padding with spaces, improved spam mode
2019-09-15 12:52:31 +03:00
Henry Jameson
aef0f41581 improved post form's icons at bottom display 2019-09-15 12:28:52 +03:00
Henry Jameson
eb17433f48 updated logic for padding with spaces, improved spam mode 2019-09-15 12:09:19 +03:00
Henry Jameson
20db940b42 Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  update status/user card to use same gradient mask fading effect instead of background hack
  Fixed scrollability not being obvious, added fade effect
2019-09-15 02:20:17 +03:00
Henry Jameson
10c41a85df Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  review/naming + bugfix for stickers
  updated logic for hiding picker and also added ability to hide suggestions with esc key
  Remove emoji zoom
2019-09-12 20:37:37 +03:00
Henry Jameson
dc5635115a Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update:
  updated logic for hiding picker and also added ability to hide suggestions with esc key
  Remove emoji zoom
  Apply suggestion to src/components/emoji_picker/emoji_picker.vue
  Apply suggestion to src/components/emoji_picker/emoji_picker.js
  better hitbox for status emoji
2019-09-12 20:20:14 +03:00
Henry Jameson
203b64c3fb updated logic for hiding picker and also added ability to hide suggestions with
esc key
2019-09-12 20:14:35 +03:00
Henry Jameson
ab6ecdddc1 Remove emoji zoom 2019-09-12 19:19:12 +03:00
Henry Jameson
e667c2aca1 better hitbox for status emoji 2019-09-08 21:18:05 +03:00
Henry Jameson
9ba987dc95 Merge branch 'emoji-selector-update' into shigusegubu
* emoji-selector-update: (24 commits)
  fix aspect
  Apply suggestion to src/components/emoji_input/emoji_input.js
  scale emoji on hover
  added emoji zoom for picker
  fixed scroll when switching back to emoji
  fixed some bugs, added spam mode, minor collateral fixes
  fixed a lot of bugs with emoji picker, improved relevant components
  initial attempts at making emoji-picker somewhat extensible
  rename for consistency
  linting
  cleanup and appropriation for new emoji-input component API, styles updates
  rename emoji-selector to emoji-picker
  post-merge fix
  #101 - remove unused code
  #101 - bind outside click, add emoji to post status form
  #101 - click outside of emoji implementation
  #101 - update caret pos after emoji's inserted
  #101 - bind scroll event, highlight relevent section by tabs
  #101 - update hard-coded server url
  merge develop
  ...
2019-09-08 17:12:42 +03:00
Henry Jameson
1a9ee23ec2 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (83 commits)
  Password reset page
  add a comment
  force img updating immediately
  Fixed "sequimiento" to "seguimiento".
  Replace `/api/externalprofile/show.json` with a MastoAPI equialent
  Use mastodon api in follow requests
  "Optional" in lowercase.
  Update es.json
  fix pin/unpin status logic
  rename a mutation
  update
  fix user avatar fallback logic
  remove dead code
  Corrected "Media Proxy" translation.
  Update es.json
  make bio textarea resizable vertically only
  remove dead code
  Make image orientation consistent on FF, fix videos w/ modal
  remove dead code
  fix crazy watch logic in conversation
  ...
2019-09-08 17:12:11 +03:00
Henry Jameson
cf22cf778c Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (33 commits)
  fix js error on mute
  Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
  Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
  Apply suggestion to src/services/follow_manipulate/follow_manipulate.js
  Fix sent follow request detection
  fix english settings label regarding how to view videos
  fix extra buttons merge bug
  make size of gif image and preview equal
  css improvements
  do not unmount post status modal in desktop
  hide rich media preview image in case of broken image
  Handle JSONified errors while registering
  Focus on the search input when the search icon is clicked
  prevent scrolling top when click search input
  add zoom-in indication to avatar
  add zoom-in icon
  allow zooming avatar in profile panel header
  use $route instead of $router.currentRoute
  enlarge avatar in profile page
  update unit test
  ...
2019-08-11 18:48:33 +03:00
Henry Jameson
bbcd3190f2 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (57 commits)
  Feature/add sticker picker
  guard more secure routes
  guard secure routes by redirecting to root
  closest can returns itself as well
  find inside status-content div only
  try to use the closest a tag as target
  Update es.json
  Also apply keyword filter to subjects
  Remove files I accidentally pushed in
  fix issues caused by merges in usersearch on @
  Add user search at
  fix eslint warnings
  remove vue-popperjs
  fix moderation menu partially hidden by usercard boundary
  migrate popper css
  rewrite ModerationTools using v-tooltip
  make popover position for status action dropdow relative to parent node
  rewrite ExtraButtons using v-tooltip
  install v-tooltip
  i18n/Update pedantic Japanese translation
  ...
2019-07-25 13:05:59 +03:00
Henry Jameson
abf36dc466 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  check for user before checking users props
  Set hide_follows and hide_followers settings when parsing Mastodon format
  all the manual fixes
  fix merge conflict
  fix hot reload always reloading the page
  Use target from the settings
  preserve formatting of content
  add unit tests
  update regex for commit hash
  eslint --fix --ext .js,.vue src
  npm eslint --fix .
  Support compositionupdate event to properly show autocomplete popup for IMEs and android
  place scope selector on the left consistently
  hide text format when only plaintext is available
  update test for clearTimeline action
  make sure that user timelines are empty when opening profile page
  clear userId property of timeline by default in clearTimeline action
  Revoke oAuth token
  Update oc.json
2019-07-08 09:06:20 +03:00
Henry Jameson
6aa57d377d Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  review
  lint fix
  fix all known problems with clicks on autocomplete emojis
  fix specificity that made attachments misalign
  Keep statuses always enabled
  add resolve param to user search api request
  change isPinned to noIdUpdate
  Fix: problems with polls state
  Move character counter into the input box
  fix for #553
  Make scss change for tab switcher only
  delete state.token instead of setting false
  use clientSecret in login flow
  fix error breaking logout flow
  make sure to clear old token when logout
  Move poll state handling to its own module
  Fix/messed up long polls
  A small sass fix for #577
  reset margin property of form controls
2019-06-26 00:40:37 +03:00
Henry Jameson
9f8b0ce5e1 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Feature/polls attempt 2
  Update translation with review comments
  Update file with current en.json
  Update fr.json added missing ,
  Update fr.json stoped at line 134, more to do below
2019-06-18 23:45:28 +03:00
Henry Jameson
993285b20f what 2019-06-18 22:44:10 +03:00
Henry Jameson
cda2d6cb20 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  review
  review
  Update emoji-input.js
  Misc fixes: Fix uploads stretching on chrome, fix warnings in console
  apply font smoothing in webkit and firefox
  fix user search
  Apply suggestion to src/services/backend_interactor_service/backend_interactor_service.js
  properly position the caret after replacement
  Apply suggestion to src/services/api/api.service.js
  fix MFA crashing on user-settings page
  fixup! Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
  getting and setting user background via MastoAPI
  Removed formattingOptionsEnabled in favor of relying on BE-provided list of accepted formatting options
  fix small annoyance
  fixed some bugs i found, also cleaned up some stuff + documentation
  self-review
  Linting
2019-06-18 22:27:15 +03:00
Henry Jameson
d51a684318 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  fix typo
  rename mutations according to actual property names
2019-06-16 14:29:45 +03:00
Henry Jameson
ec038b8062 Merge branch 'masto-register-app-secret' into shigusegubu
* masto-register-app-secret:
  fix
2019-06-13 10:06:06 +03:00
Henry Jameson
7aba50888c Merge branch 'masto-register-app-secret' into shigusegubu
* masto-register-app-secret:
  fix
2019-06-13 10:00:19 +03:00
Henry Jameson
b34443a8fb Merge branch 'masto-register-app-secret' into shigusegubu
* masto-register-app-secret:
  fix logged out post-update
2019-06-13 09:49:22 +03:00
Henry Jameson
4a0e169621 Merge branch 'hotfix-user-background' into shigusegubu
* hotfix-user-background:
  fix user banner
2019-06-13 01:50:10 +03:00
Henry Jameson
54b6408f74 Merge branch 'masto-register-app-secret' into shigusegubu
* masto-register-app-secret:
  fix
2019-06-13 01:02:21 +03:00
Henry Jameson
283ce96b1b Merge branch 'masto-register-app-secret' into shigusegubu
* masto-register-app-secret:
  AMERICA
  comments
  No longer sending extra data, renamed some properties
  Proper clientId/secret/token caching, MastoAPI registration
2019-06-13 00:57:48 +03:00
Henry Jameson
06f8d23379 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Revert "add TOTP/Recovery Form for mobile version"
  Apply suggestion to src/services/entity_normalizer/entity_normalizer.service.js
  i18n/Update Japanese translation
  mastoapi login works
2019-06-13 00:57:14 +03:00
Henry Jameson
7d4fb42469 Linting 2019-06-09 21:35:49 +03:00
Henry Jameson
21b7c8796a Merge branch 'refactor-emoji-input' into shigusegubu
* refactor-emoji-input:
  fix textarea not resizing properly
  more bugfixes related to keybinds and nonworking stuff
2019-06-09 21:24:15 +03:00
Henry Jameson
15722295b7 Merge branch 'refactor-emoji-input' into shigusegubu
* refactor-emoji-input:
  Some comments, added sorting for emojis
  fixed several bugs
2019-06-09 20:41:35 +03:00
Henry Jameson
fba367904a Merge branch 'refactor-emoji-input' into shigusegubu
* refactor-emoji-input:
  sorting
  styles
  standartized autocomplete panel suggesions format, fixed some bugs
  slot-based emoji input/autocomplete component
2019-06-09 14:15:21 +03:00
Henry Jameson
357f75b372 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  render modal at the root level using portal
  install portal vue
  Small improve of the who to follow panel layout
  Fix/Small fix in the who to follow page
  remove console spam
  i18n
  wire up user.description with masto api data
  i18n/Add Japanese with kanji (2)
  move drowdown menu to popper
  notification controls: redesign entirely
  entity normalizer: collapse data.pleroma if blocks
  wire up notification settings
  do not miss statusnet_profile_url of mentions
  Translation to Hebrew of everything other than theme_helpers and style.
  Translate up to settings.
2019-06-09 14:15:09 +03:00
Henry Jameson
30a89201ca Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (59 commits)
  Fix pipelines and clean up console output
  switch from method to computed property
  formatting
  add tags to data and to status component
  Remove auto-hyphenation
  make staff label visible
  move visibility-tray css in local scope
  refactor css
  make only screen name as link
  refactor css for visibility tray
  moved setting styles into common to avoid bug with shared styles
  hide three dot menu button if has no items
  Eliminate automatic zooming on mobile
  entity normalizer: add tooltip text to emojis
  rename for consistency's sake
  update admin api urls in accordance with new docs
  Line up rich text format picker with the status form
  fix lint
  Cleanup, little documentation, localization
  update api service functions
  ...
2019-05-22 21:02:58 +03:00
Henry Jameson
fe222c9c03 Merge branch 'webpack-4-dart-sass' into shigusegubu
* webpack-4-dart-sass:
  fix prod build
  Fix small mistake in Polish translation
  fixed build speed
  fix tests
  attempt 2
  firefox
  attempt at making it work
  karma stuff, still broken tho
  more rules
  all the failing rules
  revert unnecessary changes
  update node
  fix obvious bug
  Webpack 4, ESLint with Vue, Node-sass, updated dependencies overall. New linting.
2019-05-13 22:00:21 +03:00
Henry Jameson
0084a63e41 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (24 commits)
  link interaction avatars to the user profile
  Use more clear explanation in the scope notice, make sure the hide button doesn't overlap with text in notice.
  use backendInteractor
  refactor api service functions using new helper
  clean up
  update favorite number earlier
  update status interaction upon retweet action response
  sync up favoritedBy with favorite/unfavorite action
  do not regenerate status object
  reduce needless calculation
  Move scope visibility notice to the status form, make it dismissible
  Revert "eliminate expandable prop in favor of inConversation"
  status attention doesn’t have relationship entities
  make it short
  fix wrong inlineExpanded
  expanded is always false, eliminate it
  eliminate expandable prop in favor of inConversation
  fix conversationId comparision bug using integer format
  Display additional scope description above the status form for mobile users.
  Update es.json
  ...
2019-05-09 22:04:17 +03:00
Henry Jameson
680cb7eda7 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (29 commits)
  update api services
  use native scrollbar
  refactor using List component
  remove transition css
  update api endpoint url
  rewrite checkbox component
  fix panel title overflow issue in mobile
  fix double scrollbar display bug in mobile
  prevent parent scroll
  use custom scrollbar
  modal style improvements
  Update promisedRequest helper to support json payload
  Improve mobile layout
  Add a css class to the checkbox indicator
  update copy
  update generic error message
  add translations
  add error message
  reset modal state if api request is completed
  add processing state and close modal after api request is completed
  ...
2019-05-05 11:42:42 +03:00
Henry Jameson
de54368b87 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (42 commits)
  filter outside of component
  fix i18n
  fix overflow behavior
  update styles and remove unnecessary stuff
  refactor showing favs and repeats logic
  display favs & reblogged users on expanded post in timeline view
  display avatars only on highlighted post
  add fadein effect to panel
  remove commented code
  display avatars list on highlighted post
  use transition wrapper component
  remove custom fadein logic
  use a tag for favs/repeated title
  use normal font weight instead of lighter
  use filter array function
  remove important in the property value
  remove important in css property
  use global fallback variable
  remove duplicates from avatars list
  add hover effect to label
  ...
2019-04-30 21:20:02 +03:00
Henry Jameson
5d274ea908 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  remove &
  add a comment
  show ellipsis for long user name and screen name
  use default_scope parameter
  use json content type
  clean up
  refactoring
  add “export blocks” feature
  fix wrong function binding
  make reusable Exporter component
  add “block import” feature
  change api function name
  make Importer component reusable
  add uploading icon css
  move formData generating logic to api.service
  split out follow’s importer as a separate component
  Update avatar uploading
  Switch to mastoapi for updating user profile
  Switch to mastoapi for updating banner
  Switch to mastoapi for updating avatar
2019-04-30 21:19:53 +03:00
Henry Jameson
659ac384d5 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (85 commits)
  entity normalizer: hook up in_reply_to_account_acct
  add BBCode strings
  fix follow button not updating bug in follow-card
  refer searched user objects from the global user rep
  set max-width of textarea in settings page
  Remove space in the timeline setting copy
  user_card.vue: Fix .emoji to apply to img
  Update oc.json
  Update oc.json
  Update oc.json
  Update oc.json
  replace pencil with wrench icon
  rebuild fontello with wrench icon added
  fetch all friends using pagination
  stop fetching user relationship when user is unauthorized
  Revert "recover border between basic-user-card using list component"
  remove extra spacing
  code readability
  fix typos
  clean up
  ...
2019-04-28 18:23:40 +03:00
Henry Jameson
d989b5af66 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Fix wrong usercard notification
  maintain conversationsObject storage
  remove unused importing
  get statuses in a conversation from the global repository instead of local state
  restore yarnlock
2019-04-14 10:23:53 +03:00
Henry Jameson
2c89778944 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  #436 - remove yarn.lock
  Fix wrong local
2019-04-10 21:16:19 +03:00
Henry Jameson
8247028245 Merge branch 'fix-emoji-picker' into shigusegubu
* fix-emoji-picker:
  support new custom emoji format
2019-04-09 23:43:18 +03:00
Henry Jameson
952c670b3b Merge branch 'mastoapi/update-extension-support' into shigusegubu
* mastoapi/update-extension-support:
  revert, it's still missing
  add support for pleroma-specific fields
2019-04-09 22:42:07 +03:00
Henry Jameson
66680e5471 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  #486 - remove expand button on conversation page
  fix small bug
  Add await to login befor redirect to friends timeline
  Prevent repeated fetching
  Add space
  Separate timeline and notification
  Remove useless codes
  Fix notification bugs
2019-04-09 22:00:35 +03:00
Henry Jameson
317b658413 Merge remote-tracking branch 'Dave/issue-436-mastoapi-notifications' into shigusegubu
* Dave/issue-436-mastoapi-notifications:
  remove debug message
  #436 - revert stripe html for notification
  #436 - notification html to text content
  #436 - revert notification silience config
  #469 - update text copy
  #469 - update behavior of safe_dm
  #469 - clean up
  #469 - DM warning text should vary based on BE setting
  Added moderation menu
  remove window width copypasta
  Fix login handling
  Add Promise.all to send requests when loading
  #471 - fix timeline fetch with since_id
  Update Polish translation
  Update oc.json for !611 and !691
2019-04-09 22:00:08 +03:00
Henry Jameson
ea9adb3c16 Merge remote-tracking branch 'upstream/feature/mobile-improvements-3' into shigusegubu
* upstream/feature/mobile-improvements-3:
  add gesture to close notifications drawer
  make notifications close on navigation
  make mobile notifs drawer more like an actual drawer, make mobile nav buttons bigger to press, fix alert dot
  remove notifications from sidebar, make notifications appear on login only
  make nav bar slide, move mobile post status to mobile nav
  more work with notifications drawer
  start working on one tap notifications
2019-04-01 22:14:35 +03:00
Henry Jameson
e990090bbf Merge remote-tracking branch 'Dave/issue-436-mastoapi-notifications' into shigusegubu
* Dave/issue-436-mastoapi-notifications:
  #436 - sync notification & timeline users
2019-04-01 21:51:51 +03:00
Henry Jameson
95fc9a0116 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  #470 - update button text capitalization
  #470 - handle cases without subject
  #470 - update i18n
  #470 - fix subject and content toggle issue
  Remove useless comma
  Fix user card in notification
2019-04-01 21:50:52 +03:00
Henry Jameson
93755d4858 Merge branch 'issue-436-mastoapi-notifications' into shigusegubu
* issue-436-mastoapi-notifications:
  #436 - apply patch and clean up
  #436 - update notification
  #436 - apply patch
  #436 - keep original naming
  #436 - keep original naming
  #436: sync notification with timeline
  #436: implement is_seen logic
  #436: clean up based on comment
  #436: update test
  #436: add is_local for statuses
  #436: remove clear & dismiss UI updates
  #436: update unit testing
  #436: fix notification order, follow type link issue, duplicate key
  #436: update is_local
  #436: update entity_normalizer
  #436: add dismiss button, disable is_seen part
  #436: integrate mastoAPI notifications
2019-04-01 09:39:44 +03:00
Henry Jameson
10c0758d58 Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  final touches
  aaaaggghh
2019-03-30 12:44:49 +02:00
Henry Jameson
8baf0ce9ec Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  fix lint
  fix formatting
  fix formatting
  Review
2019-03-30 12:37:55 +02:00
Henry Jameson
554ebd38bb fix 2019-03-30 12:05:12 +02:00
Henry Jameson
b3efaecaaa Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (83 commits)
  Fix: Change condition
  fix typo
  update store according to retweeted status
  #433 - update sort by for conversation
  display replies_count right after reply icon
  expose replies_count from mastodon api
  Apparently, MastoAPI gives status in ancestors if you try opening a repeat...
  make side drawer use gesture service and fix its animations
  review/remove error hiding
  errata
  review
  #433 - sort conversation for retweets and clean up
  Revert "Merge branch 'revert-987b5162' into 'develop'"
  Revert "Merge branch 'mastoapi/friends-tl' into 'develop'"
  Add await to login action'
  Remove console log
  Fix warnings in user profile routing
  Add tests for gesture service, fix bug with perpendicular directions
  #255 - clean up autocomplete form
  #255 - clean up user settings page with self-closing html tags
  ...
2019-03-30 12:04:36 +02:00
Henry Jameson
bd6c734398 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (21 commits)
  #449 - fix auth token fetch issue
  Make select tag use --inputText as text color
  #444 - remote follow clean up
  #444 - show `remote follow` button when logged out
  Add button to save without cropping
  post-merge fixes
  [i18n] Update oc.json
  after store: fix setting postFormats field
  afterStoreSetup: Move log in and theme load to afterStoreSetup.
  afterStoreSetup: Handle 404 cases.
  afterStoreSetup: Emoji and nodeinfo refactor.
  afterStoreSetup: refactor TOS and panel fetching, handle 404s.
  afterStoreSetup: refactor.
  Load persistedStated with async/await.
  fixing typos and badly translated strings
  #434 - fix plain text issue
  Added some tests
  Code refactoring
  Version links to BE/FE
  Added new tab to display versions of BE/FE
  ...
2019-03-22 09:31:58 +02:00
Henry Jameson
23c22c7cbd Merge branch 'mastoapi/user-stuff' into shigusegubu
* mastoapi/user-stuff:
  fix user-card avatar falling into permament failed state
  fix flake id users not fetching correctly
  fix console error
2019-03-14 23:40:37 +02:00
Henry Jameson
c0908e238f Merge branch 'mastoapi/user-stuff' into shigusegubu
* mastoapi/user-stuff:
  whoops
  レインせんぱいにサンキュー
  fix embedded relationship card parsing
  actually use embedded relationship if it's present
  instead of filtering nulls, let's just not have them in the first place
  fixed tests, review fixes, now storing local users with downcase screen name for better compatibility
  fix error
  some test fixes, disabled one test for now since logic now is even more async in general
  attempt at fixing switching to user TL
  fix reply-to marker, also whoops console log
  revert some stuff, turns out it's actually breaking. Fixed some local user things
  Since BE doesn't support fetching user by screen name over MastoAPI we'll gonna just fetching it over QvitterAPI real quick :DDDDDDDDD
  switch to mastoapi for user timeline
  Partially transitioned user data to MastoAPI. Added support for fetching relationship data. Upgraded code to be more resilient to nulls caused by missing data in either APIs
2019-03-13 20:25:38 +02:00
Henry Jameson
b4ee6b5210 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (51 commits)
  Add floating post-status button on mobile
  Update user settings icon to pencil
  I18n: Update Czech translation
  user_card.vue: Copy over .status-content img styling
  Make minId reset with minVisibleId to prevent gaps when showing new
  Only connect to chat when authenticating in the first place
  Check for websocket token before connecting to chat
  user_card.vue: Set img.emoji to 32×32px
  #432 - prevent post status form textarea keydown event propagation
  Merge content types translations
  Use a cross browser safe solution to get scroll top
  Revert modifier class notation
  Update classname
  Update tests
  Rename UserCardContent to UserCard
  Update block class name of BasicUserCard component
  Update modifier class notation
  compatibility with upcoming changes
  Re-do UserCardContent css
  Load post status content type from instance config
  ...
2019-03-12 22:16:50 +02:00
Henry Jameson
749c44c6ff Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:45:45 +02:00
Henry Jameson
b0654ebc32 Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:38:30 +02:00
Henry Jameson
a381c96130 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:37:45 +02:00
Henry Jameson
84d0ac2c1c config 2019-03-03 15:34:23 +02:00
Henry Jameson
5727873ebb Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:32:36 +02:00
Henry Jameson
860e73e8f4 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:32:10 +02:00
Henry Jameson
0db97e7947 Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:28:50 +02:00
Henry Jameson
e1f55b60d3 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:28:27 +02:00
Henry Jameson
3e231de61b Merge branch 'minimal-scopes-mode' into shigusegubu
* minimal-scopes-mode:
  Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode
2019-03-03 15:25:31 +02:00
Henry Jameson
98fed1a9c1 Initial work on deprecating scopeModesEnabled in favor of minimalScopeMode 2019-03-03 15:22:44 +02:00
Henry Jameson
8710b630b8 Merge branch 'hotfix-replies' into shigusegubu
* hotfix-replies:
  fix broken statuses
2019-03-02 20:43:14 +02:00
Henry Jameson
a129ef2e07 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (88 commits)
  Update font-size of username in UserCardContent component
  Re-do status header a bit, add more consistent spacing to status
  Fix JS error when no statuses returned
  Fix fetching error by tag
  #388: update naming properly
  Fix layout overflow issue
  Add a class to screen name
  Add back accidently removed logic
  Merge all slots of BasicUserCard into one
  Revert "Minor mobile layout improvement for BasicUserCard"
  Minor mobile layout improvement for BasicUserCard
  Use native filter function
  Shorten a classname
  Improve mobile layout of user card
  Update naming
  Add back some css
  Remove legacy class names in BasicUserCard
  Remove UserCard
  Migrate UserCard to FollowCard and FollowRequestCard
  Add FollowRequestCard component
  ...
2019-03-02 20:28:10 +02:00
Henry Jameson
135eca40ea Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  bad defaults
2019-02-22 00:16:20 +02:00
Henry Jameson
90a82b7dec Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (33 commits)
  #383: content type error
  #376: update status timeline when it's empty
  #377: no exteral profile link for local users
  #371: show notification when user setting's saved
  Clean up CSS a bit
  #364: update ap_id error with username
  Rename: instanceSpecificPanelPresent
  Hide isp option if instance has panel disabled
  Take over branch and fix some issues
  Fix lint errors
  Better error handling
  Remove cropped image size restriction
  Remove modal component
  Make embedded image cropper
  Revert eslintrc changes
  Check if variable exists before using
  Remove event listeners when destory ImageCropper
  Localization of ImageCropper component
  Remove event listener when modal is destroyed
  Crop avatar image using minWidth/minHeight
  ...
2019-02-21 19:32:49 +02:00
Henry Jameson
59196e1dd9 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Parameter name changed.
  #361 - fix theme preview background
  Fix console error - maximum call stack size exceeded
  update japanese translation
2019-02-16 19:51:10 +02:00
Henry Jameson
9a54d858df Merge branch 'fix-notifs' into shigusegubu
* fix-notifs:
  fix notifications
2019-02-14 22:15:44 +02:00
Henry Jameson
b8d594dc57 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"
  Revert "Merge branch 'fix/no-autocomplete-in-non-post-forms' into 'develop'"
  Revert "Merge branch 'hotfix/issues-in-autocomplete' into 'develop'"
2019-02-14 22:15:41 +02:00
Henry Jameson
f4e8b781a9 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (51 commits)
  fix convos
  resolve focus issue in the auto-complete for name field
  resolve issue related to event handler
  resolve issue in prop binding
  this fixes #350 - v-model binding issue
  #341 - fix naming
  #341 - automatic scroll with repeats/reports
  345 - fix long username issue in repeat status
  Update spanish translate - es.json
  Fix return
  Fix clicking link - open new tab unless tag or mention
  Fix max-width of profile banner in setting
  Fix unit test
  Typo
  #332 - add follow/not follow button to follow list
  Add quick css fix for user profile bg img preview
  Switch into Lodash
  Switch into Lodash
  Change the async stuff to not render app before theme is loaded
  fixing conflicts
  ...
2019-02-14 20:17:22 +02:00
Henry Jameson
3f08301d6b Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (108 commits)
  Update user settings text: staff badges are only visible in user profile
  Fix naming
  Show back followees/followers counts
  Always show my own followees/followers
  Hide followers and followees tabs when they are disabled
  #137 - clean up emoji list
  #315 - revert changes
  #315 - separate export and fetch follows logic
  #137 - add red heart emoji
  Grammar
  Fix repeater html not showing properly
  #301 - add an option for default formatting
  #315 - clean up the request
  remove unnecessary div
  #315 - export all follows as CSV
  Make role badge visible only on user profile page
  Add theming support for admin/moderator badges
  Refactor visibleRole for better readability
  Allow to configure visibility for admin and moderator badges
  Add admin and moderator indicators to the user card
  ...
2019-02-08 11:11:20 +02:00
Henry Jameson
f1a754d774 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  i should take it easy
2019-01-25 18:05:42 +03:00
Henry Jameson
773866fc20 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  hotfix
  entity normalizer: provide summary_html property
2019-01-25 16:34:11 +03:00
Henry Jameson
166c66ceb5 Merge branch 'develop' into shigusegubu
* develop:
  quickfix
2019-01-25 01:39:54 +03:00
Henry Jameson
683971778f Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  this attempts converting id to number to sort them numerically, since "99" > "100" while 99 < 100
2019-01-25 01:33:11 +03:00
Henry Jameson
6a044fd3e8 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  "spring" cleaning
  review
  Fix who to follow panel shuffling
  Always send "hide_network" when updating user profile
  fix custom nsfwCensorImage not working
  fix reply-to tooltip being somewhat unreliable
  Revert "fix reply-to tooltip being somewhat unreliable"
  fix reply-to tooltip being somewhat unreliable
  fix errors in console
2019-01-25 01:30:24 +03:00
Henry Jameson
657bcf72fb Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (49 commits)
  linting
  update test names
  confusion
  better handling of attachments
  Linting.
  Don't use referrerpolicy with media proxy.
  update logo
  support for extended fields (for future, doesn't work yet), fix reply bug
  more fields for users
  some more post fields
  support for CW/Subject. fix replies.
  removing unnecessary conversions since it should already be converted in normalizer
  fix indents
  some consistency
  localization strings
  add support for tab-switcher to automatically switch to first tab if asked index is invalid
  fix login and favorites tab...
  Revert "some initial work to make it possible to use "unregistered" timelines, i.e. not" and some stuff to make favorites still work
  forgot the file
  tests for the tests god! bugfixes for bugfixes throne!
  ...
2019-01-22 21:00:52 +03:00
Henry Jameson
1eea45cf6d Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (32 commits)
  [Debug] Avoid duplicates in the who to follow panel
  updated German translation  * added theme settings  * added various missing single strings
  Fix translation typo in registration.vue
  Update README
  Fix profiles without statuses not loading
  Fix conflicting styles
  Remove commented out back button
  Cleanup and remove divider element in side drawer
  New routes, notifications, other impovements in side drwaer
  Add "noAttachmentLinks" to src/modules/instance.js
  Make "noAttachmentLinks" configurable
  No attachment links
  Treat reserved users like external users in the frontend.
  User Card Content fixes and updates
  scopeCopy → true by default
  Restore old routes, enable user route as fallback.
  improve web push notifications
  fix
  Update japanese translation
  fix inconsistencies within who_to_follow_panel
  ...
2019-01-07 13:23:03 +03:00
Henry Jameson
51b604a790 Merge branch 'fix_textfields' into shigusegubu
* fix_textfields:
  fixed incorrect height when empty text
2018-12-25 04:08:38 +03:00
Henry Jameson
535f832e0b Merge branch 'fix_followers' into shigusegubu
* fix_followers:
  fixes many problems related to user profile
2018-12-20 08:29:11 +03:00
Henry Jameson
d9f4438443 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  no more "broken favorite"
  Fixed some settings not using defaults from instance config. Made some parts of code more readable
2018-12-20 07:20:20 +03:00
Henry Jameson
9306a879cb Merge branch 'fix_textfields' into shigusegubu
* fix_textfields:
  I suppose SOME browsers don't do this by default...
  Fix resize not working properly for textareas
2018-12-20 07:19:42 +03:00
Henry Jameson
c3b8756e5b Merge branch 'fix_textfields' into shigusegubu
* fix_textfields:
  I suppose SOME browsers don't do this by default...
  Fix resize not working properly for textareas
2018-12-19 01:26:34 +03:00
Henry Jameson
43857d7b13 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (38 commits)
  Feature/bigger icons for mobile / #211
  Fix oauth url
  clean up the unused stuff
  Make user profile page cleaner
  missing string and unification with counters (order)
  collateral fix for tab display
  collateral fixes for user-card: use still-image, styles for custom emoji
  Refactor follower/friends out of statuses/timeline into user_profile where it belongs. Changed display of profile to single panel with tabs.
  Redirect to /main/all
  Move userProfile link to methods
  Fix user profile test
  Add temporary redirects
  Add local profile test
  Fix style
  Add a way to get new captcha on click
  Fix style
  Separate captcha into the backendInteractor
  more visual fixes
  changed bottom-shadow hiding method to be more compatible with overflow
  small fix for overflowing tab-switcher
  ...
2018-12-19 01:26:20 +03:00
Henry Jameson
a3ccce7367 I suppose SOME browsers don't do this by default... 2018-12-19 01:23:52 +03:00
Henry Jameson
57ced9db0e Fix resize not working properly for textareas 2018-12-19 01:11:57 +03:00
Henry Jameson
166e9f510f Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  fix
2018-12-15 03:45:39 +03:00
Henry Jameson
398fad40c9 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  oof
  slightly changed the code to have less mutations, added comments
  more damage control
  fix chrome
  Prevent html-minifier to remove placeholder comment in index.html template
  Add placeholder to insert server generated metatags. Related to #430
  Added support for async following including delayed confirmation if we followed user or not
  search button for user finder
  hide logo when opening search bar on small screens
2018-12-15 03:39:47 +03:00
Henry Jameson
1b21b7d30e fix? 2018-12-14 01:23:32 +03:00
Henry Jameson
8d345bbad9 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (26 commits)
  added condition to check for logined user
  fix gradients and minor artifacts
  keep track of new instance options
  fix old MR
  oof
  get rid of slots
  added hide_network option, fixed properties naming
  Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
  Refactor arrays to individual options
  Reset enableFollowsExport to true after 2 sec when an export file is available to download
  Write a unit test for fileSizeFormatService
  I am dumb
  Handle errors from server
  Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
  Avatar, background, banner filesize errors
  Count in binary bytes and remove i18 from file size format service
  Add a space between filesizes
  Lint
  Add file size formating
  Fix formating
  ...
2018-12-14 01:16:54 +03:00
Henry Jameson
6eea8ff3db Merge branch 'fix-timeago' into shigusegubu
* fix-timeago:
  fix timeago font
2018-12-13 17:22:31 +03:00
Henry Jameson
b91420b17e Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (25 commits)
  improve notification subscription
  Fix typo that prevented scope copy from working.
  added check for activatePanel is function or not
  addressed PR comments
  activate panel on user screen click
  added not preload check so hidden toggles asap
  removed counters from left panel
  added router-links to all relavent links
  added activatePanel onclick for timeago button
  added PR comments
  add checkbox to disable web push
  removed brackets from condition
  resolved lint issue
  renamed config to preload images and add ident to config
  added config for preload and made attachment responsive to it
  preload nsfw image
  fix race condition
  improve push notifications code
  second attempt to add subscribe module and fix race condition
  Revert "add subscribe module and fix race condition"
  ...
2018-12-13 17:15:09 +03:00
Henry Jameson
c1f1588393 Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  fix
2018-12-11 19:09:33 +03:00
Henry Jameson
fcb3b927fb Merge branch 'dev-qol' into shigusegubu
* dev-qol:
  fix
2018-12-11 19:02:09 +03:00
Henry Jameson
94c10dd8c3 Merge branch 'dev-qol' into shigusegubu
* dev-qol:
  whoopsies
  fix
2018-12-11 18:57:46 +03:00
Henry Jameson
af4a956ea7 fix 2018-12-11 18:54:17 +03:00
Henry Jameson
f43e57caea Merge branch 'dev-qol' into shigusegubu
* dev-qol:
  Quality of Frontend Developer's Life: here to stay
2018-12-11 18:46:43 +03:00
Henry Jameson
4159a6b13c Merge branch 'feature/theming2' into shigusegubu
* feature/theming2: (24 commits)
  fixed wrong height for selects
  better layouting for import-export, error display fixes
  added keep-colors option
  separated preview and exported from style_switcher
  revert that, it's actually used, i'm an idiot
  removed unused function from color_convert
  cleanup
  setColors -> applyTheme. For sanity. Also disabled export because nobody uses it and should not use anyway.
  fixed v2 setting as default theme
  separate font control js
  Fix color fallback order
  Use console.warn instead of console.log
  Get rid of mutation_types file, use inline approach. Minor fixes
  Add fallback color rule.
  Change english validation error messages
  Clean up the code
  Validate name presence on client-side as well
  Better styling for client-side validation. Add I18n for validation errors.
  Fix broken ToS link. Fix linter errors
  Add client validation for registration form
  ...
2018-12-11 16:47:12 +03:00
Henry Jameson
f5a254a651 Merge branch 'fix_alwaysSubject' into shigusegubu
* fix_alwaysSubject:
  fix
2018-12-05 10:51:21 +03:00
Henry Jameson
6a411faf3f Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  Fix iOS Safari from making videos play fullscreen by default
  added PR comments
  resolved the lint
  used the deleted data param as condition in status template
  Switch to "timeline" when pressing user-settings
  Added user setting tooltip
  made links in user bio always open in new tabs
  addressed PR comments
  added tooltip
  Add userId property to timelines so that we don't overwrite user timeline meant for another user
  Added option to auto-hide subject field when it's empty.
  removes hacks from notifications storage, adds api call to let server update is_seen attribute
  fixes vimium not giving retweet button a hint
  Do not use underscore at the beginning of the method
  Logout user on password change
  Route user to the correct profile URL
  Typo
  Fix filetype detection
  Switch to settings when touching settings
  Switch to timeline on nav panel actions
2018-12-05 10:43:36 +03:00
Henry Jameson
4070d461a1 Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  fix
  fix
2018-12-02 15:20:50 +03:00
Henry Jameson
2ad74f1a06 pm fix 2018-12-02 15:09:40 +03:00
Henry Jameson
151d9767b2 Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  fallback for some weird case on my phone
  todo
  missing string
  some more themes, fixes
  localization strings, fixes
  making inset shadows work on avatars again
  fix retweeter avatar not getting proper shadow
  avatars shadows, also allows drop-shadow use
2018-12-02 15:07:33 +03:00
Henry Jameson
094c5951a0 fix retweeter avatar not getting proper shadow 2018-12-01 14:47:42 +03:00
Henry Jameson
ce18bb202e avatars shadows, also allows drop-shadow use 2018-11-30 16:39:07 +03:00
Henry Jameson
c3ccbba5e7 Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  updated preview window
  lint fix
2018-11-27 10:18:39 +03:00
Henry Jameson
b09fe659b1 updated preview window 2018-11-27 04:54:59 +03:00
Henry Jameson
78e1d61126 lint fix 2018-11-26 21:22:44 +03:00
Henry Jameson
68df06f149 Merge branch 'feature/theming2' into shigusegubu
* feature/theming2:
  fixed keep checkboxes working when exporting
  unbreak user profiles
  fix preview input text using wrong string
  fix panel link color, fix broken user profiles
2018-11-26 21:18:27 +03:00
Henry Jameson
a3b20fbd1a Merge branch 'feature/theming2' into shigusegubu
* feature/theming2: (124 commits)
  whoops
  whoops
  redmond update
  better preview, collateral fixes
  theme separation
  more styles
  cosmetic fixes
  font control args to allow passing an option list of fonts, for future use
  more fonts
  initial font support
  clean up
  validity checks, no longer exploding when something is invalid
  DM timeline: stream new statuses
  collateral fixes
  fixed indentation
  some help strings
  reset buttons, better disabled for shadows
  added "keep opacity" option, fixed opacity loading, fixed missing shadows not affecting the preview (i.e. previewing pleroma-dark when redmond is applied)
  fix v1->v2 transition for localstorage
  radii v1 fixes
  ...
2018-11-26 18:20:19 +03:00
Henry Jameson
5a9e4bf42d Merge branch 'feature/scope_preferences' into shigusegubu
* feature/scope_preferences:
  forgot to actually handle the instance config. this part needs a rewrite...
2018-09-25 16:31:51 +03:00
Henry Jameson
3ca8f5a214 sgsgb def 2018-09-25 16:27:57 +03:00
Henry Jameson
41ee42e03f Merge branch 'feature/scope_preferences' into shigusegubu
* feature/scope_preferences:
  lint fix
  now it actually works
  settings for scope/subject
2018-09-25 16:25:04 +03:00
Henry Jameson
9c4bac08d6 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  i think it's due to my shitty js-to-json regex
  src/i18n/fr.json: More accurate translation
  update Japanese translation
  update french translation
  add support for disabling rich text formatting
  small thing to display instance-provided default
  console.log cleanup
  More languages
  added usage
  a tool to check what's missing from a language
  all other languages which do not have MRs related to them separated
2018-09-25 16:24:52 +03:00
Henry Jameson
16c1f8eb36 console.log cleanup 2018-09-17 19:16:33 +03:00
Henry Jameson
b0af6b572c Merge branch 'betterStorage' into shigusegubu
* betterStorage:
  Fixed "user.id is undefined" or something error more sane by properly handling HTTP errors
  undo rename because it makes less sense now.
  proxying nodeinfo
  made FE work even without either api or static config
  Removed warning. Added support for working without static/config.json
  more missing stuff
  fix some missing stuff
  translations
  Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
  more refactoring
  some recategorization of options...
  Initial version
2018-09-17 19:08:41 +03:00
Henry Jameson
3fe199ac0e Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Update Hebrew translation
  Debug
2018-09-17 19:02:18 +03:00
Henry Jameson
1ee7dd7739 Merge branch 'fixAutocomplete' into shigusegubu
* fixAutocomplete:
  fixed autocomplete
2018-09-12 11:48:08 +03:00
Henry Jameson
095278f6dd Merge branch 'betterStorage' into shigusegubu
* betterStorage:
  more missing stuff
2018-09-09 22:31:52 +03:00
Henry Jameson
c09dcd9c05 more missing stuff 2018-09-09 22:31:34 +03:00
Henry Jameson
094956bf08 Merge branch 'betterStorage' into shigusegubu
* betterStorage:
  fix some missing stuff
2018-09-09 22:02:44 +03:00
Henry Jameson
88a51bed46 fix some missing stuff 2018-09-09 22:02:22 +03:00
Henry Jameson
cbe81fbd86 Merge branch 'betterStorage' into shigusegubu
* betterStorage:
  translations
  Added more stuff that's actually being added to instanceConfig, simplified the whitelist.
  more refactoring
  some recategorization of options...
  Initial version
  seems to be working
2018-09-09 21:58:21 +03:00
Henry Jameson
033b8fef4b Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  fix lint
  use prime number step for Who to follow panel
  fix
  Revert "Revert "Update messages.js""
  Revert "Update messages.js"
  Update messages.js Update the Occitan language - Fixed Linting
  Remove outdated settings
  Simplified image sensitivity label
  i18n/messages.js: changed Folgende back to Follower
  updated german translation
  updated german translation
  cleaning up some translations that broke the building
  fix trailing comma
  Update and fix messages.js (pt, eo)
2018-09-09 21:58:11 +03:00
Henry Jameson
8c0b7583cd translations 2018-09-09 21:57:17 +03:00
Henry Jameson
795cb83fbd Added more stuff that's actually being added to instanceConfig, simplified the whitelist. 2018-09-09 21:51:40 +03:00
Henry Jameson
c152fc501f more refactoring 2018-09-09 21:21:23 +03:00
Henry Jameson
ce36e8383a Merge remote-tracking branch 'upstream/develop' into betterStorage
* upstream/develop: (23 commits)
  fix lint
  use prime number step for Who to follow panel
  fix
  Revert "Revert "Update messages.js""
  Revert "Update messages.js"
  Update messages.js Update the Occitan language - Fixed Linting
  remove formatting options
  Remove outdated settings
  features panel i18n
  features panes supports chat & gopher
  Simplified image sensitivity label
  show features panel only if not login
  update
  debug
  update
  debug
  mock features panel
  i18n/messages.js: changed Folgende back to Follower
  updated german translation
  updated german translation
  ...
2018-09-09 19:36:41 +03:00
Henry Jameson
b3cb429a97 some recategorization of options... 2018-09-09 19:36:13 +03:00
Henry Jameson
6ce547aa67 Merge branch 'post-polish-fixes' into betterStorage
* post-polish-fixes:
  fix collapse link being too small
  small fix for non-square gif avatars
  Fixed collapseMessageWithSubjectLocal always using instance-provided config.
  Fix last place with usercard having wrong width
  Fixed non-masked image looking weird in chrome.
  Kinda went back to using align-items: stretch. Fixed error message floating.
2018-09-07 18:17:32 +03:00
Henry Jameson
ae19eaf8f9 Initial version 2018-09-07 18:17:17 +03:00
Henry Jameson
16a0e91fc4 Merge branch 'feature/features-panel' of git.pleroma.social:hakabahitoyo/pleroma-fe into shigusegubu
* 'feature/features-panel' of git.pleroma.social:hakabahitoyo/pleroma-fe:
  remove formatting options
  features panel i18n
  features panes supports chat & gopher
  show features panel only if not login
  update
  debug
  update
  debug
  mock features panel
2018-09-04 13:44:09 +03:00
Henry Jameson
53a2e8594f Merge branch 'post-polish-fixes' into shigusegubu
* post-polish-fixes:
  fix collapse link being too small
2018-09-03 23:30:22 +03:00
Henry Jameson
fe9bb83664 Merge branch 'develop' into shigusegubu
* develop:
2018-09-03 23:24:16 +03:00
Henry Jameson
e31f67f82e Merge branch 'patch-1' of git.pleroma.social:dingdreher/pleroma-fe into shigusegubu
* 'patch-1' of git.pleroma.social:dingdreher/pleroma-fe:
  Update users.js
2018-09-03 23:02:17 +03:00
Henry Jameson
9ceed2f898 Merge branch 'post-polish-fixes' into shigusegubu
* post-polish-fixes:
  small fix for non-square gif avatars
  Fixed collapseMessageWithSubjectLocal always using instance-provided config.
  Fix last place with usercard having wrong width
  Fixed non-masked image looking weird in chrome.
  Kinda went back to using align-items: stretch. Fixed error message floating.
2018-09-03 23:01:07 +03:00
Henry Jameson
4b186fb475 Merge branch 'develop' into shigusegubu
* develop:
  small fix
  Made showing format selection optional and default to false
  Fix mistakes
  Change styles a bit, make pre-formatted blocks not overflow but scroll
  Add styles for h1/2/3/4/5 tags in status html
  post status form: styling fixes for content-type selector, align icons with selector
  Pass user id to fetchFriends
  i18n: make "plain text" translatable
  add the ability to select a post's content type
  fix
  Add titles to source/expand buttons
  Add titles to post visibility icons
2018-09-03 23:01:01 +03:00
Henry Jameson
76df311899 Revert "add the ability to select a post's content type"
This reverts commit 38e3c2493d.
2018-08-31 04:31:59 +03:00
Henry Jameson
c2a4ae3654 Merge branch 'polish' into shigusegubu
* polish:
  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
  i18n: make "plain text" translatable
  add the ability to select a post's content type
2018-08-31 04:21:46 +03:00
Henry Jameson
8205cdd9f7 Merge branch 'polish' into shigusegubu
* polish:
  fix
  vodka translations
2018-08-30 23:00:06 +03:00
Henry Jameson
5b98b694d3 vodka translations 2018-08-30 20:43:24 +03:00
Henry Jameson
6421b40141 Simplified image sensitivity label 2018-08-30 20:30:04 +03:00
Henry Jameson
62e9a2a120 Merge branch 'polish' into shigusegubu
* polish:
  fix
2018-08-30 20:16:46 +03:00
Henry Jameson
24dcc2674b Merge branch 'polish' into shigusegubu
* polish:
  fix
2018-08-30 19:53:27 +03:00
Henry Jameson
aaba8432c2 Merge branch 'polish' into shigusegubu
* polish: (21 commits)
  fixed #87
  fixup! panel styling cleanup
  fixup! 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.
  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.
  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.
  fixes broken nsfw hider in notifications
  restored "progress" cursor indicator for loading nsfw images
  fixed #72
  Added ability to hide certain types of notifications
  fixup! Separated tab-switcher into a reusable component. This depends on JSX addition
  minor style tweaks
  panel styling cleanup
  moved replies filtering to "filter" category in settings, made it more consistent
  settings page update
  tabs for settings
  allow multiple file upload
  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
  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.
  fixed still-image not preserving original aspect ratio and resolution.
  Separated tab-switcher into a reusable component. This depends on JSX addition
  ...
2018-08-30 18:37:36 +03:00
Henry Jameson
16ec650b71 Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop: (37 commits)
  Match users using startsWith instead of match.
  Match emoji using startsWith instead of match.
  remove-unused-settings
  Preserve subject in replies.
  Don't use nsfw clickthrough if the post is collapsed by default.
  correct /static/config.json decoding
  save /api/statusnet/config.json connection
  rename apiStatusnetConfigSitePleromafe to apiConfig
  fix typo
  Add a checkbox for marking a post's attachments as NSFW
  When a post with a subject is collapsed, hide its attachments.
  Make interface language configurable from settings
  attachment: add support for rendering alt text on images
  Don't hide replies when inConversation.
  Fix indentation
  Remove old implementation of isReply.
  Add settings for changing the visibility of replies in the timeline.
  Update Russian translations
  update
  fixed error not displaying for 500 error.
  ...
2018-08-27 14:32:55 +03:00
Henry Jameson
20464b2a16 Merge branch 'notifications' into shigusegubu
* notifications:
  Revert "Drop the entire thing about hidden "own" timeline since it doesn't necessarily"
2018-08-21 00:22:36 +03:00
Henry Jameson
83b2964f7c Merge branch 'notifications' into shigusegubu
* notifications:
  error display
  removed style for rounding bottom part of notifications because there's now always "load more" footer
  fix custom emoji in username, fix gif avatar not being animated when hovering on the notification
  Hide initial desktop notifications spam when FE is opened and there's a lot of unseen notifications.
  Updated localization files
  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 20:46:18 +03:00
Henry Jameson
e246a3beee Merge remote-tracking branch 'upstream/develop' into shigusegubu
* upstream/develop:
  Rename expandCW to collapseMessageWithSubject.
  fix indent
  Add support for configurable CW clickthrough.
  Merge upstream
  fix lint issues
  allow default visibility scope to be configured
  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
  Add theme import feature
  Refactor theme settings state initialization
  Add theme export feature
2018-08-20 12:10:40 +03:00
Henry Jameson
1969c73772 Merge branch 'notifications' into shigusegubu
* notifications:
  fix
  fix post search query to have id +1 because search is exclusive
  changed the only surviving and important test to accommodate for new notifications flow.
  removed notification-relevant test because the functionality they are testing do not exist anymore. Gotta write more tho...
  fix lint
  cleanup, updated broken favorites look + localization strings
  fixed favoriting from notification column
  added workaround for broken favorites
  missing files and a plug for bad favs
  undo test condition
  Added support for qvitter api fetching of notifications
2018-08-18 13:59:13 +03:00
Henry Jameson
c71cc250c5 Merge branch 'fixes-and-tweaks' into shigusegubu
* fixes-and-tweaks:
  Revert "storing entire config instead of each separate thing of it, so that future"
2018-08-18 13:58:04 +03:00
Henry Jameson
03e34e1984 Merge branch 'fixes-and-tweaks' into shigusegubu
* fixes-and-tweaks:
  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.
2018-08-18 13:44:44 +03:00
root
18df7cc6d0 customs 2018-08-18 12:38:36 +02:00
SGSGB
4371f4eb23 Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-08-13 07:53:38 +02:00
SGSGB
275c81dbd3 Merge remote-tracking branch 'origin/feature/accountHighlight' into shigusegubu 2018-08-05 04:50:30 +02:00
SGSGB
5131f3060d Merge remote-tracking branch 'origin/develop' into shigusegubu 2018-08-05 04:50:08 +02:00
Pleroma
be286aff19 shigusegubu 2018-07-06 19:03:02 +02:00
12 changed files with 150 additions and 154 deletions

View file

@ -4,11 +4,8 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
<link rel="icon" type="image/png" href="/favicon.png">
<!-- putting styles here to avoid having to wait for styles to load up -->
<style id="splashscreen">
#webpack-hot-middleware-clientOverlay {
z-index: 9999999999999999999999999999;
}
#splash {
--scale: 1;
width: 100vw;
@ -32,8 +29,8 @@
#splash-credit {
position: absolute;
font-size: 14px;
bottom: 0;
right: 0;
bottom: 16px;
right: 16px;
}
#splash-container {
@ -44,30 +41,25 @@
display: flex;
align-items: flex-end;
justify-content: center;
perspective: 60em;
perspective-origin: 0 -15em;
transform-style: preserve-3d;
}
#mascot:not(.orz) {
margin-bottom: 2em
object-position: 2.5em 0;
}
#mascot-temp.orz {
margin-bottom: 2em
object-position: 2.5em 0;
}
#mascot,
#mascot-temp {
#mascot {
width: calc(10em * var(--scale));
height: calc(8em * var(--scale));
height: calc(10em * var(--scale));
object-fit: contain;
object-position: bottom;
transform: translateZ(-2em);
}
#throbber {
display: grid;
width: calc(5em * 0.5 * var(--scale));
height: calc(8em * 0.5 * var(--scale));
margin-left: 5.1em;
z-index: 2;
grid-template-rows: repeat(8, 1fr);
grid-template-columns: repeat(5, 1fr);
grid-template-areas: "P P . L L"
@ -101,6 +93,7 @@
}
#status {
margin-top: 0.5em;
line-height: 2;
width: 100%;
text-align: center;
@ -108,7 +101,7 @@
@media (prefers-reduced-motion) {
#throbber {
animation: none;
animation: none !important;
}
}
</style>
@ -118,13 +111,13 @@
</head>
<body style="margin: 0; padding: 0">
<noscript>To use Pleroma, please enable JavaScript.</noscript>
<!-- putting styles here to avoid having to wait for styles to load up -->
<div id="splash">
<div id="splash-credit">
<!-- we are hiding entire graphic so no point showing credit -->
<div aria-hidden="true" id="splash-credit">
Art by pipivovott
</div>
<div id="splash-container">
<div id="mascot-container">
<div aria-hidden="true" id="mascot-container">
<div id="throbber">
<div class="chunk" id="chunk-P">
</div>
@ -133,11 +126,12 @@
<div class="chunk" id="chunk-E">
</div>
</div>
<img id="mascot" src="/static/pleromatan_apology_fox.png">
<img id="mascot" src="/static/pleromatan_apology.png">
</div>
<div id="status" class="css-ok">
<!-- (。><) -->
<span class="initial-text">(。&gt;&lt;)</span>
<!-- it's a pseudographic, don't want screenreader read out nonsense -->
<span aria-hidden="true" class="initial-text">(。&gt;&lt;)</span>
</div>
</div>
</div>

View file

@ -937,12 +937,6 @@ option {
}
}
#mascot-container {
perspective: 60em;
perspective-origin: 0 -15em;
transform-style: preserve-3d;
}
#throbber {
animation-duration: 3s;
animation-name: bounce;
@ -950,12 +944,9 @@ option {
animation-direction: normal;
transform-origin: bottom center;
--defaultY: 0;
&.dead {
animation-name: dead;
animation-duration: 3s;
// animation-iteration-count: 1;
animation-duration: 2s;
animation-iteration-count: 1;
transform: rotateX(90deg) rotateY(0) rotateZ(-45deg);
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 KiB

After

Width:  |  Height:  |  Size: 35 B

View file

@ -0,0 +1 @@
../../static/pleromatan_apology.png

Before

Width:  |  Height:  |  Size: 396 KiB

After

Width:  |  Height:  |  Size: 35 B

View file

@ -349,7 +349,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
await setConfig({ store })
document.querySelector('#status').textContent = i18n.global.t('splash.theme')
try {
await store.dispatch('setTheme').catch((e) => { console.log(e) })
await store.dispatch('setTheme').catch((e) => { console.error('Error setting theme', e) })
} catch (e) {
return Promise.reject(e)
}

View file

@ -48,16 +48,6 @@ const i18n = createI18n({
messages.setLanguage(i18n.global, currentLocale)
const splashError = (i18n, e) => {
document.querySelector('#mascot').src = (Math.floor(Math.random() * 2) > 0)
? '/static/pleromatan_orz_fox.png'
: '/static/pleromatan_orz.png'
document.querySelector('#mascot').classList.add('orz')
document.querySelector('#throbber').classList.add('dead')
document.querySelector('#status').textContent = i18n.global.t('splash.error')
console.error('PleromaFE failed to initialize: ', e)
}
const persistedStateOptions = {
paths: [
'serverSideStorage.cache',
@ -68,6 +58,18 @@ const persistedStateOptions = {
};
(async () => {
const isFox = Math.floor(Math.random() * 2) > 0 ? '_fox' : ''
const splashError = (i18n, e) => {
const throbber = document.querySelector('#throbber')
throbber.addEventListener('animationend', () => {
document.querySelector('#mascot').src = `/static/pleromatan_orz${isFox}.png`
})
throbber.classList.add('dead')
document.querySelector('#status').textContent = i18n.global.t('splash.error')
console.error('PleromaFE failed to initialize: ', e)
}
try {
let storageError
const plugins = [pushNotifications]
@ -78,6 +80,7 @@ const persistedStateOptions = {
console.error('Storage error', e)
storageError = e
}
document.querySelector('#mascot').src = `/static/pleromatan_apology${isFox}.png`
document.querySelector('#status').removeAttribute('class')
document.querySelector('#status').textContent = i18n.global.t('splash.loading')
document.querySelector('#splash-credit').textContent = i18n.global.t('update.art_by', { linkToArtist: 'pipivovott' })

View file

@ -56,6 +56,9 @@ const interfaceMod = {
state.temporaryChangesConfirm = () => {}
state.temporaryChangesRevert = () => {}
},
setThemeApplied (state) {
state.themeApplied = true
},
setNotificationPermission (state, permission) {
state.notificationPermission = permission
},
@ -117,9 +120,6 @@ const interfaceMod = {
setPageTitle ({ rootState }, option = '') {
document.title = `${option} ${rootState.instance.name}`
},
setThemeApplied ({ state, rootGetters }) {
state.themeApplied = true
},
settingsSaved ({ commit, dispatch }, { success, error }) {
commit('settingsSaved', { success, error })
},
@ -212,7 +212,7 @@ const interfaceMod = {
setLastTimeline ({ commit }, value) {
commit('setLastTimeline', value)
},
setTheme ({ dispatch, commit, rootState }, { themeName, themeData, recompile, saveData } = {}) {
setTheme ({ commit, rootState }, { themeName, themeData, recompile, saveData } = {}) {
const {
theme: instanceThemeName
} = rootState.instance
@ -230,27 +230,27 @@ const interfaceMod = {
const forceRecompile = forceThemeRecompilation || recompile
let result = null
let promise = null
if (themeData) {
result = normalizeThemeData(themeData)
promise = Promise.resolve(normalizeThemeData(themeData))
} else if (themeName) {
result = normalizeThemeData(getPreset(themeName))
.then(themeData => normalizeThemeData(themeData))
promise = getPreset(themeName).then(themeData => normalizeThemeData(themeData))
} else if (userThemeSource || userThemeSnapshot) {
result = normalizeThemeData({
promise = Promise.resolve(normalizeThemeData({
_pleroma_theme_version: 2,
theme: userThemeSnapshot,
source: userThemeSource
})
}))
} else if (actualThemeName && actualThemeName !== 'custom') {
const themeData = actualThemeName
const realThemeData = normalizeThemeData(themeData)
if (actualThemeName === instanceThemeName) {
// This sole line is the reason why this whole block is above the recompilation check
commit('setInstanceOption', { name: 'themeData', value: { theme: realThemeData } })
}
result = realThemeData
promise = getPreset(actualThemeName).then(themeData => {
const realThemeData = normalizeThemeData(themeData)
if (actualThemeName === instanceThemeName) {
// This sole line is the reason why this whole block is above the recompilation check
commit('setInstanceOption', { name: 'themeData', value: { theme: realThemeData } })
}
return realThemeData
})
} else {
throw new Error('Cannot load any theme!')
}
@ -258,92 +258,96 @@ const interfaceMod = {
// If we're not not forced to recompile try using
// cache (tryLoadCache return true if load successful)
if (!forceRecompile && !themeDebug && tryLoadCache()) {
dispatch('setThemeApplied')
return Promise.resolve()
commit('setThemeApplied')
return
}
const realThemeData = result
const theme2ruleset = convertTheme2To3(realThemeData)
promise
.then(realThemeData => {
const theme2ruleset = convertTheme2To3(realThemeData)
if (saveData) {
commit('setOption', { name: 'theme', value: themeName || actualThemeName })
commit('setOption', { name: 'customTheme', value: realThemeData })
commit('setOption', { name: 'customThemeSource', value: realThemeData })
}
const hacks = []
Object.entries(theme3hacks).forEach(([key, value]) => {
switch (key) {
case 'fonts': {
Object.entries(theme3hacks.fonts).forEach(([fontKey, font]) => {
if (!font?.family) return
switch (fontKey) {
case 'interface':
hacks.push({
component: 'Root',
directives: {
'--font': 'generic | ' + font.family
}
})
break
case 'input':
hacks.push({
component: 'Input',
directives: {
'--font': 'generic | ' + font.family
}
})
break
case 'post':
hacks.push({
component: 'RichContent',
directives: {
'--font': 'generic | ' + font.family
}
})
break
case 'monospace':
hacks.push({
component: 'Root',
directives: {
'--monoFont': 'generic | ' + font.family
}
})
break
}
})
break
if (saveData) {
commit('setOption', { name: 'theme', value: themeName || actualThemeName })
commit('setOption', { name: 'customTheme', value: realThemeData })
commit('setOption', { name: 'customThemeSource', value: realThemeData })
}
case 'underlay': {
if (value !== 'none') {
const newRule = {
component: 'Underlay',
directives: {}
const hacks = []
Object.entries(theme3hacks).forEach(([key, value]) => {
switch (key) {
case 'fonts': {
Object.entries(theme3hacks.fonts).forEach(([fontKey, font]) => {
if (!font?.family) return
switch (fontKey) {
case 'interface':
hacks.push({
component: 'Root',
directives: {
'--font': 'generic | ' + font.family
}
})
break
case 'input':
hacks.push({
component: 'Input',
directives: {
'--font': 'generic | ' + font.family
}
})
break
case 'post':
hacks.push({
component: 'RichContent',
directives: {
'--font': 'generic | ' + font.family
}
})
break
case 'monospace':
hacks.push({
component: 'Root',
directives: {
'--monoFont': 'generic | ' + font.family
}
})
break
}
})
break
}
if (value === 'opaque') {
newRule.directives.opacity = 1
newRule.directives.background = '--wallpaper'
case 'underlay': {
if (value !== 'none') {
const newRule = {
component: 'Underlay',
directives: {}
}
if (value === 'opaque') {
newRule.directives.opacity = 1
newRule.directives.background = '--wallpaper'
}
if (value === 'transparent') {
newRule.directives.opacity = 0
}
hacks.push(newRule)
}
break
}
if (value === 'transparent') {
newRule.directives.opacity = 0
}
hacks.push(newRule)
}
break
}
}
})
})
const ruleset = [
...theme2ruleset,
...hacks
]
const ruleset = [
...theme2ruleset,
...hacks
]
applyTheme(
ruleset,
() => dispatch('setThemeApplied'),
themeDebug
)
applyTheme(
ruleset,
() => commit('setThemeApplied'),
themeDebug
)
})
return promise
}
}
}

View file

@ -28,7 +28,7 @@ function subscribePush (registration, isEnabled, vapidPublicKey) {
if (!vapidPublicKey) return Promise.reject(new Error('VAPID public key is not found'))
const subscribeOptions = {
userVisibleOnly: false,
userVisibleOnly: true,
applicationServerKey: urlBase64ToUint8Array(vapidPublicKey)
}
return registration.pushManager.subscribe(subscribeOptions)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 KiB

View file

@ -1,6 +1,6 @@
{
"alwaysShowSubjectInput": true,
"background": "/static/aurora_borealis.jpg",
"alwaysShowSubjectInput": false,
"background": "/static/sigsegv_s.png",
"collapseMessageWithSubject": false,
"greentext": false,
"hideFilteredStatuses": false,
@ -19,11 +19,13 @@
"postContentType": "text/plain",
"redirectRootLogin": "/main/friends",
"redirectRootNoLogin": "/main/all",
"scopeCopy": true,
"scopeCopy": false,
"showFeaturesPanel": true,
"showInstanceSpecificPanel": false,
"sidebarRight": false,
"subjectLineBehavior": "email",
"theme": "pleroma-dark",
"webPushNotifications": false
"subjectLineBehavior": "noop",
"theme": "sigsegv",
"webPushNotifications": false,
"greentext": true,
"mentionLinkShowYous": true
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 KiB

View file

@ -1,4 +1,6 @@
{
"sigsegv": [ "シグセグV", "#100f32", "#221548", "#e6fcff", "#fe9df8", "#fd3f3f", "#cafeb8", "#9fd3fe", "#ffe96b" ],
"sigsegv2": [ "SigSeg部", "#003238", "#00616c", "#e8f9fb", "#81ffff", "#ff7b66", "#4ae619", "#00ddff", "#ccef53" ],
"pleroma-dark": "/static/themes/pleroma-dark.json",
"pleroma-light": "/static/themes/pleroma-light.json",
"pleroma-amoled": [ "Pleroma Dark AMOLED", "#000000", "#111111", "#b0b0b1", "#d8a070", "#aa0000", "#0fa00f", "#0095ff", "#d59500"],

View file

@ -1,9 +1,9 @@
<img src="/static/logo.svg"/ style="display: block; margin: auto; width: 100%; padding: 20px">
<h4>Terms of Service</h4>
<p>This is the default placeholder ToS. You should copy it over to your static folder and edit it to fit the needs of your instance.</p>
<p>To do so, place a file at <code>"/instance/static/static/terms-of-service.html"</code> in your
Pleroma install containing the real ToS for your instance.</p>
<p>See the <a href='https://docs.pleroma.social/backend/configuration/static_dir/'>Pleroma documentation</a> for more information.</p>
<p>We don't block/silence/suspend any other instances.</p>
<br>
<p>Don't do anything illegal, or else you will be シグストップ'd.</p>
<p>Violator and subject to severe penalties and will be prosecutedt to the full extent of the .</p>
<br>
<p>Admin: Fediverse: hj@shigusegubu.club, hj@pleroma.hjkos.com; Email: pleroma@hjkos.com</p>
<br>
<img src="/static/logo.svg" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />