f0ck/f0ckv1
Archived
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
459 Commits 1 Branch 0 Tags
aa29feb7614bb9770c8f13f774ea424a6f94441a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flummi aa29feb761 Delete irc.json 2016-11-07 01:35:52 +00:00
Flummi 1e95e22c1d cleanup 2016-11-07 02:28:40 +01:00
Flummi a87015a31f bugfix 2016-11-07 02:18:31 +01:00
Flummi 0826223d5c bugfix 2016-11-07 02:15:08 +01:00
Flummi 948fd4e647 new configsystem 2016-11-07 02:02:02 +01:00
Flummi 573567337e Merge branch 'master' into 'f0ckdev' 
Master

See merge request !25
 2016-11-06 01:12:58 +00:00
Flummi ff00f148d7 Merge branch 'f0ckdev' into 'master' 
Jugendsünden sind doof

See merge request !24
 2016-11-06 01:11:56 +00:00
Flummi c7a2a19713 Delete theme.js 2016-11-06 01:11:14 +00:00
Flummi 191c463de9 Delete cyber.css 2016-11-06 01:11:05 +00:00
Flummi 1c26a3bb18 Merge branch 'f0ckdev' into 'master' 
CSS-Zeug

See merge request !18
 2016-11-04 16:24:24 +00:00
Flummi 52e41d7ba1 Merge branch 'f0ckdev' into 'master' 
fixed some bugs in parser



See merge request !17
 2016-11-02 17:27:23 +00:00
Flummi d542ccd2fd test 2016-11-02 18:17:56 +01:00
Flummi 44b636d76a test 2016-11-02 18:12:43 +01:00
Flummi 53f91f2ba4 test 2016-11-02 17:59:40 +01:00
Flummi 1e29de8b17 test 2016-11-02 17:57:10 +01:00
Flummi d40f38fbe3 test 2016-11-02 17:54:29 +01:00
Flummi 068d6b17e4 bullshit 2016-11-02 17:49:40 +01:00
Flummi 3969b0a092 another bugfix #2 2016-11-02 17:39:01 +01:00
Flummi c155a278e3 another bugfix #2 2016-11-02 17:34:27 +01:00
Flummi 2788ad9e38 another bugfix 2016-11-02 17:27:40 +01:00
Flummi 7e366f1c21 bugfix 2016-11-02 17:20:52 +01:00
Flummi 38511be786 hoffentlich klappt das xD 2016-11-02 17:16:06 +01:00
Flummi 53a8ad26bc Update parser.js 2016-11-02 00:36:35 +00:00
Flummi a7c8fd2c1e Merge branch 'f0ckdev' into 'master' 
+ errormessage



See merge request !16
 2016-10-30 05:34:26 +00:00
Flummi 36fa837eb7 +errormessage 2016-10-30 05:04:10 +01:00
Flummi b1fcf5c044 Merge branch 'f0ckdev' into 'master' 
sandbox



See merge request !15
 2016-10-29 04:10:21 +00:00
Flummi b67cecbb45 muh 2016-10-29 06:08:51 +02:00
Flummi 697fe17bc6 modified: package.json 
modified:   src/trigger/bot.js
 2016-10-29 06:04:23 +02:00
Flummi d1c54a6682 grr 2016-10-29 06:01:28 +02:00
Flummi 12f2f8cbdc test 2016-10-29 06:00:37 +02:00
Flummi 680230abc1 test 2016-10-29 05:59:05 +02:00
Flummi c303a1040d test 2016-10-29 05:45:23 +02:00
Flummi ede3faae10 test 2016-10-29 05:43:52 +02:00
Flummi bb993a449a test 2016-10-29 05:38:21 +02:00
Flummi 015d7e0102 test 2016-10-29 05:37:01 +02:00
Flummi b32d5e8a5c f0ck it 2016-10-29 05:35:11 +02:00
Flummi a0cf04a326 test 2016-10-29 05:29:57 +02:00
Flummi 995e9d9196 test 2016-10-29 05:26:24 +02:00
Flummi 8fb995309a test 2016-10-29 05:21:35 +02:00
Flummi 2912006129 test 2016-10-29 05:16:37 +02:00
Flummi 9e69dd4e33 Revert "modified: src/trigger/test.js" 
This reverts commit 6209c98c1e
 2016-10-29 03:08:55 +00:00
Flummi 6209c98c1e modified: src/trigger/test.js 2016-10-29 05:06:46 +02:00
Flummi 8351f8a282 Merge branch 'f0ckdev' into 'master' 
F0ckdev



See merge request !14
 2016-10-26 13:49:40 +00:00
Flummi 73a9a90d43 muh 2016-10-26 15:48:51 +02:00
Flummi 5aabcb6711 MimeType in Debug 2016-10-26 15:46:23 +02:00
Flummi 5f653ff650 Übersich..was? 2016-10-25 14:55:22 +02:00
Flummi 4600d8e670 modified: src/main.js 
new file:   src/websrv.bak.js
	modified:   src/websrv.js
 2016-10-23 00:47:22 +02:00
Flummi 503d9708b2 ups 2016-10-23 00:43:24 +02:00
Flummi 062a351d18 modified: package.json 
modified:   src/websrv.js
 2016-10-23 00:39:23 +02:00
Flummi 8c0551cf9a webservertest 2016-10-23 00:35:32 +02:00
Flummi 42b84c134c verbose output if debug is activated 2016-10-23 00:10:45 +02:00
Flummi 822b72d560 Merge branch 'master' into 'f0ckdev' 
sirx plox



See merge request !13
 2016-10-22 16:04:00 +00:00
Flummi 7581a4244c Merge branch 'f0ckdev' into 'master' 
fixed issues with sc/yt-thumbs above player



See merge request !12
 2016-10-21 21:44:54 +00:00
Flummi fec4b7754c even more margin 2016-10-21 23:43:35 +02:00
Flummi ada3790303 more margin 2016-10-21 23:43:02 +02:00
Flummi 74e93368a7 more margin 2016-10-21 23:42:43 +02:00
Flummi 9c44e447ba thumbnail above audioplayer 2016-10-21 23:41:05 +02:00
Flummi 2578a97b0c format item.tpl.html 2016-10-21 23:37:40 +02:00
Flummi c2c1be28b8 Merge branch 'f0ckdev' into 'master' 
F0ckdev



See merge request !11
 2016-10-21 00:45:57 +00:00
Flummi 2f72001b29 testpush 2016-10-21 02:44:39 +02:00
Flummi b11d0c3dbe pullstatus removed 2016-10-21 02:44:01 +02:00
Flummi 6d9bdd580d testpush 2016-10-21 02:42:51 +02:00
Flummi d6dcea3ef0 pullstatus removed 2016-10-21 02:42:13 +02:00
Flummi 411a65d228 Merge branch 'f0ckdev' into 'master' 
F0ckdev



See merge request !9
 2016-10-20 23:58:25 +00:00
Flummi 49fb9fe174 Merge branch 'master' into 'f0ckdev' 
Update style.css



See merge request !8
 2016-10-20 23:57:41 +00:00
Flummi 3ca6299ba8 Merge branch 'f0ckdev' of gitfap.de:keinBot/keinBotv2 into f0ckdev 2016-10-21 01:42:30 +02:00
Flummi c7e76568d1 bump version 2016-10-21 01:41:38 +02:00
Flummi 9ca37bec55 Merge branch 'master' into 'f0ckdev' 
Master



See merge request !7
 2016-10-20 23:32:19 +00:00
Flummi 8f5fe87acd muh 2016-10-21 01:28:14 +02:00
Flummi 683669bffd can't stump the f0ck 2016-10-21 01:18:02 +02:00
Flummi a30b025fff modified: src/trigger/parser.js 2016-10-21 01:06:06 +02:00
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