Commit Graph

416 Commits

Author SHA1 Message Date
Your New SJW Waifu 0a541a8886 it's christmas time 2020-12-05 11:16:54 -06:00
Your New SJW Waifu 9740fc727c happy birthday to me 2020-12-04 07:35:42 -06:00
Your New SJW Waifu 966f47060d Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-12-01 23:51:59 -06:00
Shpuld Shpuldson 767db567ad update emoji.json, add script that merges new emoji from another source 2020-11-30 14:43:39 +02:00
Your New SJW Waifu 429810976d Forgot name 2020-11-19 21:56:26 -06:00
Your New SJW Waifu 4d4f2430e8 add soft-white theme 2020-11-19 21:52:05 -06:00
Your New SJW Waifu 25db3a9ec4 update wavemaster theme 2020-11-19 21:51:16 -06:00
Your New SJW Waifu 71c8a5250b Update banner 2020-11-07 21:04:52 +00:00
Your New SJW Waifu 354b5d9e05 fucking whitespace 2020-11-07 16:26:22 +00:00
Your New SJW Waifu 36d83f862d Theme by @deviant@fedi.absturztau.be 2020-11-07 16:25:07 +00:00
Your New SJW Waifu fee7440831 update banner url 2020-11-06 12:18:25 -06:00
Your New SJW Waifu 446e2b696f update banner link 2020-11-06 10:54:21 -06:00
Your New SJW Waifu d654b590e5 update banner url 2020-11-05 12:19:22 -06:00
Your New SJW Waifu acf5442d62 update banner 2020-11-05 10:15:30 -06:00
Your New SJW Waifu dc02f3a899 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-11-03 18:10:28 -06:00
Your New SJW Waifu b7c65c394f update banner 2020-11-03 18:06:18 -06:00
Henry Jameson 3db218dec1 change logo to svg 2020-11-02 19:37:01 +02:00
Henry Jameson 633349ddff Refactor desktop navbar into a component, change layout to grid for
better compatibility with search field and simpler CSS
2020-10-29 22:54:28 +02:00
Henry Jameson 1b50d700aa bye bye fontello 2020-10-21 00:34:42 +03:00
Your New SJW Waifu 0978ad8a2a spooked 2020-10-13 20:33:05 -05:00
Your New SJW Waifu bdd281ab3d update mod loader 2020-10-12 09:37:31 -05:00
Your New SJW Waifu 49f663a9b8 update banner 2020-09-27 08:25:50 -05:00
Your New SJW Waifu 08d6fee1e7 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-09-17 16:31:48 -05:00
Shpuld Shpuldson 20d33c2fbc change icon to a megaphone 2020-09-16 11:53:54 +03:00
Your New SJW Waifu 82dda03a53 Add contact info 2020-09-07 21:35:44 -05:00
Your New SJW Waifu 8abf059847 Add disclaimer 2020-09-07 10:50:31 -05:00
Your New SJW Waifu e270552af0 Moved text 2020-09-03 21:23:23 -05:00
Your New SJW Waifu e04ad1f26b New banner and link 2020-09-03 20:47:37 -05:00
Your New SJW Waifu c31b7c33fb add stickers provided by @mario 2020-08-11 02:19:54 -05:00
Your New SJW Waifu 3c1d5f7509 add vampire sip 2020-08-10 08:44:17 -05:00
Your New SJW Waifu e4b29b92ba Improved banner by @ddeevviiaanntt@neckbeard.xyz 2020-08-07 01:48:54 -05:00
Your New SJW Waifu 5ef7ed4abe Update banner 2020-08-06 23:42:13 -05:00
Your New SJW Waifu 0d779a6c34 Add kbbs theme by @tk@bbs.kawa-kun.com 2020-07-26 11:16:14 -05:00
Your New SJW Waifu 4d225768fd New banner by @deviant@fedi.absturztau.be 2020-07-16 21:14:01 -05:00
Your New SJW Waifu 8fe3fc19ee update email 2020-07-13 13:14:17 -05:00
Your New SJW Waifu 7e9cbba892 update mod loader 2020-07-12 16:19:00 -05:00
Your New SJW Waifu 646a4f6d50 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-12 12:47:52 -05:00
eugenijm aa2cf51c05 Add Chats 2020-07-08 15:21:31 +03:00
Your New SJW Waifu a65daa3685 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-08 05:45:46 -05:00
Your New SJW Waifu ebd893a3a2 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-07 18:02:58 -05:00
Dym Sohin 1767ee01d0 corrected tos.html location 2020-07-07 19:34:45 +00:00
Shpuld Shpuldson 87b5f828d7 fix conflicts, use file icon instead of link, add support for audio and file icon in cw'd posts 2020-07-06 14:01:03 +03:00
Your New SJW Waifu b2d941e249 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-07-04 18:17:20 -05:00
Eugenij de291e2e33 Add bookmarks
Co-authored-by: jared <jaredrmain@gmail.com>
2020-07-03 19:45:49 +00:00
Your New SJW Waifu 7ab3ab16f1 New banner by @Paradox@niu.moe 2020-07-02 16:54:30 -05:00
Shpuld Shpuldson 96d2c86d3b change placeholders to use descriptions, use icons with placeholders, change uploads to use attachment component 2020-06-29 14:48:22 +03:00
Your New SJW Waifu 04e083e957 delete old stuff that didn't get pushed and update banner 2020-06-20 11:17:20 -05:00
Your New SJW Waifu 53357314f4 clean up static dir 2020-06-20 08:37:15 -05:00
Your New SJW Waifu 892332b489 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-14 17:46:21 -05:00
Your New SJW Waifu 4ca0f2df18 Add fite me sticker 2020-06-14 17:45:07 -05:00
Henry Jameson e4b18deece fix redmond themes 2020-06-13 13:16:53 +03:00
lain fd109fa355 Merge branch 'develop' into 'chore/improve-default-tos'
# Conflicts:
#   static/terms-of-service.html
2020-06-12 14:17:56 +00:00
Your New SJW Waifu c89a5198a5 Add banner by @ddeevviiaanntt@neckbeard.xyz 2020-06-11 07:09:22 -05:00
Your New SJW Waifu c8510a4eed Use bitchute instead 2020-06-09 15:36:07 -05:00
Your New SJW Waifu c657f5955d banner link 2020-06-09 15:28:47 -05:00
Your New SJW Waifu 0707d2a24a New banner 2020-06-09 15:28:13 -05:00
Your New SJW Waifu 0158eae07c New banners by @VD15@fedi.valkyrie.world 2020-06-09 15:25:48 -05:00
Your New SJW Waifu 916cefc15e Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-06-08 10:51:11 -05:00
Your New SJW Waifu 7ea2472f0c fixes 2020-06-03 20:01:22 -05:00
Your New SJW Waifu 14b9217053 Update rule for clairity 2020-06-02 11:53:48 -05:00
Your New SJW Waifu fed73d2adb Revert "Revert "update mod loader""
This reverts commit 5e88bd9a30.
2020-05-28 16:54:40 -05:00
Your New SJW Waifu 5e88bd9a30 Revert "update mod loader"
This reverts commit 4e853a6185.
2020-05-28 16:27:16 -05:00
Your New SJW Waifu 4e853a6185 update mod loader 2020-05-26 16:48:09 -05:00
Henry Jameson a6ca923a76 icons update 2020-05-25 16:10:43 +03:00
Your New SJW Waifu cbd2fc6d0a Add android 10 dark 2020-05-25 11:54:36 +00:00
Your New SJW Waifu 3088859a58 Rename android-10-dark.json 2020-05-25 11:50:38 +00:00
Your New SJW Waifu 60148ce653 Add name to android-10-dark-theme.json 2020-05-25 11:49:40 +00:00
Your New SJW Waifu 8d5152dfbf Android 10 dark theme 2020-05-25 11:47:25 +00:00
Your New SJW Waifu 4ed77453d6 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-20 23:00:42 -05:00
Shpuld Shpludson a8e9c05f09 Merge branch 'feat/sidebar-alignment' into 'develop'
[#765] Permit sidebar alignment with instance configuration option

See merge request pleroma/pleroma-fe!1106
2020-05-20 15:42:42 +00:00
Mark Felder 2135dc8510 Merge branch 'develop' into feat/sidebar-alignment 2020-05-15 12:26:38 -05:00
Mark Felder 840c6f40b6 Merge branch 'develop' into chore/remote-unused-option 2020-05-14 12:22:28 -05:00
Your New SJW Waifu a70741f99b greentext and stuff 2020-05-14 07:06:28 -05:00
Your New SJW Waifu 0e5f2a170a Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-13 21:58:09 -05:00
Mark Felder 0ef5965b3b Add missing settings: disableChat, greentext, hideFilteredStatuses, hideMutedPosts, hidePostStats, hideSitename 2020-05-13 14:52:48 -05:00
Mark Felder 1db2fc3f41 alpha sort 2020-05-13 14:52:21 -05:00
Mark Felder c2bba3f5ad Remove unused noAttachmentLinks option 2020-05-13 14:28:35 -05:00
Mark Felder bc5005b3dd Permit sidebar alignment with instance configuration option 2020-05-12 13:59:52 -05:00
Your New SJW Waifu c4e091f969 Revert "Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard""
This reverts commit 07e9ce3d08.
2020-05-08 20:01:59 -05:00
Your New SJW Waifu 07e9ce3d08 Revert "Merge remote-tracking branch 'upstream/develop' into neckbeard"
This reverts commit 4250541faf
2020-05-09 00:58:11 +00:00
Your New SJW Waifu 4250541faf Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-08 17:38:09 -05:00
Shpuld Shpludson f4676e17d3 Merge branch 'develop' into 'feature/copy-link'
# Conflicts:
#   static/fontello.json
2020-05-08 08:20:03 +00:00
Your New SJW Waifu 8bd8b97d14 New banner URL 2020-05-06 23:20:16 +00:00
Your New SJW Waifu 6f17bf8a45 new stickers 2020-05-06 09:58:28 -05:00
Your New SJW Waifu 550d75a61e commas are a fuck 2020-05-04 14:23:48 -05:00
Your New SJW Waifu 955e7ec49a new stickers 2020-05-04 14:09:23 -05:00
Your New SJW Waifu 74ac1e46b6 new sticker 2020-05-04 13:47:32 -05:00
Your New SJW Waifu e68cc2954e new sticker 2020-05-04 13:26:37 -05:00
Your New SJW Waifu a60475f3d7 Fixed stickers 2020-05-04 13:19:26 -05:00
Your New SJW Waifu 73b613dbb0 New stickers 2020-05-04 13:12:08 -05:00
Your New SJW Waifu 0361a4b308 Merge remote-tracking branch 'upstream/develop' into neckbeard 2020-05-02 10:56:17 -05:00
eugenijm 01b07f01e9 Add support for follow request notifications 2020-04-30 09:58:55 +03:00
Your New SJW Waifu 0a6611c10e added @Hydnellum@sunrisesunset.shop's theme 2020-04-27 20:22:57 -05:00
Your New SJW Waifu a001bcaa5c New banner by @nosleep 2020-04-20 13:55:37 +00:00
Your New SJW Waifu 177b8faa7f loli dance 2020-04-14 19:11:50 -05:00
Your New SJW Waifu c83718ebed Fixed typo 2020-04-14 17:43:10 -05:00
Your New SJW Waifu 0306fd750f Added @jasonl8446's theme 2020-04-14 17:24:53 -05:00
Your New SJW Waifu 44f122a1aa Added alts to 500 page 2020-04-08 12:39:48 -05:00
Your New SJW Waifu 291e49d74d Added works_on_my_machine sticker 2020-04-07 11:49:44 -05:00
Your New SJW Waifu b5de0739de Use original jpeg instead of png 2020-04-06 20:39:31 -05:00