Commit Graph

1410 Commits

Author SHA1 Message Date
msquare 8c3fd7a2ab Merge pull request #165 from LeSpocky/improve-readme
Hinweis auf Git submodules beim Auschecken ergänzt
2014-12-14 13:22:43 +01:00
Alexander Dahl 9762f0a647 Hinweis auf Git submodules beim Auschecken ergänzt
Hintergrund: beim Installieren nach Anleitung ohne Initialisierung der
Submodule schlägt das require auf /../vendor/parsedown/Parsedown.php
fehl, weil die entsprechenden Dateien gar nicht da sind.
2014-12-14 09:54:41 +01:00
Felix Favre ed001633e6 Own Shifts ignore the filled filter.
issue #134
2014-12-13 01:56:29 +01:00
Felix Favre 3e958227aa fix shift collision display 2014-12-13 00:34:27 +01:00
Felix Favre d644952fcd also allow atom feed without login 2014-12-12 23:51:37 +01:00
Felix Favre 96d2aee2cb always allow access to ical and json_export_shifts
fixes #140
2014-12-12 23:49:16 +01:00
Felix Favre e9bbd967ff add freeload info to shiftentry update log
issue #28
2014-12-12 23:40:36 +01:00
Felix Favre 5b3d0d302f on api-key reset also log the username 2014-12-12 23:39:54 +01:00
Felix Favre bc6aa9a209 responsify create room form 2014-12-12 22:55:56 +01:00
Felix Favre 1cc84a967a change default selection 2014-12-12 22:41:35 +01:00
Felix Favre e1014bba20 add sh script to build themes 2014-12-12 22:34:13 +01:00
Felix Favre 0df3f1309c Merge branch 'master' of github.com:engelsystem/engelsystem 2014-12-12 22:33:58 +01:00
Felix Favre 595fa5245e fix icon visibility in dark theme 2014-12-12 22:33:27 +01:00
Philip Häusler 4c2f37cbc5 update german translation 2014-12-08 09:45:02 +01:00
Felix Favre cda4eac6fe commit theme 2 2014-12-07 22:38:15 +01:00
Felix Favre 0cd8dd40a5 Merge branch 'master' of github.com:engelsystem/engelsystem 2014-12-07 21:06:39 +01:00
Felix Favre ac82f3dcd2 animation for alert messages 2014-12-07 21:02:22 +01:00
Philip Häusler 55dc676b77 dont create dabase on install 2014-12-07 20:46:35 +01:00
Philip Häusler 7e650920d3 dont send mails for my own actions 2014-12-07 20:42:54 +01:00
Philip Häusler 663f9f6d2d update install.sql 2014-12-07 20:31:40 +01:00
Philip Häusler 1f572918ff include all mailers 2014-12-07 20:29:01 +01:00
Felix Favre f199c1f08a Merge branch 'master' of github.com:engelsystem/engelsystem 2014-12-07 19:49:31 +01:00
Felix Favre a3718cca52 fix syntax error 2014-12-07 19:48:54 +01:00
Philip Häusler a4a4a0aecc fix missing ; 2014-12-07 19:47:36 +01:00
Philip Häusler f4fa7f5d33 union shift update model 2014-12-07 19:47:02 +01:00
Felix Favre 07b9de84c5 use mail helpers for shift delete and shift change 2014-12-07 19:44:59 +01:00
Felix Favre 8f918422f4 mailer functions for shift delete,assign,remove 2014-12-07 19:43:48 +01:00
Felix Favre 5b3e5750eb Merge branch 'master' of github.com:engelsystem/engelsystem
Conflicts:
	includes/model/ShiftEntry_model.php
2014-12-07 18:04:03 +01:00
Felix Favre 09ef38ff35 change shift mail function 2014-12-07 18:01:45 +01:00
Felix Favre 4b490167ac added User.Nick to ShiftEntries_by_shift function 2014-12-07 18:01:05 +01:00
Philip Häusler b75700ee1b add shift delete model 2014-12-07 17:48:35 +01:00
Philip Häusler d26f8aa12c add shift update model 2014-12-07 17:41:40 +01:00
Philip Häusler fa0e38ebff add shift create model 2014-12-07 17:34:29 +01:00
Philip Häusler 156db1eadd add shift entry update model 2014-12-07 17:13:14 +01:00
Philip Häusler 0a74ab94a8 add shift entry delete model 2014-12-07 17:07:19 +01:00
Philip Häusler 514d2aca64 add function to list users subscribed to a shift 2014-12-07 16:54:13 +01:00
Philip Häusler 9176261762 add shift entry create model 2014-12-07 16:54:13 +01:00
Felix Favre 09e65d1a84 Merge branch 'master' of github.com:engelsystem/engelsystem 2014-12-07 16:38:45 +01:00
Felix Favre 9e0cc40e6d added shift mailer 2014-12-07 16:38:31 +01:00
Philip Häusler 663526246b add settings button to user page 2014-12-07 16:15:20 +01:00
Felix Favre 1c18ce26ed 31c3 theme sucess color change 2014-12-07 16:12:29 +01:00
Felix Favre e9ae329be4 added another theme 2014-12-07 15:43:25 +01:00
Felix Favre 8bcce0e003 change button size in user_news 2014-12-07 00:10:47 +01:00
Felix Favre 6ade63f11d change popover sybol based on message 2014-12-07 00:10:09 +01:00
Felix Favre 69878fa458 changes to messages popover 2014-12-07 00:09:38 +01:00
Felix Favre 4589a505e8 css changes 2014-12-07 00:08:09 +01:00
Felix Favre 45ac884474 Merge branch 'master' of github.com:engelsystem/engelsystem 2014-12-06 22:46:40 +01:00
Felix Favre 921449f3ef more styling 2014-12-06 22:46:23 +01:00
Philip Häusler a48fd8fc37 change hint color on urgency 2014-12-06 22:31:42 +01:00
Philip Häusler d34fae3c40 move hints to toolbar 2014-12-06 22:26:56 +01:00