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 |
|
feld
|
051b9703df
|
Merge branch 'nav-icons' into 'develop'
Add icons to nav panel
See merge request pleroma/pleroma-fe!1016
|
2019-12-12 19:15:14 +00: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 |
|
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
|
386719b0d0
|
fix css runtime loading issue
|
2019-12-12 08:33:40 +05: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 |
|
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 |
|
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 |
|
kPherox
|
9aac873d6b
|
Change output directory of fontello
|
2019-12-05 22:48:41 +09:00 |
|
HJ
|
7b1d5a4f5c
|
Merge branch '701' into 'develop'
Versioning the font resources using webpack
Closes #701
See merge request pleroma/pleroma-fe!1017
|
2019-12-03 20:15:06 +00:00 |
|
taehoon
|
d37caeeded
|
add html-webpack-plugin to karma config
|
2019-12-03 14:40:51 -05:00 |
|
taehoon
|
36589f32d1
|
use another fork of fontello-webpack-plugin
|
2019-12-03 13:26:00 -05:00 |
|
taehoon
|
9d44015ab4
|
add animate-spin class
|
2019-12-03 11:16:38 -05:00 |
|
taehoon
|
57f46e68e4
|
remove needless code
|
2019-12-03 10:34:17 -05:00 |
|
taehoon
|
afd4524c39
|
use another approach for versioning font files
|
2019-12-03 10:32:46 -05:00 |
|
taehoon
|
0082ed837e
|
versioning the font resources through webpack
|
2019-12-02 10:24:43 -05:00 |
|
Shpuld Shpludson
|
5096bff16c
|
Merge branch 'fix/mrf-js-errors' into 'develop'
fix "can't find property of undefined" errors in mrf transparency panel
See merge request pleroma/pleroma-fe!1008
|
2019-12-02 12:20:25 +00:00 |
|
Shpuld Shpludson
|
fa38a41e42
|
fix "can't find property of undefined" errors in mrf transparency panel
|
2019-12-02 12:20:24 +00:00 |
|
Shpuld Shpludson
|
d3adffbefe
|
Merge branch '719' into 'develop'
Fix "Muted users not being collapsed on other user's profiles"
Closes #719
See merge request pleroma/pleroma-fe!1013
|
2019-12-02 12:17:43 +00:00 |
|
Shpuld Shpludson
|
0c6737f336
|
Merge branch '712' into 'develop'
Move mention button right next to mute button
Closes #712
See merge request pleroma/pleroma-fe!1015
|
2019-12-02 12:08:12 +00:00 |
|
taehoon
|
7ebf3602d5
|
move mention button right next to mute button
|
2019-11-26 19:57:27 -05:00 |
|
taehoon
|
40e774e05a
|
restore muted users collapsing logic on other user’s profiles
|
2019-11-25 12:25:01 -05:00 |
|
HJ
|
41d2fa2fd6
|
Merge branch 'i18n/improve-easy-pedantic-japanese-switching-system' into 'develop'
[i18n] Improve easy/pedantic Japanese switching
See merge request pleroma/pleroma-fe!1003
|
2019-11-19 17:02:45 +00:00 |
|
Hakaba Hitoyo
|
55da4462a4
|
[i18n] Improve easy/pedantic Japanese switching
|
2019-11-19 17:02:45 +00:00 |
|
HJ
|
0eda60eeb4
|
Merge branch 'greentext-strikes-back' into 'develop'
⑨ Added greentext support ⑨
Closes #9
See merge request pleroma/pleroma-fe!994
|
2019-11-19 14:22:17 +00:00 |
|
Shpuld Shpludson
|
aa1b812484
|
Merge branch 'iss-149/profile-fields-normalize' into 'develop'
Normalize profile fields
See merge request pleroma/pleroma-fe!995
|
2019-11-19 14:15:41 +00:00 |
|
kPherox
|
a55486f8d7
|
Normalize profile fields
|
2019-11-19 14:15:41 +00:00 |
|
Shpuld Shpludson
|
8b37996805
|
Merge branch 'fix-fetch-follow-request-for-mobile' into 'develop'
Fix follow request for mobile
See merge request pleroma/pleroma-fe!1005
|
2019-11-19 14:07:15 +00:00 |
|
kPherox
|
0995658757
|
backend interactor service: implement startFetchingFollowRequest
backend interactor service: remove unused fetchFollowRequests
|
2019-11-19 14:07:15 +00:00 |
|
Shpuld Shpludson
|
377b8988b6
|
Merge branch 'badge-checkbox' into 'develop'
Show badge visibility user setting checkbox only if needed
See merge request pleroma/pleroma-fe!999
|
2019-11-16 17:36:01 +00:00 |
|
taehoon
|
44cd5ef814
|
show badge visibility user setting checkbox only if needed
|
2019-11-16 12:12:21 -05:00 |
|
Shpuld Shpludson
|
10bb22b5cf
|
Merge branch 'feature/japanese-translation' into 'develop'
Use kana+kanji as default for Japanese translation
See merge request pleroma/pleroma-fe!1001
|
2019-11-16 16:28:12 +00:00 |
|
AkiraFukushima
|
67c95c9d06
|
Use kana+kanji as default for Japanese translation
|
2019-11-17 01:11:19 +09:00 |
|
rinpatch
|
748e9c5203
|
Merge branch 'chore/remove-outdated-changelog' into 'develop'
Remove outdated changelog file
See merge request pleroma/pleroma-fe!1000
|
2019-11-15 19:58:09 +00:00 |
|
rinpatch
|
a9022d0c32
|
Remove outdated changelog file
This hasn't been updated in 2 years and we have CHANGELOG.md now.
|
2019-11-15 22:56:16 +03:00 |
|
rinpatch
|
9a81a61759
|
Merge branch 'patch-1' into 'develop'
Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)
See merge request pleroma/pleroma-fe!998
|
2019-11-15 16:59:20 +00:00 |
|
Mew Mew
|
3ecfbc8ea2
|
Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq)
|
2019-11-15 05:09:01 +00:00 |
|