Commit Graph
346 Commits
Author SHA1 Message Date
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
Flummi 49fb9fe174 Merge branch 'master' into 'f0ckdev'
Update style.css



See merge request !8
2016-10-20 23:57:41 +00:00
jkhsjdhjs 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
noxy 2e9ae965af Update item.tpl.html 2016-10-20 22:58:08 +00:00
noxy 4bf8eab7ad Update item.tpl.html 2016-10-20 22:49:38 +00:00
noxy 0ab82c897b Update item.tpl.html 2016-10-20 22:45:46 +00:00
Flummi 347ffe28e3 test 2016-10-21 00:43:22 +02:00
noxy 1181c51664 Update item.tpl.html 2016-10-20 22:42:50 +00:00
Flummi 71dbdc31ac ÂTestcommit 2016-10-21 00:41:56 +02:00
noxy 055ada07d2 Update item.tpl.html 2016-10-20 22:40:55 +00:00
noxy 384558027a Update item.tpl.html 2016-10-20 22:37:50 +00:00
noxy 3e260d6178 Update item.tpl.html 2016-10-20 22:32:30 +00:00
noxy 55593e5c57 Update item.tpl.html 2016-10-20 22:30:17 +00:00
noxy 3b9e90fb97 Update item.tpl.html 2016-10-20 22:28:09 +00:00
noxy 4d25a3f789 Update item.tpl.html 2016-10-20 22:25:33 +00:00
noxy 519fa7656b Update item.tpl.html 2016-10-20 22:24:45 +00:00
noxy 838d679cf1 Update item.tpl.html 2016-10-20 22:22:32 +00:00
noxy 566862730d Update item.tpl.html 2016-10-20 22:21:03 +00: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
noxy ad1e693bf8 Update item.tpl.html 2016-10-20 22:14:02 +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