Commit Graph

826 Commits

Author SHA1 Message Date
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
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
bff8f08cdf Merge branch 'f0ckdev' into 'master'
adds timestamp to item page



See merge request !10
2016-10-21 00:36:33 +00:00
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
Flummi
49fb9fe174 Merge branch 'master' into 'f0ckdev'
Update style.css



See merge request !8
2016-10-20 23:57:41 +00:00
83950b49a1 bump version to 0.2.0 2016-10-21 01:54:15 +02:00
noxy
916d52b146 Update style.css 2016-10-20 23:45:52 +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
noxy
3b8ba3a9c6 Update item.tpl.html 2016-10-20 23:26:18 +00:00
noxy
bcaa286734 Update item.tpl.html 2016-10-20 23:25:22 +00:00
Flummi
683669bffd can't stump the f0ck 2016-10-21 01:18:02 +02:00
noxy
54863e09ce Update item.tpl.html 2016-10-20 23:16:56 +00:00
noxy
905812bcad Update item.tpl.html 2016-10-20 23:16:07 +00:00
noxy
e1de555b2e Update item.tpl.html 2016-10-20 23:15:30 +00:00
noxy
4a21c75c35 Update item.tpl.html 2016-10-20 23:14:03 +00:00
noxy
c7067b822b Update item.tpl.html 2016-10-20 23:11:41 +00:00
noxy
c1f5b5e72b Update item.tpl.html 2016-10-20 23:11:10 +00:00
Flummi
a30b025fff modified: src/trigger/parser.js 2016-10-21 01:06:06 +02:00