msquare
|
99c7e8ce1a
|
fixes #298 allow a shift supporter to remove a user from shift
|
2016-12-24 17:29:12 +01:00 |
|
msquare
|
e86d75b4d9
|
begin #298 add privilege and add users to shifts by angeltype supporter
|
2016-12-24 17:00:03 +01:00 |
|
msquare
|
b8c26b0fd0
|
fix that free shifts become green
|
2016-12-23 12:48:34 +01:00 |
|
msquare
|
9e804ba91a
|
fix that free shifts become green
|
2016-12-23 12:46:32 +01:00 |
|
msquare
|
deac80e700
|
merge #253
|
2016-12-13 17:58:41 +01:00 |
|
jwacalex
|
45cda10479
|
merged master and issue
|
2016-11-30 23:23:49 +01:00 |
|
jwacalex
|
79b9f9448e
|
initial commit and functionality for no self sign up
|
2016-11-30 23:20:13 +01:00 |
|
msquare
|
34248bb20c
|
show freeload comments to supporters (user shift admin)
|
2016-11-25 14:27:47 +01:00 |
|
msquare
|
476d1daeb7
|
fixes #280 shift entries finished by user returns no freeloaded shifts
|
2016-11-25 13:58:43 +01:00 |
|
msquare
|
bae3ede662
|
fixes #279 fix exporting freeload comment in json export
|
2016-11-25 13:38:16 +01:00 |
|
msquare
|
9098b8e80d
|
reduce complexity of user view
|
2016-11-18 08:47:52 +01:00 |
|
msquare
|
bd54bec595
|
add ValidationResult to namespace
|
2016-11-18 08:20:17 +01:00 |
|
msquare
|
7b8d191808
|
reduce complexity of user driver license
|
2016-11-17 14:40:21 +01:00 |
|
msquare
|
9c4636f5c4
|
reduce complexity of user driver license
|
2016-11-17 14:35:04 +01:00 |
|
msquare
|
d64f96b6a1
|
reduce complexity of angeltype controller
|
2016-11-17 13:11:44 +01:00 |
|
msquare
|
1636688394
|
reduce complexity of angeltype edit controller
|
2016-11-17 13:03:28 +01:00 |
|
msquare
|
f2630162e9
|
reduce complexity of password recovery controller
|
2016-11-15 22:08:41 +01:00 |
|
msquare
|
53a306f14b
|
make departure date nullable
|
2016-11-15 16:36:03 +01:00 |
|
msquare
|
16ed2ae683
|
fixed settings validation
|
2016-11-14 19:10:29 +01:00 |
|
msquare
|
f568141164
|
add shift legend and fix dark theme
|
2016-11-14 17:58:15 +01:00 |
|
msquare
|
0ab9f4f988
|
fix shift ended recognition and displayed time range end
|
2016-11-14 17:40:24 +01:00 |
|
msquare
|
1a3b4e2a33
|
redone shift coloring and shift signup state
|
2016-11-12 23:00:46 +01:00 |
|
msquare
|
106a678808
|
fix wrong variable
|
2016-11-12 20:15:25 +01:00 |
|
msquare
|
7bafe3f24c
|
fix shift occupied method
|
2016-11-12 19:05:36 +01:00 |
|
msquare
|
c10ab2d8d2
|
reduce complexity of shift signup allowed
|
2016-11-12 12:50:52 +01:00 |
|
msquare
|
03c9d1ef5d
|
reduce complexity of user settings main
|
2016-11-11 17:00:51 +01:00 |
|
msquare
|
247166f28b
|
improve code of user settings
|
2016-11-11 16:34:23 +01:00 |
|
msquare
|
f5a5f234e4
|
fixes #266: add checkbox allowing the users email to be used by humans like event-team
|
2016-11-11 15:24:51 +01:00 |
|
msquare
|
82b9436c50
|
rename coordinator to supporter
|
2016-11-11 14:59:25 +01:00 |
|
msquare
|
468a10774c
|
reduce complexity of user driver license controller
|
2016-11-10 13:55:16 +01:00 |
|
msquare
|
cf8cc5f592
|
change shift table to html5
|
2016-11-05 10:06:06 +01:00 |
|
msquare
|
c48335e702
|
improve shift rendering
|
2016-10-07 17:22:48 +02:00 |
|
msquare
|
6d97aa2d27
|
continue working on shifts calendar renderer
|
2016-10-05 22:28:39 +02:00 |
|
msquare
|
6fff6a6c1a
|
begin room view and shifts filter renderer
|
2016-10-05 18:56:50 +02:00 |
|
msquare
|
27c9650dc4
|
reduce complexity of shifts controller
|
2016-10-04 21:20:38 +02:00 |
|
msquare
|
aa628208ec
|
reduce complexity of shift view
|
2016-10-04 18:36:57 +02:00 |
|
msquare
|
eec10ebfc5
|
reduce complexity of user angeltypes controller
|
2016-10-04 16:50:06 +02:00 |
|
msquare
|
f3a0ce865d
|
move sql queries from shifts controller to model
|
2016-10-03 18:32:25 +02:00 |
|
msquare
|
6c8a113383
|
introduce ShiftsFilter
|
2016-10-03 17:41:14 +02:00 |
|
msquare
|
5e66007f06
|
introduce ShiftsFilter
|
2016-10-02 23:00:01 +02:00 |
|
msquare
|
d5d2acc7d8
|
improve code style
|
2016-10-01 10:48:19 +02:00 |
|
msquare
|
6dfefc3bb9
|
small code improvements
|
2016-09-30 18:49:33 +02:00 |
|
msquare
|
3738d071f8
|
remove long array syntax
|
2016-09-30 17:08:20 +02:00 |
|
msquare
|
1debe567f5
|
simplify user_angeltype_add_controller
|
2016-09-30 16:55:47 +02:00 |
|
msquare
|
a128bcbb38
|
use more ValidationResult
|
2016-09-29 16:04:05 +02:00 |
|
msquare
|
07ddbb0f4c
|
make short variable names longer
|
2016-09-29 12:45:06 +02:00 |
|
msquare
|
e965f8d041
|
prohibit inline control structures on model and view
|
2016-09-29 11:18:17 +02:00 |
|
msquare
|
5957e05bf1
|
finished rename settings to event config and added more date validation for event config
|
2016-09-27 17:59:28 +02:00 |
|
msquare
|
031fc3057c
|
rename settings to event config and implement mvc pattern on it
|
2016-09-27 17:49:39 +02:00 |
|
msquare
|
45bbf95972
|
fix settings validation
|
2016-09-27 17:49:39 +02:00 |
|
kamishetty sreeja
|
8a20b43f6d
|
Added Feature Admin Settings Page
|
2016-07-14 13:49:38 +05:30 |
|
tike
|
661e5595c4
|
issue #242 - make app caluclate number of vouchers for angels
|
2016-02-07 13:00:28 +01:00 |
|
Philip Häusler
|
ef60b95555
|
add a more secure way to delete users containing a password request
|
2015-12-30 15:48:41 +01:00 |
|
Philip Häusler
|
b479cdaef8
|
fix room creation
|
2015-12-29 17:57:16 +01:00 |
|
Philip Häusler
|
0ac05d251c
|
#198 fixed: driving license feature completed - integrated into angeltypes
|
2015-12-20 11:36:12 +01:00 |
|
Philip Häusler
|
facc32f133
|
#198 add basic driver license information
|
2015-12-19 23:31:08 +01:00 |
|
Philip Häusler
|
a7189482e9
|
add shift creator and editor
|
2015-08-15 23:36:38 +02:00 |
|
Philip Häusler
|
803c0a552f
|
make multiple vouchers possible
|
2015-08-12 23:44:39 +02:00 |
|
Philip Häusler
|
18585285a3
|
fix user update problem
|
2015-08-11 12:04:22 +02:00 |
|
Philip Häusler
|
1a0ccddbe9
|
show number of user angel types to confirm in hint
|
2015-07-27 17:20:05 +02:00 |
|
Philip Häusler
|
386a3c3298
|
remove duplication from unconfirmed angeltypes hint
|
2015-07-27 17:05:16 +02:00 |
|
Philip Häusler
|
8c518d4c34
|
add arrival date feature
|
2015-07-12 14:45:58 +02:00 |
|
Philip Häusler
|
66c7e67a03
|
remove avatars
|
2015-07-12 13:51:39 +02:00 |
|
Philip Häusler
|
86a4773243
|
add log entry test
|
2015-06-07 20:42:01 +02:00 |
|
Philip Häusler
|
eddafead49
|
add function to clear log to model
|
2015-06-07 20:12:18 +02:00 |
|
Philip Häusler
|
0a59089e2b
|
add room model tests
|
2015-05-14 17:20:46 +02:00 |
|
Philip Häusler
|
0cb28c05b1
|
fix creation of shift types
|
2015-01-10 11:12:02 +01:00 |
|
Philip Häusler
|
ca37de95da
|
fix shift update
|
2014-12-28 14:56:02 +01:00 |
|
Philip Häusler
|
a470a5f5d3
|
fix shift creation
|
2014-12-28 13:57:50 +01:00 |
|
Philip Häusler
|
6bede2fd22
|
harden the sql queries
|
2014-12-28 13:44:56 +01:00 |
|
Philip Häusler
|
8d6175a273
|
user cannot signup for full shifts
|
2014-12-26 23:48:16 +01:00 |
|
Philip Häusler
|
1ec2783a8e
|
use user nick render
|
2014-12-26 19:26:53 +01:00 |
|
Philip Häusler
|
8ed077bcec
|
user voucher feature
|
2014-12-26 01:49:59 +01:00 |
|
Philip Häusler
|
34e2f49875
|
shift signup improvements for shift view
|
2014-12-25 22:23:18 +01:00 |
|
Philip Häusler
|
2d587478a1
|
fix different bugs with shift types
|
2014-12-22 20:06:37 +01:00 |
|
Philip Häusler
|
d02272afd6
|
add basic shift view
|
2014-12-19 22:41:55 +01:00 |
|
Philip Häusler
|
a791a75b0a
|
integrate shift type into shifts
|
2014-12-17 17:22:35 +01:00 |
|
Philip Häusler
|
294a21d163
|
add shift types model
|
2014-12-17 14:59:41 +01:00 |
|
Philip Häusler
|
25889920cf
|
prepare for shift types model, add db update
|
2014-12-17 14:59:40 +01:00 |
|
Felix Favre
|
807e420883
|
only log if api key was reset on purpose
|
2014-12-16 00:54:50 +01:00 |
|
Felix Favre
|
be1bb5fbeb
|
add simple search to log view
|
2014-12-15 21:23:57 +01:00 |
|
Philip Häusler
|
9125f7e5ab
|
show 10000 log entries
|
2014-12-15 19:07:53 +01:00 |
|
Felix Favre
|
5b3d0d302f
|
on api-key reset also log the username
|
2014-12-12 23:39:54 +01:00 |
|
Philip Häusler
|
1f572918ff
|
include all mailers
|
2014-12-07 20:29:01 +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
|
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
|
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 |
|
Philip Häusler
|
10d7fce163
|
fix wrong angel type alarm
|
2014-12-06 18:55:24 +01:00 |
|
Philip Häusler
|
57a92dbdcd
|
add opt-in bool for shiftinfo mails and remove icq from users
|
2014-12-06 18:37:39 +01:00 |
|
Philip Häusler
|
bd2a8b441f
|
clear up mvc for user list
|
2014-09-28 15:01:02 +02:00 |
|
Philip Häusler
|
1d9e1c467c
|
user list rewritten
|
2014-09-28 14:50:08 +02:00 |
|
Philip Häusler
|
4414358cf5
|
fix wrong nick and api sql query
|
2014-09-08 13:57:36 +02:00 |
|
Philip Häusler
|
0e2b257342
|
begin to refactor user shift state
|
2014-08-24 15:51:42 +02:00 |
|
Philip Häusler
|
f5a094fd8b
|
add user view, better bootstrap
|
2014-08-23 01:55:18 +02:00 |
|
Philip Häusler
|
d394ed2fee
|
notify coordinators about unconfirmed angeltypes
|
2014-05-13 16:49:09 +02:00 |
|
Philip Häusler
|
f1145b8a5e
|
implemented team/angeltype coordinators
|
2014-05-13 15:51:45 +02:00 |
|
Philip Häusler
|
dc7a56f422
|
fixed angeltype add model
|
2014-03-24 11:51:51 +01:00 |
|
Philip Häusler
|
f40b78faac
|
angeltypes about section
|
2014-03-09 13:39:04 +01:00 |
|
Philip Häusler
|
98f355cd86
|
added angeltype description
|
2014-03-09 13:12:46 +01:00 |
|
Philip Häusler
|
b35a32ef52
|
completed api comments
|
2014-01-07 15:56:31 +01:00 |
|
Philip Häusler
|
239c2b1684
|
reviewed cookies api
|
2014-01-07 15:50:16 +01:00 |
|
Philip Häusler
|
27ff879f51
|
cookie-0007-API-getRoom-show-real-rooms.patch
|
2014-01-05 19:35:01 +01:00 |
|
Philip Häusler
|
6664433fab
|
cookie-0006-API-add-cmd-sendMessage.patch
|
2014-01-05 19:34:17 +01:00 |
|
Philip Häusler
|
9dc5dbe3b6
|
cookie-0005-API-add-getApiKey.patch
|
2014-01-05 19:33:52 +01:00 |
|
Philip Häusler
|
5e84539928
|
rewritten angeltypes and user angeltypes
|
2014-01-05 19:30:06 +01:00 |
|
Philip Häusler
|
8fa78b55ac
|
first api new files
|
2013-12-29 15:08:33 +01:00 |
|
Philip Häusler
|
a041e0efbb
|
first api
|
2013-12-29 15:08:21 +01:00 |
|
Philip Häusler
|
9da2ff6f9f
|
#137 fixed xss on login
|
2013-12-27 19:45:50 +01:00 |
|
Philip Häusler
|
c589219a96
|
freeloader feature
|
2013-12-27 18:45:27 +01:00 |
|
Philip Häusler
|
2c41fcdc09
|
display max 10000 log entries (1000 before)
|
2013-12-27 17:54:12 +01:00 |
|
Philip Häusler
|
0c98f13eee
|
user password recovery
|
2013-12-26 13:34:48 +01:00 |
|
Philip Häusler
|
7df8b967f3
|
fixed count taken shifts entries
|
2013-12-09 17:37:50 +01:00 |
|
Philip Häusler
|
a0ec1130a6
|
needed angeltypes corrected loading by room or special needs
|
2013-12-09 17:28:22 +01:00 |
|
Philip Häusler
|
3bc9d09f7a
|
api all shifts export should only show needed angeltypes with count greater than 0
|
2013-12-09 17:24:54 +01:00 |
|
Philip Häusler
|
4aa85a3ff2
|
api export for all shifts completed
|
2013-12-09 17:17:23 +01:00 |
|
Philip Häusler
|
ad5899f028
|
api export for all shifts
|
2013-12-09 17:10:07 +01:00 |
|
Philip Häusler
|
813751ac7a
|
language cleanup
|
2013-11-25 21:07:08 +01:00 |
|
Philip Häusler
|
3c4321ff76
|
30c3 theme
|
2013-10-13 00:52:44 +02:00 |
|
Philip Häusler
|
bfb0cacd54
|
mysql to mysqli and a lot of cleanup and mvc
|
2013-09-18 01:38:36 +02:00 |
|
Philip Häusler
|
fb8241039b
|
#119 added links to json export
|
2013-09-10 14:45:41 +02:00 |
|
Philip Häusler
|
a47b1935cb
|
#119 added basic shift json export support using same pattern like ical export
|
2013-09-10 14:27:31 +02:00 |
|
Philip Häusler
|
26ffee4a96
|
#28 logging doku
|
2012-12-27 02:18:56 +01:00 |
|
Philip Häusler
|
29a6f020e6
|
#28 finnished logging, fixes, inverted log order
|
2012-12-27 02:18:02 +01:00 |
|
Philip Häusler
|
74098af09d
|
#28 finnished logging
|
2012-12-27 01:35:05 +01:00 |
|
Philip Häusler
|
0dabaa505e
|
#28 begin log
|
2012-12-26 14:02:27 +01:00 |