summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-12-07Merge branch 'master' of github.com:engelsystem/engelsystemFelix Favre
2014-12-07fix syntax errorFelix Favre
2014-12-07fix missing ;Philip Häusler
2014-12-07union shift update modelPhilip Häusler
2014-12-07use mail helpers for shift delete and shift changeFelix Favre
2014-12-07mailer functions for shift delete,assign,removeFelix Favre
2014-12-07Merge branch 'master' of github.com:engelsystem/engelsystemFelix Favre
Conflicts: includes/model/ShiftEntry_model.php
2014-12-07change shift mail functionFelix Favre
2014-12-07added User.Nick to ShiftEntries_by_shift functionFelix Favre
2014-12-07add shift delete modelPhilip Häusler
2014-12-07add shift update modelPhilip Häusler
2014-12-07add shift create modelPhilip Häusler
2014-12-07add shift entry update modelPhilip Häusler
2014-12-07add shift entry delete modelPhilip Häusler
2014-12-07add function to list users subscribed to a shiftPhilip Häusler
2014-12-07add shift entry create modelPhilip Häusler
2014-12-07Merge branch 'master' of github.com:engelsystem/engelsystemFelix Favre
2014-12-07added shift mailerFelix Favre
2014-12-07add settings button to user pagePhilip Häusler
2014-12-0731c3 theme sucess color changeFelix Favre
2014-12-07added another themeFelix Favre
2014-12-07change button size in user_newsFelix Favre
2014-12-07change popover sybol based on messageFelix Favre
2014-12-07changes to messages popoverFelix Favre
2014-12-07css changesFelix Favre
2014-12-06Merge branch 'master' of github.com:engelsystem/engelsystemFelix Favre
2014-12-06more stylingFelix Favre
2014-12-06change hint color on urgencyPhilip Häusler
2014-12-06move hints to toolbarPhilip Häusler
2014-12-06try to prevent hint duplicationPhilip Häusler
2014-12-06prevent forms from being double-submittedPhilip Häusler
2014-12-06beautify messages formFelix Favre
2014-12-06form_element helper now supports empty labelsFelix Favre
2014-12-06shift view css changesFelix Favre
2014-12-06remove striped table from shift viewFelix Favre
2014-12-06Merge branch 'master' of github.com:engelsystem/engelsystemFelix Favre
2014-12-06css and layout fixes. font path fixFelix Favre
2014-12-06fix wrong angel type alarmPhilip Häusler
2014-12-06add email shiftinfo checkbox/flagPhilip Häusler
2014-12-06add opt-in bool for shiftinfo mails and remove icq from usersPhilip Häusler
2014-12-06replace all the remaining old icons with glyphiconsFelix Favre
2014-12-06use the new very cool glyph buttonFelix Favre
2014-12-06add very cool button_glyph helperFelix Favre
2014-12-06use glyph_bool in admin_active viewFelix Favre
2014-12-06Use more Striped TablesFelix Favre
issue #159
2014-11-25Merge pull request #160 from robofish/questionFixmsquare
Fixed database schema to allow questions again
2014-11-25Merge pull request #161 from robofish/mastermsquare
Fix Nickname and DECT bug in user view
2014-11-25Merge pull request #1 from illuxio/patch-1Robert Oehlmann
Fix Nickname and DECT bug in settings.
2014-11-25Update User_view.phpilluxio
Fix Nickname and DECT bug in settings.
2014-11-24Change Development Platform Link to Githubgnomus