Commit Graph
100 Commits
Author SHA1 Message Date
Flummi 347ffe28e3 test 2016-10-21 00:43:22 +02:00
Flummi 71dbdc31ac ÂTestcommit 2016-10-21 00:41:56 +02:00
Flummi 2bda72f792 Merge branch 'master' into 'f0ckdev'
Master



See merge request !6
2016-10-20 22:20:34 +00:00
Flummi 9a9e63de58 Revert "Update item.tpl.html"
This reverts commit eb7c0d3649
2016-10-20 22:19:22 +00:00
Flummi eb7c0d3649 Update item.tpl.html 2016-10-20 22:18:07 +00:00
Flummi d5bf271ee1 Merge branch 'master' into 'f0ckdev'
Master



See merge request !5
2016-10-20 22:10:27 +00:00
Flummi 889fbc44d3 Update websrv.js 2016-10-20 22:09:32 +00:00
Flummi a6bdcb2ef1 Delete testfile 2016-10-20 22:07:42 +00:00
Flummi 710c34116b Update websrv.js 2016-10-20 22:06:10 +00:00
Flummi 2a754cf605 Add new file 2016-10-20 22:05:12 +00:00
Flummi 8c599b8931 Delete testfile 2016-10-20 22:04:17 +00:00
Flummi f5ca678576 Update websrv.js 2016-10-20 22:04:08 +00:00
Flummi 551a6e2ae6 Add new file 2016-10-20 22:02:22 +00:00
Flummi 86d7ff7197 Update websrv.js 2016-10-20 22:01:54 +00:00
Flummi d3ba2dccf4 Delete testfile 2016-10-20 21:59:23 +00:00
Flummi d5bf0671ee Update websrv.js 2016-10-20 21:58:56 +00:00
Flummi ba64d60409 Add new file 2016-10-20 21:55:32 +00:00
Flummi 0f2bc1f0bf bump coffea 2016-10-20 11:04:32 +02:00
Flummi bc8a64241d Update item.tpl.html 2016-10-19 14:45:24 +00:00
Flummi ac48d23e49 muh 2016-10-19 14:42:28 +00:00
Flummi 90687172d6 irgendwas mit controls 2016-10-19 14:41:05 +00:00
Flummi c333fb4339 part & join 2016-10-18 13:08:50 +02:00
Flummi 76bab388dd Update parser.js 2016-10-11 21:12:06 +00:00
Flummi 04045e8162 bugfix 2016-10-07 03:03:08 +02:00
Flummi 5d043b6f64 modified: .gitignore 2016-09-20 08:44:10 +02:00
Flummi 18b48ae4a6 ups 2016-09-18 15:07:45 +00:00
Flummi 511893765b fix record 2016-09-18 15:04:30 +00:00
Flummi 8b62120542 test 2016-09-17 10:15:51 +00:00
Flummi 4920ce213c added channel records 2016-09-16 00:44:42 +00:00
Flummi edd5031a3e fixed sync 2016-09-16 00:14:11 +02:00
Flummi 0f2ab86469 level apply after change 2016-09-16 00:04:01 +02:00
Flummi 0534545b53 nope 2016-09-15 21:29:21 +02:00
Flummi 2bc7f45fb6 self yay 2016-09-15 21:25:07 +02:00
Flummi cb00071105 removed hardcoded channel x) 2016-09-15 19:43:57 +02:00
Flummi 1d390e01b3 better sync 2016-09-15 19:17:07 +02:00
Flummi 32b830f929 codeoverhaul 2016-09-15 00:05:18 +02:00
Flummi e87499e705 check if registered 2016-09-14 20:39:57 +02:00
Flummi a23a4ac903 tmp xD 2016-09-14 20:07:10 +02:00
Flummi 2e4d132963 gtfo chanserv 2016-09-14 19:24:48 +02:00
Flummi 285b97f798 match youtu.be 2016-09-13 21:42:38 +02:00
Flummi 5ad62b5c5d soundcloudthumbnail in itempage 2016-09-13 14:12:36 +02:00
Flummi c3656a06dd modified: src/trigger/parser.js 2016-09-13 11:40:04 +02:00
Flummi 23525e3c26 new parser 2016-09-13 00:39:21 +02:00
Flummi 9778c4f7ec thumbnailfix 2016-09-11 22:12:03 +02:00
Flummi 9015070042 modified: src/lib.js 2016-09-11 17:55:04 +02:00
Flummi da6e2acc1d :^) 2016-09-11 17:38:29 +02:00
Flummi 55baf54ab1 fix 2016-09-11 17:36:24 +02:00
Flummi d0a64c9cd9 Merge branch 'master' of gitfap.de:keinBot/keinBotv2 2016-09-11 17:08:33 +02:00
Flummi e448db3f59 new thumbnailer 2016-09-11 17:08:16 +02:00
Flummi ae50b37e03 Test 2016-09-11 13:15:10 +00:00
Flummi c3a063411b Autopull :> 2016-09-11 15:14:20 +02:00
Flummi 085ad0eeba Update README.md 2016-09-11 11:35:06 +00:00
Flummi 2d1fa04d2a modified: src/lib.js
modified:   src/websrv.js
2016-09-11 13:33:15 +02:00
Flummi 2710189d2e ups 2016-09-10 18:44:23 +02:00
Flummi a23c3a059e buggsen gefiggst 2016-09-10 18:29:12 +02:00
Flummi 395ebbe9f8 added token 2016-09-10 18:26:03 +02:00
Flummi 465b843016 modified: src/websrv.js 2016-09-10 18:22:53 +02:00
Flummi 0416434c47 trim msg 2016-09-10 18:14:33 +02:00
Flummi e33ec38318 modified: src/websrv.js 2016-09-10 18:13:40 +02:00
Flummi 235fd353c9 test 2016-09-10 17:55:07 +02:00
Flummi a886d46064 small changes 2016-09-10 17:53:13 +02:00
Flummi b99f4bb53f muh 2016-09-10 16:44:10 +02:00
Flummi 5110f23700 muh 2016-09-10 16:36:59 +02:00
Flummi 0d92b9a8f1 muh 2016-09-10 16:35:16 +02:00
Flummi 83792eae74 muh 2016-09-10 16:32:47 +02:00
Flummi de3e548c07 muh 2016-09-10 16:31:52 +02:00
Flummi bfce6f1248 muh 2016-09-10 16:30:45 +02:00
Flummi 4efdc78b6a testpush 2016-09-10 15:35:04 +02:00
Flummi bef5cfcbde +gitpull 2016-09-10 15:34:01 +02:00
Flummi d250f32e7f ytdl fix 2016-09-10 11:57:03 +02:00
Flummi d1373f94b4 more debug 2016-09-09 23:06:39 +02:00
Flummi eecee1f123 hm 2016-09-09 11:26:17 +00:00
Flummi 6f6d4309e0 changed triggersystem 2016-09-09 11:18:03 +00:00
Flummi d5f99d1293 fixed channelnames 2016-09-09 08:32:35 +00:00
Flummi a98395ac2c removed ffmpegprobe 2016-09-09 08:03:09 +00:00
Flummi 35f78533c3 deps 2016-09-09 09:52:53 +02:00
Flummi a37ad20d08 +ch.hk 2016-09-09 07:51:10 +00:00
Flummi ab4d1355c8 coffea++ 2016-09-08 21:06:22 +02:00
Flummi 566da1c205 muh 2016-09-08 15:46:14 +00:00
Flummi a9a33d593a Merge branch 'master' of gitfap.de:keinBot/keinBotv2 2016-09-08 15:43:02 +00:00
Flummi 7e55b01df3 blah 2016-09-08 15:42:38 +00:00
Flummi 33f7b0b4a3 muh 2016-09-07 11:03:13 +00:00
Flummi ca4dcf5ba4 dk what changed 2016-09-06 13:05:50 +00:00
Flummi eee8564c08 geändert: src/trigger/umode.js 2016-09-06 11:45:37 +00:00
Flummi ca21ce68c5 finally: umode :D 2016-09-05 23:22:54 +00:00
Flummi 4fc92320b3 muh 2016-09-05 22:13:31 +00:00
Flummi c2cc4ab85b muh 2016-09-05 21:07:15 +00:00
Flummi 619e225544 modified: src/trigger/umode.js 2016-09-05 18:23:31 +00:00
Flummi e90aaf0cb6 bugfiggserei 2016-09-05 17:54:09 +00:00
Flummi 4ba72dcb1e modified: src/trigger/umode.js 2016-09-05 11:25:29 +00:00
Flummi 8a3e6a074d shit 2016-09-05 11:23:25 +00:00
Flummi 3cb18c246e muh 2016-09-05 11:21:52 +00:00
Flummi 9bfd49d04f umode trigger 2016-09-05 11:18:58 +00:00
Flummi 01b74af135 modified: s/index.tpl.html 2016-09-05 10:45:43 +00:00
Flummi beb738f657 fixed endlessscroll 2016-09-05 08:40:11 +00:00
Flummi 06e41006a2 keep .empty 2016-09-03 12:53:44 +02:00
Flummi a2d46e9d3d clean gebuggfiggsert 2016-09-03 12:50:53 +02:00
Flummi efc9444589 typo 2016-09-02 21:54:13 +02:00
Flummi dcdc739190 fix for firef0cks 2016-09-02 11:36:39 +00:00
Flummi 35686be025 Firef0cks der Hurensohn 2016-09-02 10:25:33 +00:00