Felix Favre
|
5b3e5750eb
|
Merge branch 'master' of github.com:engelsystem/engelsystem
Conflicts:
includes/model/ShiftEntry_model.php
|
10 years ago |
Felix Favre
|
4b490167ac
|
added User.Nick to ShiftEntries_by_shift function
|
10 years ago |
Philip Häusler
|
b75700ee1b
|
add shift delete model
|
10 years ago |
Philip Häusler
|
d26f8aa12c
|
add shift update model
|
10 years ago |
Philip Häusler
|
fa0e38ebff
|
add shift create model
|
10 years ago |
Philip Häusler
|
156db1eadd
|
add shift entry update model
|
10 years ago |
Philip Häusler
|
0a74ab94a8
|
add shift entry delete model
|
10 years ago |
Philip Häusler
|
514d2aca64
|
add function to list users subscribed to a shift
|
10 years ago |
Philip Häusler
|
9176261762
|
add shift entry create model
|
10 years ago |
Philip Häusler
|
10d7fce163
|
fix wrong angel type alarm
|
10 years ago |
Philip Häusler
|
57a92dbdcd
|
add opt-in bool for shiftinfo mails and remove icq from users
|
10 years ago |
Philip Häusler
|
bd2a8b441f
|
clear up mvc for user list
|
10 years ago |
Philip Häusler
|
1d9e1c467c
|
user list rewritten
|
10 years ago |
Philip Häusler
|
4414358cf5
|
fix wrong nick and api sql query
|
10 years ago |
Philip Häusler
|
0e2b257342
|
begin to refactor user shift state
|
10 years ago |
Philip Häusler
|
f5a094fd8b
|
add user view, better bootstrap
|
10 years ago |
Philip Häusler
|
d394ed2fee
|
notify coordinators about unconfirmed angeltypes
|
11 years ago |
Philip Häusler
|
f1145b8a5e
|
implemented team/angeltype coordinators
|
11 years ago |
Philip Häusler
|
dc7a56f422
|
fixed angeltype add model
|
11 years ago |
Philip Häusler
|
f40b78faac
|
angeltypes about section
|
11 years ago |
Philip Häusler
|
98f355cd86
|
added angeltype description
|
11 years ago |
Philip Häusler
|
b35a32ef52
|
completed api comments
|
11 years ago |
Philip Häusler
|
239c2b1684
|
reviewed cookies api
|
11 years ago |
Philip Häusler
|
27ff879f51
|
cookie-0007-API-getRoom-show-real-rooms.patch
|
11 years ago |
Philip Häusler
|
6664433fab
|
cookie-0006-API-add-cmd-sendMessage.patch
|
11 years ago |
Philip Häusler
|
9dc5dbe3b6
|
cookie-0005-API-add-getApiKey.patch
|
11 years ago |
Philip Häusler
|
5e84539928
|
rewritten angeltypes and user angeltypes
|
11 years ago |
Philip Häusler
|
8fa78b55ac
|
first api new files
|
11 years ago |
Philip Häusler
|
a041e0efbb
|
first api
|
11 years ago |
Philip Häusler
|
9da2ff6f9f
|
#137 fixed xss on login
|
11 years ago |
Philip Häusler
|
c589219a96
|
freeloader feature
|
11 years ago |
Philip Häusler
|
2c41fcdc09
|
display max 10000 log entries (1000 before)
|
11 years ago |
Philip Häusler
|
0c98f13eee
|
user password recovery
|
11 years ago |
Philip Häusler
|
7df8b967f3
|
fixed count taken shifts entries
|
11 years ago |
Philip Häusler
|
a0ec1130a6
|
needed angeltypes corrected loading by room or special needs
|
11 years ago |
Philip Häusler
|
3bc9d09f7a
|
api all shifts export should only show needed angeltypes with count greater than 0
|
11 years ago |
Philip Häusler
|
4aa85a3ff2
|
api export for all shifts completed
|
11 years ago |
Philip Häusler
|
ad5899f028
|
api export for all shifts
|
11 years ago |
Philip Häusler
|
813751ac7a
|
language cleanup
|
11 years ago |
Philip Häusler
|
3c4321ff76
|
30c3 theme
|
11 years ago |
Philip Häusler
|
bfb0cacd54
|
mysql to mysqli and a lot of cleanup and mvc
|
11 years ago |
Philip Häusler
|
fb8241039b
|
#119 added links to json export
|
11 years ago |
Philip Häusler
|
a47b1935cb
|
#119 added basic shift json export support using same pattern like ical export
|
11 years ago |
Philip Häusler
|
26ffee4a96
|
#28 logging doku
|
12 years ago |
Philip Häusler
|
29a6f020e6
|
#28 finnished logging, fixes, inverted log order
|
12 years ago |
Philip Häusler
|
74098af09d
|
#28 finnished logging
|
12 years ago |
Philip Häusler
|
0dabaa505e
|
#28 begin log
|
12 years ago |