Commit Graph

1551 Commits

Author SHA1 Message Date
DeathStrikeV 717586cee1 Merge pull request #11 from Jiiks/master
Update
2017-02-23 22:38:48 +00:00
Jiiks 23724784e2 Merge pull request #447 from DeathStrikeV/master
More updated emotes =D
2017-02-23 19:41:53 +02:00
DeathStrikeV e26b1db0c4 Updated emotes 2017-02-22 00:41:28 +00:00
DeathStrikeV c687da23fe Updated emotes 2017-02-18 00:15:26 +00:00
DeathStrikeV e509f16648 Updated emotes 2017-02-17 00:32:43 +00:00
DeathStrikeV 1919061656 Updated emotes 2017-02-15 18:47:13 +00:00
Jiiks 90fd6199a1 Merge pull request #446 from jjtcm/master
Add "Profi" to emotefilter
2017-02-14 00:55:39 +02:00
jjtcm d6aabd89ae Add "Profi" to emotefilter 2017-02-13 18:45:55 +01:00
DeathStrikeV 406ced863f Updated emotes 2017-02-12 22:51:38 +00:00
DeathStrikeV 1d9e4753be Merge branch 'master' of github.com:DeathStrikeV/BetterDiscordApp 2017-02-12 21:20:19 +00:00
DeathStrikeV aad61c5281 Updated emotes 2017-02-12 21:05:22 +00:00
DeathStrikeV 3543b57f53 Updated emotes 2017-02-12 15:29:04 +00:00
Jiiks fb927b093a Merge pull request #445 from DeathStrikeV/master
Added "Seriously" to emotesfilter
2017-02-12 16:10:38 +02:00
Jiiks 01cfee0ebd Fixed indent 2017-02-12 16:10:12 +02:00
DeathStrikeV c811e2a064 Added "Seriously" to emotesfilter 2017-02-12 09:25:43 +00:00
DeathStrikeV 92e992abd2 Merge pull request #10 from Jiiks/master
Pull latest changes
2017-02-12 09:04:55 +00:00
Jiiks d8feba59ea deprecate branch 2017-02-12 00:37:49 +02:00
Jiiks 11190a8a4c Merge pull request #288 from sarnex/master
Update Linux support to 0.0.13
2017-02-10 16:00:38 +02:00
Jiiks 143602a729 More case sentivity fixes 2017-02-10 15:58:37 +02:00
Jiiks 713e9e93d3 Fixed case sensitivity for storage file 2017-02-10 15:55:13 +02:00
Jiiks beb013122f Merge pull request #436 from mkody/fix-version-config
Update version of BD in config.json
2017-02-10 15:54:00 +02:00
Jiiks f7fa19dcf8 Conflict merge
https://github.com/Jiiks/BetterDiscordApp/pull/424
2017-02-10 15:52:14 +02:00
Jiiks 44073ed15d Conflict merge
https://github.com/Jiiks/BetterDiscordApp/pull/433
2017-02-10 15:50:16 +02:00
Jiiks 031c64271a Conflict merge
https://github.com/Jiiks/BetterDiscordApp/pull/420
2017-02-10 15:48:56 +02:00
Jiiks 79d9c6f00c Conflict merge
https://github.com/Jiiks/BetterDiscordApp/pull/432
2017-02-10 15:46:12 +02:00
Jiiks 391b6a2085 Merge pull request #426 from Zerthox/patch-5
Add Spooky, Spaghetti, Rucksack, Rein, Moin to emotefilter
2017-02-10 15:42:18 +02:00
Jiiks 0c22d475c3 Merge pull request #438 from SapiensAnatis/patch-1
add 'the'
2017-02-10 15:37:51 +02:00
Jiiks e8e52cf7c6 Merge pull request #442 from brodycas3/master
Add Minecraft to emote filter
2017-02-10 14:52:12 +02:00
Jiiks b6e2ca2670 Merge pull request #443 from NooB-AssassinZ3/patch-1
Fixing error in Linux
2017-02-05 16:38:18 +02:00
NooB-AssassinZ3 e06509ca0a Fixed with install path 2017-02-05 07:12:16 -06:00
NooB-AssassinZ3 cc4df4ada4 FIXING YOUR BLUNDER
SERIOUSLY GUYS. CONSISTENCY
2017-02-05 07:01:54 -06:00
Jiiks de617fed27 Merge pull request #434 from DeathStrikeV/master
Updated emotes
2017-01-31 21:38:50 +02:00
DeathStrikeV 59c931191b Updated emotes 2017-01-31 19:16:17 +00:00
Zerthox ca3859d343 Add Moin 2017-01-31 12:04:23 +01:00
brodycas3 30df5f6158 Update emotefilter.json 2017-01-29 21:23:46 -05:00
DeathStrikeV f15b0dee3d Updated emotes 2017-01-29 22:52:57 +00:00
Nick Sarnie ddda646afc Merge pull request #1 from mkody/fix-mainjs-linux
Change linux path to use the $HOME/.config folder
2017-01-29 12:28:42 -05:00
Nick Sarnie be22c14356
Update Linux support to 0.0.14
Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
2017-01-29 12:27:32 -05:00
MKody f08539d5f9
Fix path to the bdStorage.json for case-sensitive partitions 2017-01-29 12:27:32 -05:00
MKody ef10e075f6
Update version of BD in config.json 2017-01-29 12:27:32 -05:00
MKody c6f85e545f Change linux path to use the $HOME/.config folder 2017-01-29 15:37:51 +01:00
MKody 0f2812bc10 Update version of BD in config.json 2017-01-29 15:37:17 +01:00
Jiiks 513fb57621 Removed garbage 2017-01-28 03:48:36 +02:00
Jiiks 0878f4ab00 Merge pull request #440 from EhsanKia/bttv-update-jan18
Fully update BTTV db, removing ~6k deleted emotes and adding ~14k new ones
2017-01-28 02:42:06 +02:00
DeathStrikeV dc18638567 Updated emotes 2017-01-28 00:05:11 +00:00
noodlebox e793920ed9 Use path for stable release as Linux default 2017-01-26 18:03:52 -06:00
noodlebox b6bdaedb6d Add sane default paths for Linux 2017-01-26 00:24:52 -06:00
noodlebox 3431d30ac2 Add default install path for OSX 2017-01-25 23:04:28 -06:00
DeathStrikeV c74e9c1030 Updated emotes 2017-01-23 00:58:07 +00:00
Jiiks 5daf0bbdc5 Added z-index to minimal mode restore button 2017-01-23 01:43:18 +02:00