You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Felix Favre 5b3e5750eb Merge branch 'master' of github.com:engelsystem/engelsystem ... Conflicts: includes/model/ShiftEntry_model.php		10 years ago
..
controller	move hints to toolbar	10 years ago
helper	add opt-in bool for shiftinfo mails and remove icq from users	10 years ago
mailer	change shift mail function	10 years ago
model	Merge branch 'master' of github.com:engelsystem/engelsystem	10 years ago
pages	add shift delete model	10 years ago
view	add settings button to user page	10 years ago
mysqli_provider.php	add shift create model	10 years ago
sys_auth.php	user password recovery	11 years ago
sys_counter.php	30c3 theme	11 years ago
sys_log.php	30c3 theme	11 years ago
sys_menu.php	change popover sybol based on message	10 years ago
sys_page.php	30c3 theme	11 years ago
sys_template.php	added another theme	10 years ago