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
..
AngelType_model.php	add user view, better bootstrap	10 years ago
LogEntries_model.php	display max 10000 log entries (1000 before)	11 years ago
Message_model.php	reviewed cookies api	11 years ago
NeededAngelTypes_model.php	fix wrong nick and api sql query	10 years ago
Room_model.php	reviewed cookies api	11 years ago
ShiftEntry_model.php	Merge branch 'master' of github.com:engelsystem/engelsystem	10 years ago
Shifts_model.php	add shift delete model	10 years ago
UserAngelTypes_model.php	fix wrong angel type alarm	10 years ago
UserGroups_model.php	add user view, better bootstrap	10 years ago
User_model.php	add opt-in bool for shiftinfo mails and remove icq from users	10 years ago