Felix Favre 4faca9864f Merge branch 'master' of github.com:planetcyborg/engelsystem ... Conflicts: themes/theme1.scss		2014-08-24 15:52:25 +02:00
..
controller	Changed Angeltypes List Actions to Bootstrap Button Group	2014-08-23 16:25:51 +02:00
helper	move language select to the top	2014-08-23 02:16:12 +02:00
model	add user view, better bootstrap	2014-08-23 01:55:18 +02:00
pages	remove html templates	2014-08-23 19:15:10 +02:00
view	Changed Next Shift Countdown Format	2014-08-23 17:30:38 +02:00
mysql_provider.php	30c3 theme	2013-10-13 00:52:44 +02:00
sys_auth.php	user password recovery	2013-12-26 13:34:48 +01:00
sys_counter.php	30c3 theme	2013-10-13 00:52:44 +02:00
sys_log.php	30c3 theme	2013-10-13 00:52:44 +02:00
sys_menu.php	remove html templates	2014-08-23 17:24:11 +02:00
sys_page.php	30c3 theme	2013-10-13 00:52:44 +02:00
sys_template.php	remove html templates	2014-08-23 19:15:10 +02:00