Commit Graph

898 Commits

Author SHA1 Message Date
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
noxy
4a050b5575 Merge branch 'f0ckdev' into 'master'
Schönheitsoperation [Insert Botox]

See merge request !40
2016-11-15 13:19:15 +00:00
sirx
1349872ec5 Schönheitsoperation [Insert Botox] 2016-11-15 14:18:15 +01:00
noxy
9ae334a8e8 Merge branch 'f0ckdev' into 'master'
<br> nach timestamp

See merge request !39
2016-11-15 13:13:19 +00:00
sirx
f463c8e224 <br> nach timestamp 2016-11-15 14:12:43 +01:00
noxy
22aa0f2df7 Merge branch 'f0ckdev' into 'master'
neuer texd für stats

See merge request !38
2016-11-07 18:47:31 +00:00
sirx
ccb1923bde neuer texd für stats 2016-11-07 19:39:18 +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
sirx
74b6c99295 animiert icons sehen in chromium scheiße aus 2016-11-06 03:40:02 +01:00
sirx
fb5823fcbb s vergessen 2016-11-06 03:21:36 +01:00
sirx
989dcd57de animiertes eygon 2016-11-06 03:14:18 +01:00
noxy
8ada3fa294 Merge branch 'f0ckdev' into 'master'
besseres eygon

See merge request !30
2016-11-06 02:05:51 +00:00
sirx
f0c7726a47 besseres eygon 2016-11-06 03:02:13 +01:00
noxy
144077d541 Merge branch 'f0ckdev' into 'master'
neues bilt :-DdDdDd

100 brozent ned geklaud

See merge request !29
2016-11-06 01:58:57 +00:00
sirx
d5f5e77218 skalarwelle 2016-11-06 02:57:58 +01:00
sirx
f7604a3abc neues feveygon 2016-11-06 02:54:28 +01:00
noxy
c67b7daf65 Merge branch 'f0ckdev' into 'master'
js fehler figsen

See merge request !28
2016-11-06 01:35:45 +00:00
sirx
5204cfd2ad hab mal auf fluhmey gehörd 2016-11-06 02:34:48 +01:00
noxy
bfa3eff305 Update shit.js 2016-11-06 01:31:49 +00:00