Commit graph

3388 commits

Author SHA1 Message Date
lain
73253b87bf Merge branch 'feat/emoji-reactions' into 'develop'
Emoji reactions

See merge request 
2020-01-28 15:24:56 +00:00
Shpuld Shpuldson
6afff4f8c2 review changes 2020-01-28 17:09:25 +02:00
eugenijm
566f013ac4 Fix password and email update 2020-01-28 06:12:32 +03:00
Henry Jameson
b63e679a31 removed one color TODO 2020-01-28 02:03:21 +02:00
Henry Jameson
526b43eba6 Kenomo (see: ) theme. Ability to define link color for post contents. Fixes 2020-01-28 01:29:20 +02:00
Henry Jameson
18ca2a035b fix rgba function, whoops 2020-01-28 00:26:10 +02:00
Shpuld Shpuldson
e6291e4ee1 remove unnecessary anonymous function 2020-01-27 18:43:26 +02:00
Shpuld Shpuldson
e4e3a28838 remove logs/commented code 2020-01-27 15:49:05 +02:00
Henry Jameson
5313833d80 lint 2020-01-27 04:24:00 +02:00
Henry Jameson
7c074b8741 fix rgba css generation, add some tests to automatically verify that themes are
generated properly
2020-01-27 04:20:13 +02:00
Shpuld Shpuldson
0de627baae remove favs count from react button 2020-01-26 16:18:57 +02:00
Shpuld Shpuldson
c4beac5f89 Merge branch 'develop' into feat/emoji-reactions 2020-01-26 15:59:59 +02:00
Shpuld Shpuldson
7cfe1b05e8 remove mock data 2020-01-26 15:57:40 +02:00
Shpuld Shpuldson
a018ea622c change emoji reactions to use new format 2020-01-26 15:45:12 +02:00
Henry Jameson
d7e7f47b66 fix transparent color not affecting downstream slots 2020-01-24 00:56:47 +02:00
Henry Jameson
75fa07626d fix icons in menus 2020-01-24 00:39:21 +02:00
Henry Jameson
b96993e4dd improved selectedMenu again 2020-01-24 00:36:32 +02:00
Henry Jameson
53576df72a popover/selected menu improvements 2020-01-24 00:02:16 +02:00
eugenijm
2c61eb8e7f Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE) 2020-01-24 00:55:13 +03:00
Henry Jameson
f7ea12c905 separate actual theme data from theme framework 2020-01-23 23:37:58 +02:00
Henry Jameson
c1f2457112 revert fgText -> text after some consideration. case was fixed already in other way 2020-01-23 22:48:32 +02:00
Henry Jameson
f85a3e3f6d style the dropdown menus better 2020-01-23 22:42:59 +02:00
Henry Jameson
c752f56d0b v l1 compatibility 2020-01-23 22:26:49 +02:00
Henry Jameson
a69723badf fix snapshot mismatch message for file 2020-01-23 22:04:05 +02:00
Mark Felder
9d8dbd8340 Fix missing TWKN when logged in, but server is set to private mode. 2020-01-23 12:00:50 -06:00
Henry Jameson
64fc07f080 removed unused constant, using getOpacitySlot now 2020-01-23 00:36:38 +02:00
Henry Jameson
7354b6f706 fixed get(Layer|Opacity)Slot not working properly which broke Mojave theme 2020-01-23 00:35:56 +02:00
Henry Jameson
8de7eabd8f v2 compatibility fixes 2020-01-22 23:26:24 +02:00
Henry Jameson
c7f42b7799 made it actually work, the forceSnapshot 2020-01-22 02:53:40 +02:00
Henry Jameson
d98e31af45 snapshot/source mismatch case 2020-01-22 02:44:39 +02:00
Henry Jameson
c1e3632f42 fix shadows not being valid from the get-go 2020-01-22 02:15:47 +02:00
Henry Jameson
644ce497a0 lightBg -> highlight because it causes issues with v2 2020-01-22 01:28:46 +02:00
Henry Jameson
803edcb53a dismiss warning when loading theme 2020-01-22 01:28:17 +02:00
Henry Jameson
1191207aa5 more help strings 2020-01-22 00:53:51 +02:00
Henry Jameson
9336140486 massively improved initial theme loading code, added checks and warnings when
loading theme files (import/localStorage/defaults)
2020-01-22 00:37:19 +02:00
lain
8080981fcd Fix follower request fetching 2020-01-21 16:51:49 +01:00
Henry Jameson
93dfb4d352 fix shadow picker preview, change hint 2020-01-20 02:00:13 +02:00
Henry Jameson
a7b6c79136 eslint 2020-01-20 01:45:48 +02:00
Henry Jameson
2b36a62c56 fix tests, integrate depenentless sorting into toposort for easier testing and
better guarantees
2020-01-20 01:44:11 +02:00
Henry Jameson
6e1c538e41 multiple fixes to make style switcher not die. Made shadows work, incuding compatibility 2020-01-20 01:31:54 +02:00
Henry Jameson
6a3714fcc6 Checked contrast rating errors 2020-01-20 00:37:45 +02:00
Henry Jameson
e4033c85e2 removed console logs 2020-01-20 00:34:49 +02:00
Henry Jameson
7d7ccf7298 fix some contrast ratios not displaying 2020-01-19 22:44:35 +02:00
Henry Jameson
62343f6099 documentation 2020-01-19 20:59:54 +02:00
Henry Jameson
f77d675434 optimized theme loading so that it wouldn't wait until ALL themes are loaded to
select one by default
2020-01-17 00:27:46 +02:00
Henry Jameson
24a7a9bfd8 lint 2020-01-16 23:30:13 +02:00
Henry Jameson
c351e5124c fix selectedPost/selectedMenu 2020-01-16 23:28:42 +02:00
Henry Jameson
552d13a060 better fallback for transparent colors 2020-01-16 23:09:46 +02:00
Henry Jameson
8536f3cc32 small fix 2020-01-16 21:59:06 +02:00
Henry Jameson
e070ec4b66 more opacity handling 2020-01-16 21:34:33 +02:00
Henry Jameson
f16ec75c70 opacity handling 2020-01-16 20:53:05 +02:00
Shpuld Shpludson
7a013ac393 Implement domain mutes v2 2020-01-15 20:22:54 +00:00
Shpuld Shpludson
e3de2964cc Merge branch '736' into 'develop'
Fix "Follow button is out of sync in the about page"

Closes 

See merge request 
2020-01-15 18:40:45 +00:00
Shpuld Shpludson
662afe973a Fix , fix error messages and captcha resetting 2020-01-14 13:45:00 +00:00
Shpuld Shpludson
86380f0429 Optimize Notifications Rendering 2020-01-14 13:28:57 +00:00
Shpuld Shpuldson
910b82e231 Use last seen notif instead of first unseen notif for sinceId 2020-01-14 11:13:59 +02:00
Shpuld Shpuldson
b10b92a876 clean up code, fix prediction bug 2020-01-14 10:06:14 +02:00
Shpuld Shpuldson
b32888194c fix merge conflicts 2020-01-13 23:47:32 +02:00
Shpuld Shpuldson
33abbed5a1 usable-but-buggy: picker, adding/removing reaction on click, search, styles 2020-01-13 23:34:39 +02:00
Henry Jameson
c3cd66335f i18n & fixes 2020-01-13 22:26:31 +02:00
Henry Jameson
9f7af191e8 tabs & toggled (ex pressed) buttons 2020-01-13 22:19:19 +02:00
Henry Jameson
4b8e0f0afa buttonPressed & buttonDisabled slots 2020-01-13 21:30:55 +02:00
Henry Jameson
8a7f3fc16a selectedPost and selectedMenu support 2020-01-13 20:40:16 +02:00
Henry Jameson
29a0b4a593 fix shadow and opacity 2020-01-13 02:08:39 +02:00
Henry Jameson
9943e1cc43 removed references to v3compat 2020-01-13 02:02:31 +02:00
Henry Jameson
8d2f2866f6 computed colors support 2020-01-13 01:56:29 +02:00
Henry Jameson
5881c13adc computed color display support in color_input 2020-01-13 01:55:10 +02:00
Henry Jameson
fa2fcc8827 better fallbacks in UI 2020-01-13 01:54:56 +02:00
Henry Jameson
8f63bbb64f poll slot renamed, lightBg customization implemented 2020-01-13 00:33:04 +02:00
Henry Jameson
40ba3e2252 added more slots to UI 2020-01-12 23:41:11 +02:00
Henry Jameson
3492d7f81e eslint 2020-01-12 17:59:41 +02:00
Henry Jameson
39dd08e694 replace hsl's l with relative luminance for better lightness detection 2020-01-12 17:58:26 +02:00
Henry Jameson
88f83fc9fa overhaul how style-switcher makes state, removed tons of copy-paste 2020-01-12 17:46:07 +02:00
Henry Jameson
d52d181227 more fixes 2020-01-12 15:04:05 +02:00
Henry Jameson
4418baf62a fix 2020-01-12 04:16:04 +02:00
Henry Jameson
d342f32a94 fix 2020-01-12 04:05:26 +02:00
Henry Jameson
1aea1f217e remove debug 2020-01-12 04:01:31 +02:00
Henry Jameson
a9a1fc37f5 fixes, cleanup 2020-01-12 04:00:41 +02:00
Henry Jameson
622c9d388e Refactoring, forgotten files 2020-01-12 03:44:06 +02:00
Henry Jameson
38f2b969e4 simplified definition for text color by accounting for layers automatically,
fixed badge notification text color by adding 'bw' option for textColor
2020-01-11 23:07:41 +02:00
Henry Jameson
cce64077b5 Refactored style_setter to be more declarative instead of walls of copypasted code 2020-01-06 22:55:14 +02:00
HJ
215662afde Merge branch 'develop' into 'fix-move-type-notification'
# Conflicts:
#   static/fontello.json
2020-01-03 09:05:48 +00:00
Henry Jameson
a2f676d317 Improved ColorInput to showcase transparent color, improved global input styles
a bit
2020-01-02 23:48:52 +02:00
Henry Jameson
c7e9f21da0 color input and opacity input now use Checkbox component. Cleanup. 2020-01-02 22:44:54 +02:00
Henry Jameson
adbab6ad2a added optional checkbox for opacity, similar to color input 2020-01-02 21:36:01 +02:00
Henry Jameson
4bb1c98e0f Replaced v3compat with source to reduce code complexity. Made more slots
customizable. `theme` now contains a snapshot of theme generated for better
compatiblity and future-proofing
2020-01-02 20:36:10 +02:00
Wyatt Benno
816c077c4f mfa fix 2019-12-30 19:27:44 +09:00
Henry Jameson
332d31dc02 support for "transparent" color keyword 2019-12-30 00:45:48 +02:00
Henry Jameson
6e11924c27 underlay customization, updated contrast calculations to account for alpha blending 2019-12-28 18:49:35 +02:00
Henry Jameson
1a78461443 fixed import-export 2019-12-28 17:02:34 +02:00
Henry Jameson
e5a34870f0 Accent works 2019-12-28 15:55:42 +02:00
Henry Jameson
bd07e5de1c unify showimmideately 2019-12-26 14:35:46 +02:00
Henry Jameson
43197c4243 Some error handling 2019-12-26 14:12:35 +02:00
Henry Jameson
b619477573 Merge remote-tracking branch 'upstream/develop' into streaming
* upstream/develop: (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 12:47:51 +02:00
taehoon
4e4c4af422 toggle_activation api is also deprecated 2019-12-15 14:32:04 -05:00
taehoon
36376ce57c use vuex action 2019-12-15 14:32:04 -05:00
taehoon
45e7f93c49 refactor toggleActivationStatus 2019-12-15 14:32:04 -05:00
taehoon
506822bed0 replace setActivationStatus api with new one 2019-12-15 14:32:04 -05:00
taehoon
54f692622a wire up staff accounts with correct store data 2019-12-15 14:30:09 -05:00
HJ
b739edb509 Merge branch 'fix-sticker-height' into 'develop'
fix sticker picker height in emojo picker

See merge request 
2019-12-15 17:59:27 +00:00
32d7a49b9d use flex for stickers 2019-12-15 17:58:37 +01:00
HJ
c1a0e23947 Merge branch 'revert-c2c48ec2' into 'develop'
Reinstate `push` and `admin` scopes

See merge request 
2019-12-14 14:12:41 +00:00
1cba6c56f0 i18n/update-ja_easy 2019-12-13 17:05:13 +00:00
749a399944 Merge branch 'issue_124' into 'develop'
Change 403 messaging

See merge request 
2019-12-13 17:02:09 +00:00
0b49e798e0 Merge branch 'feature/lockdown-timelines-private-mode' into 'develop'
interaction with BE private mode

See merge request 
2019-12-13 16:58:29 +00:00
HJ
766a674a48 Merge branch 'upgrade-babel' into 'develop'
Upgrade babel to v7

Closes 

See merge request 
2019-12-13 10:21:29 +00:00
HJ
9789123b1c Merge branch 'mfa/login_form' into 'develop'
mfa: fix login and recovery form

See merge request 
2019-12-13 10:18:50 +00:00
Mark Felder
d899d06973 Use a centralized fallback for missing values and use instance.federating instead of
instance.federation.enabled
2019-12-12 15:29:50 -06:00
Mark Felder
8d14036a23 Add fallback in case BE does not report federating status in nodeinfo 2019-12-12 15:17:23 -06:00
Mark Felder
0743fbb28b The value we are looking for is federationPolicy.enabled, not federationPolicy.federating
Also the || true fallback does not work and always becomes true
2019-12-12 13:56:07 -06:00
Mark Felder
2514dc183f Logic should be to hide TWKN if not federating OR if instance is not public
Private instances should not show any timelines
2019-12-12 13:51:50 -06:00
Mark Felder
7ddd5af081 Finally trust eslint 2019-12-12 13:46:07 -06:00
Mark Felder
afe5b3a82d More lint 2019-12-12 13:41:52 -06:00
Mark Felder
211d25cd5a More lint 2019-12-12 13:39:18 -06:00
Mark Felder
3eeb3dc572 Lint 2019-12-12 13:37:32 -06:00
Mark Felder
821a2bcc68 Merge branch 'develop' into feature/lockdown-timelines-private-mode 2019-12-12 13:32:52 -06:00
Maksim Pechnikov
addacf36d1 mfa: removed unused code 2019-12-12 21:19:13 +03:00
Henry Jameson
585702b1ce fix desktop notifications not working with streaming 2019-12-12 18:53:36 +02:00
taehoon
a412b53801 increase icon width a little bit in the nav panel 2019-12-12 10:42:27 -05:00
taehoon
7fa294f11c add icons to nav panel 2019-12-12 10:42:27 -05:00
Ivan Tashkinov
341416b0e0 Revert "Merge branch 'revert-96cab6d8' into 'develop'"
This reverts merge request 
2019-12-12 14:43:48 +00:00
HJ
c7376b8325 Merge branch 'support-native-captcha' into 'develop'
Support "native" captcha

See merge request 
2019-12-12 12:24:35 +00:00
HJ
a621382a3f Merge branch 'load-button-fix' into 'develop'
Fix css runtime loading issue

Closes 

See merge request 
2019-12-12 12:23:01 +00:00
Egor Kislitsyn
ed3144eb11 Support "native" captcha 2019-12-12 18:19:46 +07:00
lain
b399235848 Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
This reverts merge request 
2019-12-12 09:38:24 +00:00
seven
b973ee5915 must use h in higher babel-plugin-transform-vue-jsx 2019-12-12 12:13:31 +05:00
Maksim Pechnikov
f70fe28f64 mfa: fix login and recovery form 2019-12-12 08:42:21 +03:00
seven
386719b0d0 fix css runtime loading issue 2019-12-12 08:33:40 +05:00
Henry Jameson
63a5f50e7c fix deletes causing errors 2019-12-11 18:20:43 +02:00
taehoon
d0c78989aa hide instance url/link/text in header using hideSitename option 2019-12-11 10:14:30 -05:00
Maksim Pechnikov
d6dc2bad1f fixed typo 2019-12-11 15:59:29 +03:00
rinpatch
96cab6d811 Merge branch 'oauth-extra-scopes' into 'develop'
OAuth 'push' and 'admin' scopes support

See merge request 
2019-12-11 09:57:32 +00:00
kPherox
c3e7806acb
remove unused fallback 2019-12-11 18:48:18 +09:00
kPherox
b4acbf5311
Add user migrates filter to interactions 2019-12-11 18:30:26 +09:00
kPherox
e8333fff8d
change the expression of move 2019-12-11 18:30:23 +09:00
Henry Jameson
6acd889589 Option to enable streaming 2019-12-10 21:30:27 +02:00
kPherox
31aa177eea
Fix target account link 2019-12-11 04:02:25 +09:00
kPherox
6af870cd90
Add view for moves notifications 2019-12-11 00:00:45 +09:00
kPherox
2bc63720a5
fix parse for move type notifications 2019-12-11 00:00:36 +09:00
7e3a4fa8ec fix invisible tab-switcher in emoji picker 2019-12-09 22:16:51 +01:00
f6d8f245e6 Revert "fix sticker picker height in emojo picker"
This reverts commit 914c783984.
2019-12-09 22:15:38 +01:00
Wyatt Benno
8ee8033955 Set error data 2019-12-09 10:31:57 +09:00
Wyatt Benno
1a043d4350 remove console 2019-12-09 09:11:31 +09:00
Wyatt Benno
e86af0c965 Change naming, make more general 2019-12-09 09:02:34 +09:00
Henry Jameson
505fb26061 better wrapper for websocket 2019-12-08 19:18:38 +02:00
Henry Jameson
1b1620a755 Merge remote-tracking branch 'upstream/develop' into streaming
* upstream/develop:
  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
2019-12-08 16:07:30 +02:00
Henry Jameson
ff95d865d2 Updated streaming and improved error-handling, some more refactoring to api 2019-12-08 16:05:41 +02:00
Ivan Tashkinov
a06705d939 Added OAuth 'push' and 'admin' scopes. 2019-12-08 13:52:26 +03:00
rinpatch
3b11860d34 Remove whitespace hack on empty post content
It's no longer necessary since the backend handles posts with empty
content fine and also fixes an odd whitespace when attachment links are
disabled.
2019-12-08 02:05:50 +03:00
Absturztaube
914c783984 fix sticker picker height in emojo picker 2019-12-07 10:29:53 +01:00