290 Commits

Author SHA1 Message Date
058d4d3b90 updated system state system into a working prototype 2014-11-07 17:25:04 +01:00
d3ffdf713d fixed todo schema 2014-11-03 22:25:06 +01:00
8a3e1650e6 small fix in replace if you put null as vars 2014-11-03 14:36:59 +01:00
fa049970e9 todo add user todo 2014-10-21 04:26:34 +02:00
2bc0177819 todo add new func proto 2014-10-20 19:19:36 +02:00
e64d2f1278 sai todolist beta 2014-10-20 17:16:55 +02:00
7d34c86b26 Merge branch 'master' of github.com:gebhardtdasense/system 2014-10-16 00:56:51 +02:00
a298181219 fixed merge problem, pg adjustments, pg schema 2014-10-16 00:29:18 +02:00
47060433c4 Merge branch 'master' of mojotrollz.eu:system into cronfix 2014-10-15 01:33:48 +02:00
ec04a9bd83 Errormessage fix for Connections, since they might be written to db - could result in loop 2014-10-15 01:09:42 +02:00
b42176ed8a Merge branch 'master' of github.com:gebhardtdasense/system 2014-10-13 17:41:53 +02:00
69a996ad57 Merge branch 'master' of mojotrollz.eu:system 2014-10-13 17:39:30 +02:00
ff729e6106 sai cron right 2014-10-13 17:38:21 +02:00
a9cf661f4d cron fix, next func for cron, next in cronsaimod 2014-10-09 22:05:44 +02:00
1b74566d2b updated module structure, qq folder, tpl folder, autoload ordered, cronsaimod table visual fix, saitodo tpl & qq 2014-10-09 17:23:39 +02:00
c61ed753e0 Merge branch 'master' of mojotrollz.eu:system into autoload
Conflicts:
	autoload.inc.php
	dbd/autoload.inc.php
	docu/autoload.inc.php
	files/autoload.inc.php
	log/autoload.inc.php
2014-07-30 02:25:19 +02:00
1db79a7e7d fixed saimod api -> allow null values, autoload restructure 2014-07-30 02:22:07 +02:00
d67ae0ef45 cron saimod improvements 2014-07-10 18:26:09 +02:00
83e275af9f removed warning 2014-07-10 17:36:41 +02:00
d8d6b1ff2f Merge branch 'master' of mojotrollz.eu:system into tinymc 2014-07-10 17:35:19 +02:00
f572ad2f2b example text for basic strings 2014-07-10 17:34:56 +02:00
b3bf40d17d Merge branch 'master' of mojotrollz.eu:system into autoloadfix 2014-07-06 14:04:16 +02:00
4550496102 state js/css ideas(wrong ideas) 2014-07-06 14:03:48 +02:00
bf664cc700 Merge branch 'master' of mojotrollz.eu:system into tinymc 2014-07-02 02:55:24 +02:00
af28425f1d new tinymce mod tingy 2014-07-02 02:55:05 +02:00
548040ec3c Merge branch 'master' of mojotrollz.eu:system into autoloadfix 2014-07-01 14:08:58 +02:00
fb065f3315 autoload for system divided into sub-autoloads 2014-07-01 14:08:39 +02:00
69707bc2b5 modal bug fix tinymce 2014-06-30 20:24:43 +02:00
0c5fc7b201 fixed locale bug 2014-06-30 19:57:35 +02:00
d6918a4ed0 Merge branch 'master' of mojotrollz.eu:system 2014-06-30 04:28:04 +02:00
cdf356f802 basic string close 2014-06-30 04:27:35 +02:00
266f18977a Merge branch 'master' of github.com:gebhardtdasense/system into amqp 2014-06-24 14:06:18 +02:00
9582630107 fixed amqp connection. 2014-06-24 14:05:53 +02:00
b196e1cb7a pagestate system, js implementation @ mojotrollz 2014-06-23 19:35:59 +02:00
51b7c6857a Merge branch 'master' of mojotrollz.eu:system into textapi
Conflicts:
	dbd/sql/mysql/data/system_api.sql
2014-06-23 04:21:59 +02:00
fb6137159f added missing sql for locale -> renamed to text in api call 2014-06-23 04:20:41 +02:00
cc50108991 Merge branch 'master' of mojotrollz.eu:system 2014-06-17 21:06:27 +02:00
79af40596a cron sql schema 2014-06-17 21:05:57 +02:00
messerbill
9c10bfc1be Merge branch 'master' of mojotrollz.eu:system 2014-06-17 04:06:11 +02:00
messerbill
0855ce4881 adding new text categories is now possible 2014-06-17 04:05:51 +02:00
e2edb4dd56 files header fix for downloads 2014-06-16 14:55:14 +02:00
ce7d5305e8 updated file HEADER-sending 2014-06-14 02:55:47 +02:00
6ad48f80a7 cron sai mod 2014-06-13 14:36:41 +02:00
7695c22ee7 Merge branch 'master' of mojotrollz.eu:system 2014-06-12 01:43:38 +02:00
7b60e77b6e sys api sql fix 2014-06-12 01:43:06 +02:00
messerbill
74e122461a created webcraft dummy logo 2014-06-11 01:43:10 +02:00
9f2dc65d21 Merge branch 'master' of mojotrollz.eu:system 2014-06-08 05:43:44 +02:00
32355fadec sys cron mod proto 2014-06-08 05:43:15 +02:00
messerbill
2b418887dd Merge branch 'master' of mojotrollz.eu:system
Conflicts:
	sai/modules/saimod_sys_locale/saimod_sys_locale.php
2014-06-07 17:59:57 +02:00
messerbill
1bd04b353b implemented query 2014-06-07 17:58:16 +02:00