Commit Graph

4224 Commits

Author SHA1 Message Date
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
kPherox 9aac873d6b
Change output directory of fontello 2019-12-05 22:48:41 +09:00
Your New SJW Waifu 4e2c81ba2c Birthday over back to christmas 2019-12-05 01:12:37 -06:00
Wyatt Benno 13fc2612ae Change 403 messaging 2019-12-05 11:48:37 +09:00
Your New SJW Waifu 78bae97994 Happy birthday to me! Added banner by ddeevviiaanntt and changed link. 2019-12-04 00:24:06 -06: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
Your New SJW Waifu 46f8af35d5 Merge remote-tracking branch 'upstream/develop' into develop 2019-12-02 21:10:00 -06: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
Your New SJW Waifu ea8b6e7439 oops 2019-11-24 19:21:17 -06:00
Your New SJW Waifu 17265f65c9 Change reactions name 2019-11-24 18:57:16 -06:00
Your New SJW Waifu 153cf0a03c Add another christmas background 2019-11-24 18:43:41 -06:00
Your New SJW Waifu 04c3125028 Add another christmas background 2019-11-24 18:38:35 -06:00
Your New SJW Waifu 0e3d67ce48 Remove tall ass image for now 2019-11-24 18:26:04 -06:00
Your New SJW Waifu 22265f47bf Fix typo 2019-11-24 18:24:23 -06:00
Your New SJW Waifu 2dbd0f14dd Fix sticker picker 2019-11-24 18:20:25 -06:00
Your New SJW Waifu 1508b44ca9 Add christmas background 2019-11-24 17:58:18 -06:00
Your New SJW Waifu eb78126559 Add stickers 2019-11-24 17:30:28 -06:00
Henry Jameson 172ebaf4e6 improved initial notifications fetching 2019-11-24 22:01:12 +02:00
Your New SJW Waifu 7d12e13b47 Update config.js 2019-11-24 17:08:09 +00:00
Your New SJW Waifu f7a39696ac Update config.js 2019-11-24 17:06:49 +00:00
Your New SJW Waifu 2c3327f0ad Update config.js 2019-11-24 16:55:55 +00:00
Your New SJW Waifu e4cc314b0f Don't crop attachments 2019-11-24 16:51:10 +00:00
Henry Jameson 319bb4ac28 initial streaming work 2019-11-24 18:50:28 +02:00
Your New SJW Waifu 3442020d1b Revert "Change formatting"
This reverts commit ef1143db8d
2019-11-24 16:37:16 +00:00
Your New SJW Waifu ef1143db8d Change formatting 2019-11-24 16:34:19 +00:00
Henry Jameson ddb6fb9217 Backend Interactor service overhaul, removed the need for copypasting 2019-11-24 13:57:46 +02:00
Your New SJW Waifu 07b28d79ae Add more compressed waste_collection and use it for background 2019-11-23 12:11:40 -06:00
Your New SJW Waifu 8f0051cab6 Change background and test serving background, logo and nsfw warning from /media/ 2019-11-22 23:10:08 -06:00
Your New SJW Waifu 97c7e993f7 Update config.json 2019-11-21 18:36:05 +00:00
Your New SJW Waifu 3743ad175d Update styles.json 2019-11-21 18:35:08 +00:00
Your New SJW Waifu 65b5073564 Change default theme to Electra 2019-11-21 18:12:29 +00:00
Your New SJW Waifu 0cbf3e249a Enable greentext by default 2019-11-21 18:08:40 +00:00
Your New SJW Waifu 1e7f82a15c Hide posts from muted users by default 2019-11-21 18:07:24 +00:00
Your New SJW Waifu 04d825fdc0 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-19 14:40:21 -06:00