Skip to content
This repository has been archived by the owner on Aug 3, 2022. It is now read-only.

DONT MIND THIS #720

Closed
wants to merge 164 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
2d54f62
Added BBaper and GachiPls
f-fsantos Sep 12, 2017
dbd3f5f
Ignores folders and config files in plugins/themes
zerebos Oct 1, 2017
07c7b46
Merge pull request #1 from Jiiks/master
zerebos Oct 27, 2017
1ea7677
test
zerebos Oct 29, 2017
12f6d08
settings
zerebos Oct 29, 2017
bfec7b5
no public
zerebos Oct 29, 2017
84ddea5
defaults
zerebos Oct 29, 2017
0e2a7f2
remove more jquery
zerebos Oct 29, 2017
f9e4d68
textarea stuff
zerebos Oct 29, 2017
1999bad
test
zerebos Oct 29, 2017
7133d14
more tests
zerebos Oct 29, 2017
15b03ef
textarea
zerebos Oct 29, 2017
85fa175
link updates and such
zerebos Oct 29, 2017
d8a2835
fix react errors
zerebos Oct 29, 2017
939b733
fix hash
zerebos Oct 29, 2017
6d862c8
error checking, escaping
zerebos Oct 29, 2017
3ddae1e
friggin hell
zerebos Oct 29, 2017
1417c62
more error checks
zerebos Oct 29, 2017
8a2cda4
escape IDs
zerebos Oct 29, 2017
7897b2c
let's see what breaks
zerebos Oct 29, 2017
770b163
maybe less breaking
zerebos Oct 29, 2017
0187581
start deleting useless spaghetti
zerebos Oct 29, 2017
87ea70c
cleanup
zerebos Oct 29, 2017
8ba8756
more useless code
zerebos Oct 29, 2017
ac2b3f1
more unused code hopefully
zerebos Oct 30, 2017
11edc76
expand dev mode
zerebos Oct 30, 2017
921f058
missed the off
zerebos Oct 30, 2017
9f4981a
I spelled context wrong...
zerebos Oct 30, 2017
f8fea73
fix devmode
zerebos Oct 30, 2017
9a39c15
hopefully finalize devmode
zerebos Oct 30, 2017
37129c3
reenable emote menu
zerebos Oct 30, 2017
e1ba41f
start emote modifiers
zerebos Oct 30, 2017
a6fa031
update css
zerebos Oct 30, 2017
1eed4bb
start fixing plugin api
zerebos Oct 30, 2017
4309890
further test plugin api
zerebos Oct 30, 2017
3ec3b47
fix onMessage
zerebos Oct 30, 2017
1015e35
more devmode stuff
zerebos Oct 30, 2017
e42e2e5
hopefully finalize devmode
zerebos Oct 30, 2017
eeccf6b
changes for onMessage
zerebos Oct 30, 2017
76f7a61
refactor main observer
zerebos Oct 30, 2017
b53c9b0
some fixes for tooltips
zerebos Oct 30, 2017
333c994
settings are disorganized apparently
zerebos Oct 30, 2017
a9f2756
test removing some settings crap
zerebos Oct 30, 2017
4735b69
not the way I thought
zerebos Oct 30, 2017
68e40aa
hecking
zerebos Oct 30, 2017
2a3d7e3
update some css for minimal mode
zerebos Oct 30, 2017
8a34c78
css for minimal mode
zerebos Oct 30, 2017
62fb184
remove more crap and fix emoji menu
zerebos Oct 30, 2017
a9914b4
update error checking
zerebos Oct 31, 2017
6dea1de
man I'm dumb
zerebos Oct 31, 2017
d28f8fc
cleanup plugins/themes loading
zerebos Oct 31, 2017
ad47b4e
pluginModule, themeModule and customcss
zerebos Oct 31, 2017
bcd6705
refactor some pluginModule stuff
zerebos Oct 31, 2017
5119095
add info to plugincards
zerebos Oct 31, 2017
b0f96e0
.,
zerebos Oct 31, 2017
33246a7
anotha one
zerebos Oct 31, 2017
95fc520
adjust error log
zerebos Oct 31, 2017
ca289d2
pluginCard data
zerebos Oct 31, 2017
6ef12b4
continue instead of return
zerebos Oct 31, 2017
088241b
switch back to cdn cause it's easier
zerebos Nov 1, 2017
22d686c
cleanup and change settings inject
zerebos Nov 1, 2017
e77c0ca
remove old settings panel
zerebos Nov 1, 2017
64e04eb
start observer after bd loads
zerebos Nov 1, 2017
a12773e
fucking lack of es6
zerebos Nov 1, 2017
3db3482
start cleanup
zerebos Nov 1, 2017
36ec503
test my understanding of react
zerebos Nov 1, 2017
054a48f
finish restructure of plugin cards
zerebos Nov 1, 2017
e8dff1d
finish cards hopefully
zerebos Nov 1, 2017
85acf96
start switch to V2 switches
zerebos Nov 1, 2017
d0a3762
switches
zerebos Nov 1, 2017
c7fb4ad
switches and settings
zerebos Nov 1, 2017
f92bab3
cleanup cards
zerebos Nov 1, 2017
99bab11
theme module and card
zerebos Nov 1, 2017
43a955d
fix a screwup
zerebos Nov 1, 2017
c212c76
change toggle
zerebos Nov 1, 2017
6bc4b75
scroll settings into view
zerebos Nov 1, 2017
639dc5f
single settingspanel call
zerebos Nov 1, 2017
484fd91
style links
zerebos Nov 1, 2017
fef5272
code cleanup, check for errors
zerebos Nov 3, 2017
2ca6a24
start on loadup errors
zerebos Nov 3, 2017
eb9a873
fix settings for showing errors on load
zerebos Nov 3, 2017
a7afbde
little bit more repo cleanup
zerebos Nov 3, 2017
88b29e5
new modals
zerebos Nov 3, 2017
147b67d
show modal on startup
zerebos Nov 3, 2017
2571a05
pain in my ass self vs this
zerebos Nov 3, 2017
14ba272
add toasts
zerebos Nov 3, 2017
38bf9ac
add stop/start toasts with setting
zerebos Nov 3, 2017
3c62d9e
forgot settings check, add backwards compatibility
zerebos Nov 3, 2017
5b1e895
backwards compat.
zerebos Nov 3, 2017
6359170
I fucked up
zerebos Nov 3, 2017
bbe3caf
update toasts
zerebos Nov 3, 2017
43f99ac
smooth scroll on settings panel
zerebos Nov 3, 2017
28174e5
Fix 24 hour and add react instance stuff
zerebos Nov 4, 2017
d906826
add error checking locally
zerebos Nov 4, 2017
303a2d4
update 24hour and colored text
zerebos Nov 4, 2017
23685f6
test minification
zerebos Nov 4, 2017
2db5607
fixed a string
zerebos Nov 4, 2017
988af4f
link back to minified versions
zerebos Nov 4, 2017
cb733f5
Add fix for emote data and load custom css
zerebos Nov 9, 2017
df2c803
forgot atob
zerebos Nov 9, 2017
38f7997
Revert "forgot atob"
zerebos Nov 9, 2017
0f2e8c9
atob
zerebos Nov 9, 2017
542d794
readd old files and fix onSwitch
zerebos Nov 17, 2017
6985c24
some cleanup
zerebos Nov 17, 2017
b30eaea
update installer
zerebos Dec 19, 2017
e920f40
update installer for canary changes
zerebos Dec 20, 2017
8de7ae7
check for people with bad internet
zerebos Dec 20, 2017
bf93547
grab react from webpack modules
zerebos Dec 22, 2017
bdec1a3
Updates for emotes, devmode, plugin settings
zerebos Dec 22, 2017
b628cbf
forgot to make settingspanel a member
zerebos Dec 22, 2017
98fe8c2
Lots of updates, some features
zerebos Dec 24, 2017
8a7b7b1
change emote system and custom css
zerebos Jan 9, 2018
6e69876
Exclude short emotes
zerebos Jan 9, 2018
1d89fb9
Few bug fixes
zerebos Jan 9, 2018
1a6db9e
fix some more emote crap
zerebos Jan 9, 2018
af3124b
new customcss editor and fix for canary
zerebos Jan 10, 2018
089741a
update some files
zerebos Jan 13, 2018
de3d0b9
minor emotes stuff
zerebos Jan 20, 2018
80bedb0
forgot to minify
zerebos Jan 23, 2018
d604610
rebrand as BandagedBD
zerebos Feb 5, 2018
2250bf1
backwards support for emote plugins
zerebos Feb 13, 2018
8533d76
toast setting affects emotes
zerebos Feb 13, 2018
7fdd27e
public servers and emotes stuff
zerebos Feb 28, 2018
964c5bf
emote stuff
zerebos Mar 12, 2018
261c914
hopefully fix emotes and copy selector
zerebos Mar 15, 2018
2f71d66
update for ffz emotes
zerebos Mar 16, 2018
6abe7fc
more emote stuff
zerebos Mar 16, 2018
b8df86c
update blacklist aka fuck FFZ
zerebos Mar 17, 2018
50fe3a4
overhaul public servers
zerebos Mar 29, 2018
bff16ce
fix close button
zerebos Mar 30, 2018
ffa43c7
hotfix for plugins page
zerebos Mar 30, 2018
9fceef4
minor performance boost
zerebos Apr 6, 2018
401f14c
fix observer am dumb
zerebos Apr 6, 2018
697db70
emotes for heathen compact mode
zerebos Apr 7, 2018
b6e9ab4
revert ffz data
zerebos Apr 15, 2018
209f5f7
move away from cookies
zerebos Apr 15, 2018
88706de
fix emote download & speed up startup
zerebos Apr 15, 2018
9ab8ac0
emotes are the bane of my existence
zerebos Apr 16, 2018
90800c1
hotfix for emote menu
zerebos Apr 25, 2018
f7747eb
go fuck yourself discord
zerebos Apr 28, 2018
532b605
scrolling & fuck discord devs
zerebos Apr 28, 2018
c776f7c
update blacklist
zerebos May 3, 2018
1437ea0
fix css hopefully
zerebos May 5, 2018
16219b5
Update main.js
intrnl May 5, 2018
2b07e8c
Merge pull request #4 from intrnl/patch-1
zerebos May 5, 2018
1948e35
more classes and alerts
zerebos May 5, 2018
be2085b
blame intrnl
zerebos May 5, 2018
e328a7f
fix webpack for canary
zerebos May 19, 2018
2cdaf11
add setting to stop downloading emotes
zerebos May 22, 2018
10f3e2b
small fix for ratelimiting issues
zerebos Jun 3, 2018
8961f58
async setting save
zerebos Jun 16, 2018
5d5c4a1
nvm
zerebos Jun 16, 2018
002984a
add class normalizer
zerebos Jun 21, 2018
e4e2209
Merge pull request #9 from XGSleepWalker/master
zerebos Jun 23, 2018
37de4b1
normalize normal classes too
zerebos Jun 23, 2018
222c2c7
fix normalizer
zerebos Jun 26, 2018
ba5fc86
return of public servers
zerebos Jun 28, 2018
ca4a586
fix for canary + ptb
zerebos Jun 28, 2018
33cb8c8
some css and a class
zerebos Jun 28, 2018
6234234
you're welcome uri
zerebos Jun 30, 2018
b46d6ec
fix emotes for canary
zerebos Jul 17, 2018
1371a89
update for some crashing issues
zerebos Jul 19, 2018
4884444
another attempt
zerebos Jul 19, 2018
bf8b1d2
update fallback hash
zerebos Jul 19, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix hash
  • Loading branch information
zerebos committed Oct 29, 2017
commit 939b733aefde96a1bbb697fa5e810a379c7c37bc
4 changes: 2 additions & 2 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ function EmoteModule() {}
EmoteModule.prototype.init = function () {};

EmoteModule.prototype.getBlacklist = function () {
$.getJSON("https://rauenzi.github.io/BetterDiscordApp/" + _hash + "/data/emotefilter.json", function (data) {
$.getJSON("https://rauenzi.github.io/BetterDiscordApp/data/emotefilter.json", function (data) {
bemotes = data.blacklist;
});
};
Expand Down Expand Up @@ -2403,7 +2403,7 @@ Utils.prototype.loadHtml = function (html, callback) {
}).appendTo("body");

//TODO Inject these in next core update
html = '//rauenzi.github.io/BetterDiscordApp/' + _hash + '/html/' + html + '.html';
html = '//rauenzi.github.io/BetterDiscordApp/html/' + html + '.html';

container.load(html, callback());
};
Expand Down