Commit Graph

245 Commits

Author SHA1 Message Date
Jiiks acc5d4c305 getJson != getJSON 2015-11-01 13:51:34 +02:00
Jiiks 6e741ba652 Merge pull request #27 from Jiiks/beta
Beta
2015-11-01 13:45:16 +02:00
Jiiks 692ecc3452 Load emote blacklist from github 2015-11-01 13:44:25 +02:00
Jiiks 2ebf47f5a3 Emotefilter 2015-11-01 13:38:59 +02:00
Jiiks f95ecc12e3 Get latest commit hash 2015-11-01 13:37:04 +02:00
Jiiks 0121c00a2c Merge remote-tracking branch 'refs/remotes/origin/master' into beta 2015-11-01 13:30:16 +02:00
Jiiks b32e503dbf Separate splice position per os 2015-11-01 00:25:05 +02:00
Jiiks c61323a577 Merge pull request #24 from Candunc/master
Added some command line parameters for index.js
2015-10-31 23:56:21 +02:00
Jiiks 83394eb2c8 Merge pull request #25 from Jiiks/beta
Beta
2015-10-31 23:50:41 +02:00
Jiiks 007e7cfae3 Temp fix for voicemode bug 2015-10-31 23:49:42 +02:00
Jiiks 2885782975 timeout 2015-10-31 23:46:37 +02:00
Jiiks a29901e0d4 Move overflow to parent 2015-10-31 23:40:49 +02:00
Jiiks 9a2edd1689 Remove unused logging 2015-10-31 23:35:57 +02:00
Jiiks adef28d241 Cycling 2015-10-31 23:34:10 +02:00
Jiiks 8ee0b97c00 Replace voicemode width with flex-grow 2015-10-31 23:30:51 +02:00
Jiiks e93db396f3 Same with timeout 2015-10-31 23:28:09 +02:00
Jiiks 60fdc8ccc4 Voicemode cycling 2015-10-31 23:24:40 +02:00
Duncan Bristow 5f4b380db4 Whoops, added a test file. 2015-10-31 15:17:42 -06:00
Duncan Bristow 11b4799ec9 Added some command line parameters 2015-10-31 15:17:16 -06:00
Jiiks 9f7d0b6b2c Merge remote-tracking branch 'refs/remotes/origin/master' into beta 2015-10-31 23:15:12 +02:00
Jiiks 306a00152a Make emote command minimum length 4 characters to get rid of garbage emotes 2015-10-30 03:28:37 +02:00
Jiiks 5442b1d5a7 d 2015-10-29 16:53:43 +02:00
Jiiks 8ec1d0d6db d 2015-10-29 16:53:14 +02:00
Jiiks 0bd797d89e d 2015-10-29 16:52:39 +02:00
Jiiks 69d85fe54a test 2015-10-29 16:51:21 +02:00
Jiiks d4e12a6ce3 typo 2015-10-29 15:58:46 +02:00
Jiiks bbf2c91f8c more debug 2015-10-29 15:58:03 +02:00
Jiiks 585fc7f1f4 debug 2015-10-29 15:54:58 +02:00
Jiiks dc07c79297 dev 2015-10-29 15:52:12 +02:00
Jiiks f5ad2ab119 paretnode 2015-10-29 15:47:43 +02:00
Jiiks 19b31e2a3d Edit injection 2015-10-29 15:46:08 +02:00
Jiiks 9c87dd0979 Merge remote-tracking branch 'refs/remotes/origin/master' into beta 2015-10-29 14:03:47 +02:00
Jiiks f211b26621 td min-width 2015-10-28 00:17:07 +02:00
Jiiks 785d116c60 Remove width style 2015-10-28 00:14:43 +02:00
Jiiks 5c53da2dbe Wrap join button in a td 2015-10-28 00:13:23 +02:00
Jiiks fe09c506c5 Merge pull request #17 from Jiiks/beta
Removed devjs and added join button to public servers
2015-10-28 00:07:37 +02:00
Jiiks 52cec81afb Functional add server button
inline styling for now.
2015-10-28 00:04:41 +02:00
Jiiks 42cea45430 Join server button 2015-10-27 23:58:43 +02:00
Jiiks 71b94ee664 Merge remote-tracking branch 'refs/remotes/origin/master' into beta 2015-10-27 23:57:13 +02:00
Jiiks ade49315ed _dataPath userd before declared 2015-10-27 23:53:18 +02:00
Jiiks d2d7d0ca40 Join server button 2015-10-27 23:43:26 +02:00
Jiiks 44a9f642c5 Merge pull request #16 from Candunc/master
Added OS X support for file caching
2015-10-27 23:26:35 +02:00
Duncan Bristow 3787d3fcac Added OS X support for file caching 2015-10-27 15:14:09 -06:00
Jiiks 9e70538497 beta loading 2015-10-27 22:37:53 +02:00
Jiiks 303b31f568 betalabel 2015-10-27 22:33:28 +02:00
Jiiks 563976e475 not needed 2015-10-27 22:29:41 +02:00
Jiiks d6825d9456 k 2015-10-27 22:28:53 +02:00
Jiiks 2a13262d81 no longer needed
beta branch
2015-10-27 22:27:53 +02:00
Jiiks cdf174b09c Merge branch 'master' of https://github.com/Jiiks/BetterDiscordApp 2015-10-27 22:18:04 +02:00
Jiiks 94efef70b7 credits 2015-10-27 22:18:00 +02:00