f0ck/f0ckv1
Archived
3
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
517 Commits 1 Branch 0 Tags
720a27c0bef22829c853d34ae5365a6fa5b6ade6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flummi 720a27c0be Merge branch 'f0ckdev' into 'master' 
gitfap pls -.-

See merge request !46
 2016-11-22 16:32:39 +00:00
Flummi 9ddb8ad7d4 fixed 2016-11-22 17:29:04 +01:00
Flummi 36fcb30630 -.- 2016-11-22 17:02:26 +01:00
Flummi de01871498 -.- 2016-11-22 17:00:50 +01:00
Flummi f3280092e0 lel 2016-11-22 16:59:28 +01:00
Flummi ba246d672d bulkdel 2016-11-22 16:58:06 +01:00
Flummi 5ffb07c14c WIP: cfgzeugs 2016-11-22 07:02:40 +01:00
Flummi a291e4f0a1 muh 2016-11-22 06:26:12 +01:00
Flummi a6495dd213 WIP: cfgtrigger 2016-11-21 19:05:02 +01:00
Flummi bdd4ef7b95 muh 2016-11-21 07:31:19 +01:00
Flummi d15281703c muh 2016-11-21 07:30:40 +01:00
Flummi 66916456f0 Merge branch 'f0ckdev' into 'master' 
Coffea der Hurensohn

See merge request !45
 2016-11-20 19:29:22 +00:00
Flummi 298f3ec687 muh 2016-11-20 20:27:55 +01:00
Flummi 7538a98640 muh 2016-11-20 20:25:21 +01:00
Flummi f209ddf05b fixed part 2016-11-20 20:21:25 +01:00
Flummi d7cbf32533 Merge branch 'f0ckdev' into 'master' 
default values

See merge request !43
 2016-11-19 06:47:01 +00:00
Flummi 4acff5016a default values 2016-11-19 07:46:08 +01:00
Flummi 9528d30c61 Merge branch 'f0ckdev' into 'master' 
F0ckdev

See merge request !42
 2016-11-19 05:36:25 +00:00
Flummi b2e8119155 channeltrigger toggable 2016-11-19 06:33:59 +01:00
Flummi e53573c28a shit 2016-11-18 08:16:58 +01:00
Flummi d998cfb26d shit 2016-11-18 08:14:35 +01:00
Flummi 17b014c650 fix 2016-11-18 07:57:36 +01:00
Flummi 92c4e2ae36 muh 2016-11-18 07:56:12 +01:00
Flummi cd97c2938c triggertest 2016-11-18 06:32:55 +01:00
Flummi 6611559b26 triggertest 2016-11-18 06:30:38 +01:00
Flummi a85e018d33 Merge branch 'f0ckdev' into 'master' 
autism™

See merge request !41
 2016-11-17 06:01:19 +00:00
Flummi 2af6dfb63d autism die zweite 2016-11-17 07:00:12 +01:00
Flummi bb7eda3a1a autism die erste 2016-11-17 06:55:05 +01:00
Flummi 4f16e4ad1c Merge branch 'f0ckdev' into 'master' 
update readme

See merge request !37
 2016-11-07 15:09:33 +00:00
Flummi 0e1cb416aa update readme 2016-11-07 16:08:23 +01:00
Flummi 815cfcc842 Merge branch 'f0ckdev' into 'master' 
rm-alias

See merge request !36
 2016-11-07 13:31:26 +00:00
Flummi 81b0de2858 rm-alias 2016-11-07 14:29:15 +01:00
Flummi c25c4bb80c Merge branch 'f0ckdev' into 'master' 
improved deletefunction

See merge request !35
 2016-11-07 13:25:56 +00:00
Flummi 17217f4506 improved deletefunction 2016-11-07 14:24:33 +01:00
Flummi 515e758c81 Merge branch 'f0ckdev' into 'master' 
ups.

See merge request !34
 2016-11-07 02:02:58 +00:00
Flummi f4d2b09f07 ups 2016-11-07 03:02:12 +01:00
Flummi 303d6ccc3d Merge branch 'f0ckdev' into 'master' 
+quickfick

See merge request !33
 2016-11-07 01:52:21 +00:00
Flummi e0ff84187b moar mimetypes! 2016-11-07 02:50:17 +01:00
Flummi dda1c587e9 add mov 2016-11-07 02:44:44 +01:00
Flummi 3cd8601082 more verbose 2016-11-07 02:41:17 +01:00
Flummi ee0018ff89 Merge branch 'f0ckdev' into 'master' 
delete configs

See merge request !32
 2016-11-07 01:36:24 +00:00
Flummi 5839a5b6b0 Delete main.json 2016-11-07 01:36:06 +00:00
Flummi 8cc163f3fc Delete websrv.json 2016-11-07 01:36:00 +00:00
Flummi aa29feb761 Delete irc.json 2016-11-07 01:35:52 +00:00
Flummi 4fab49e884 Merge branch 'f0ckdev' into 'master' 
new configsystem

See merge request !31
 2016-11-07 01:30:03 +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