a3718cca52
fix syntax error
2014-12-07 19:48:54 +01:00
a4a4a0aecc
fix missing ;
2014-12-07 19:47:36 +01:00
f4fa7f5d33
union shift update model
2014-12-07 19:47:02 +01:00
07b9de84c5
use mail helpers for shift delete and shift change
2014-12-07 19:44:59 +01:00
8f918422f4
mailer functions for shift delete,assign,remove
2014-12-07 19:43:48 +01:00
5b3e5750eb
Merge branch 'master' of github.com:engelsystem/engelsystem
...
Conflicts:
includes/model/ShiftEntry_model.php
2014-12-07 18:04:03 +01:00
09ef38ff35
change shift mail function
2014-12-07 18:01:45 +01:00
4b490167ac
added User.Nick to ShiftEntries_by_shift function
2014-12-07 18:01:05 +01:00
b75700ee1b
add shift delete model
2014-12-07 17:48:35 +01:00
d26f8aa12c
add shift update model
2014-12-07 17:41:40 +01:00
fa0e38ebff
add shift create model
2014-12-07 17:34:29 +01:00
156db1eadd
add shift entry update model
2014-12-07 17:13:14 +01:00
0a74ab94a8
add shift entry delete model
2014-12-07 17:07:19 +01:00
514d2aca64
add function to list users subscribed to a shift
2014-12-07 16:54:13 +01:00
9176261762
add shift entry create model
2014-12-07 16:54:13 +01:00
09e65d1a84
Merge branch 'master' of github.com:engelsystem/engelsystem
2014-12-07 16:38:45 +01:00
9e0cc40e6d
added shift mailer
2014-12-07 16:38:31 +01:00
663526246b
add settings button to user page
2014-12-07 16:15:20 +01:00
1c18ce26ed
31c3 theme sucess color change
2014-12-07 16:12:29 +01:00
e9ae329be4
added another theme
2014-12-07 15:43:25 +01:00
8bcce0e003
change button size in user_news
2014-12-07 00:10:47 +01:00
6ade63f11d
change popover sybol based on message
2014-12-07 00:10:09 +01:00
69878fa458
changes to messages popover
2014-12-07 00:09:38 +01:00
4589a505e8
css changes
2014-12-07 00:08:09 +01:00
45ac884474
Merge branch 'master' of github.com:engelsystem/engelsystem
2014-12-06 22:46:40 +01:00
921449f3ef
more styling
2014-12-06 22:46:23 +01:00
a48fd8fc37
change hint color on urgency
2014-12-06 22:31:42 +01:00
d34fae3c40
move hints to toolbar
2014-12-06 22:26:56 +01:00
8261933bec
try to prevent hint duplication
2014-12-06 21:40:16 +01:00
30c8b48996
prevent forms from being double-submitted
2014-12-06 21:39:59 +01:00
40d83367bb
beautify messages form
2014-12-06 20:02:47 +01:00
b97154d19e
form_element helper now supports empty labels
2014-12-06 20:01:47 +01:00
20d4b1b1c3
shift view css changes
2014-12-06 19:49:54 +01:00
703de07a63
remove striped table from shift view
2014-12-06 19:49:16 +01:00
2f445eb90c
Merge branch 'master' of github.com:engelsystem/engelsystem
2014-12-06 19:02:26 +01:00
3973236f6e
css and layout fixes. font path fix
2014-12-06 19:02:02 +01:00
10d7fce163
fix wrong angel type alarm
2014-12-06 18:55:24 +01:00
481e52cf77
add email shiftinfo checkbox/flag
2014-12-06 18:37:39 +01:00
57a92dbdcd
add opt-in bool for shiftinfo mails and remove icq from users
2014-12-06 18:37:39 +01:00
191ba6e1b1
replace all the remaining old icons with glyphicons
2014-12-06 18:16:18 +01:00
524acb15ba
use the new very cool glyph button
2014-12-06 17:42:29 +01:00
de65cd64e1
add very cool button_glyph helper
2014-12-06 17:41:16 +01:00
2654fcf228
use glyph_bool in admin_active view
2014-12-06 17:30:35 +01:00
67bca99571
Use more Striped Tables
...
issue #159
2014-12-06 17:15:22 +01:00
82ad127fc9
Merge pull request #160 from robofish/questionFix
...
Fixed database schema to allow questions again
2014-11-25 18:38:18 +01:00
17c41d821c
Merge pull request #161 from robofish/master
...
Fix Nickname and DECT bug in user view
2014-11-25 18:37:07 +01:00
946e3292d0
Merge pull request #1 from illuxio/patch-1
...
Fix Nickname and DECT bug in settings.
2014-11-25 17:33:06 +01:00
90a5e5ec14
Update User_view.php
...
Fix Nickname and DECT bug in settings.
2014-11-25 17:30:17 +01:00
2732ae7f4f
Change Development Platform Link to Github
2014-11-24 18:54:38 +01:00
48c8ddaa44
Fixed database schema
...
The answer fields in Questions are now NULL by default. The previous
defaults would not fullfill the forein key contraints on line 493 of
install.sql and thus the creation of new (yet unanswered) questions was
not possible.
2014-11-20 23:19:36 +01:00
Felix Favre