Commit graph

4051 commits

Author SHA1 Message Date
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 !1032
2019-12-12 14:43:48 +00:00
HJ
c7376b8325 Merge branch 'support-native-captcha' into 'develop'
Support "native" captcha

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

Closes #734

See merge request pleroma/pleroma-fe!1030
2019-12-12 12:23:01 +00:00
Egor Kislitsyn
ed3144eb11 Support "native" captcha 2019-12-12 18:19:46 +07:00
lain
c2c48ec25c Merge branch 'revert-96cab6d8' into 'develop'
Revert "Merge branch 'oauth-extra-scopes' into 'develop'"

See merge request pleroma/pleroma-fe!1032
2019-12-12 09:42:41 +00:00
lain
b399235848 Revert "Merge branch 'oauth-extra-scopes' into 'develop'"
This reverts merge request !1024
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
seven
d7bc1aff1d fix babelrc plugin config 2019-12-12 06:35:48 +05:00
Henry Jameson
63a5f50e7c fix deletes causing errors 2019-12-11 18:20:43 +02:00
HJ
3cc6f80628 Merge branch 'hideSitename' into 'develop'
Hide instance url/link/text in header using hideSitename instance option

See merge request pleroma/pleroma-fe!1018
2019-12-11 15:59:46 +00:00
taehoon
fee3226705 add documentation for new instance option 2019-12-11 10:14:31 -05:00
taehoon
d0c78989aa hide instance url/link/text in header using hideSitename option 2019-12-11 10:14:30 -05:00
rinpatch
abb6747f43 Merge branch 'fix/mfa_routes' into 'develop'
fixed typo

See merge request pleroma/pleroma-fe!1027
2019-12-11 13:14:40 +00: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 pleroma/pleroma-fe!1024
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
seven
cb92865dac upgrade babel-register 2019-12-11 14:22:11 +05:00
seven
e6d5b9c0bb update babelrc 2019-12-11 14:21:06 +05:00
seven
424e78891a upgrade babel-plugin-transform-runtime 2019-12-11 14:19:56 +05:00
seven
773fa454be upgrade babel-plugin-lodash 2019-12-11 14:02:51 +05:00
seven
c141c7a753 babel-plugin-add-module-exports is not necessary for babel v7 2019-12-11 14:01:53 +05:00
seven
d79dfb9495 upgrade babel-plugin-transform-vue-jsx 2019-12-11 14:00:36 +05:00
seven
a5cce10a7d update babelrc presets config 2019-12-11 13:56:53 +05:00
seven
4f9aba1a7c upgrade babel preset 2019-12-11 13:56:08 +05:00
seven
1af536d68f upgrade Babel core to v7 2019-12-11 13:52:03 +05: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
HJ
e60d9f2d5a Merge branch 'fix/remove-status-hack' into 'develop'
Remove whitespace hack on empty post content

See merge request pleroma/pleroma-fe!1023
2019-12-08 13:00:21 +00: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
Wyatt Benno
01855f315c Wording updates 2019-12-06 09:38:55 +09:00
HJ
4e24ce2185 Merge branch 'fix-font-load-for-pleroma-be' into 'develop'
Change output directory of fontello

Closes pleroma-support#14

See merge request pleroma/pleroma-fe!1021
2019-12-05 13:53:04 +00:00