Commit Graph
393 Commits
Author SHA1 Message Date
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 36fa837eb7 +errormessage 2016-10-30 05:04:10 +01: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 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
sirx 6f77ecabd3 ;_; 2016-10-22 17:45:59 +02:00
sirx 28dfe4fe27 bilder ein bisschen responsiver machen 2016-10-22 17:39:20 +02:00
sirx 3200998994 style 2016-10-22 17:26:34 +02: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
jkhsjdhjs bff8f08cdf Merge branch 'f0ckdev' into 'master'
adds timestamp to item page



See merge request !10
2016-10-21 00:36:33 +00:00
jkhsjdhjs abc4733bc1 adds timestamp to item page 2016-10-21 02:19:50 +02:00
Flummi 411a65d228 Merge branch 'f0ckdev' into 'master'
F0ckdev



See merge request !9
2016-10-20 23:58:25 +00:00