d0abc27c07
Merge remote-tracking branch 'MyIgel/translations'
2018-09-15 14:58:31 +02:00
e8f8fc7f5f
Replaced gettext translation `_()` with `__()` that uses the Translator class
2018-08-29 23:46:32 +02:00
1090d5e889
Update shifts_controller.php
...
fix problem when missing needed angeltype entry
2018-08-28 18:28:09 +02:00
d6c8f1a614
Merge branch 'master' to 'rebuild-database'
2018-08-20 21:07:57 +02:00
6dbec2e2fb
remove unused code
2018-01-28 14:52:26 +01:00
646ffc1910
$bugfixes...
2018-01-14 18:50:37 +01:00
5227fe6a94
Formatting
2018-01-14 18:09:34 +01:00
fe58e4f422
database: updated checks for selectOne
2018-01-14 17:47:26 +01:00
c961269bb7
better hour formatting
2017-12-30 12:07:10 +01:00
ee9fbda098
add work date to work log
2017-12-29 18:57:11 +01:00
86a38a3372
add user work log entries feature
2017-12-29 17:19:27 +01:00
3993e553d1
small improvements of user view
2017-12-29 13:12:56 +01:00
b59d17918e
small improvements of user view
2017-12-29 13:09:35 +01:00
c3b8fa892d
tshirt-score for forced active
2017-12-27 20:30:05 +01:00
b00743d6d3
Formatting
2017-12-27 13:50:53 +01:00
1e8f0c4845
fixes #208 , fixes #310 : T-Shirt Score™ should be shown on the user view page below your shifts
2017-12-27 12:24:55 +01:00
abf4b1da30
check if logged in before sign up
2017-12-27 11:35:26 +01:00
f8d0a7c5b0
Updated translation / Formatting / Test
2017-12-26 00:21:44 +01:00
75eea1681e
Removed dead function call
2017-12-25 23:51:15 +01:00
952c7892f3
Formatting & Docstrings
2017-12-25 23:51:15 +01:00
a6cf4c9ce9
spelling fixes
2017-12-25 21:29:00 +01:00
5f34e15712
fix broken public dashboard shift links
2017-12-23 22:49:56 +01:00
fbbea4eb5f
add show on dashboard flag for angeltypes
2017-12-23 11:59:13 +01:00
2c04e35bed
introduce new shift signup state for not arrived angels
2017-12-20 23:05:46 +01:00
7a3bdda483
rewrite controller for creating shift entries
2017-12-20 00:54:57 +01:00
1289101f6e
rewrite controller for creating shift entries
2017-12-20 00:42:58 +01:00
afd7c59d1d
fix shift entry delete
2017-12-19 22:24:06 +01:00
fd85034e7f
redo shift signoff and icons for delete/confirm/acknowledgment questions
2017-12-19 20:58:01 +01:00
567ed9ebd2
remove flags since they do not belong to language selection
2017-12-19 19:17:50 +01:00
769d8c4af9
better logging of needed angeltypes for shifts and rooms
2017-12-17 13:22:29 +01:00
c70e268a2e
add fullscreen button to dashboard and update translation to german
2017-12-13 17:50:52 +01:00
5278be1f0f
add link to public dashboard from shift view
2017-12-13 12:53:07 +01:00
ff94df53d6
finish basic public dashboard
2017-12-12 21:57:57 +01:00
74f3677f19
add quick+dirty public dashboard
2017-12-11 22:26:36 +01:00
4143680297
remove room number and visible flag, rename pentabarf to frab and introduce map/c3nav integration as well as markdown description for rooms
2017-12-10 15:02:37 +01:00
32d14f493b
Fix sign-up to shifts by supporter
...
Any user with the `shiftentry_edit_angeltype_supporter` privilege was
able to sign up any users of the correct angeltype to any shift that
they could sign up themselves because the shift entry controller only
checks for the global privilege an not the fact that the user is indeed
supporter for the angeltype in question.
2017-12-07 18:52:07 +01:00
e7d605c6d9
fix log on confirming angels
2017-12-02 14:44:41 +01:00
e54a10b816
add shift calendar to angeltype view fix tab jumps
2017-11-24 12:09:28 +01:00
928e707015
add shift calendar to angeltype view
2017-11-24 12:01:19 +01:00
d8476f244d
complete feature contact info for angeltypes, fixes #275
2017-11-24 10:02:52 +01:00
deae2a1721
fix removing users from shift, fixes #359
2017-11-19 14:52:55 +01:00
50f24271eb
fix all redirects to home (because of new urls redirect to ? wont work anymore)
2017-11-19 10:45:08 +01:00
e9a28eb20e
fix log message from changing event config
2017-11-19 10:32:21 +01:00
db8b6b2520
change shift renderer global add user link
2017-09-16 17:14:45 +02:00
96f1d9fd54
Bugfixes
2017-08-30 15:35:12 +02:00
d0074cf006
Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'
...
# Conflicts:
# includes/controller/angeltypes_controller.php
# includes/pages/admin_groups.php
# includes/pages/user_settings.php
# includes/sys_page.php
# src/Exceptions/Handler.php
# src/Http/Request.php
2017-08-29 23:16:41 +02:00
cc01c906ba
#336 : Integration of symfony/http-foundation request
2017-08-29 21:52:07 +02:00
73175e2b64
#337 : Added routing
2017-08-28 17:34:00 +02:00
7f4aa6daa5
remove exit commands after redirects (redirect does already die)
2017-07-28 20:26:12 +02:00
f82e5456d2
dried code by introducing selectOne for select queries with only one result line expected
2017-07-28 20:11:09 +02:00
5cffcd7fdf
fix angeltype edit and display bugs
2017-07-28 19:44:54 +02:00
a0af8d4624
further switching to db exceptions instead of return false
2017-07-28 19:15:52 +02:00
5794c4cab8
clear delete queries from false resuls
2017-07-28 18:50:00 +02:00
a157004f4a
handle failed db queries in Db class
2017-07-23 11:46:54 +02:00
b7ebb05b8e
Passwords should be posted
2017-07-20 01:03:59 +02:00
3a1e460249
Changed $_GET, $_POST and $_REQUEST to use the Request object
2017-07-19 11:44:16 +02:00
317c91a22f
Reapplied "Merge pull request #319 from jwacalex/gh_317_unable_to_edit_hidden_room_in_admin"
2017-07-17 23:08:15 +02:00
cd30017b97
Some fixes
2017-03-03 08:31:25 +01:00
781f830678
Fixes and improvements
2017-01-22 01:16:00 +01:00
8506d6d27e
Refactoring: Config cleanup / moved to class
2017-01-21 23:07:20 +01:00
740026a9de
Replaced [0-9] with \d
2017-01-21 20:12:48 +01:00
915ce28fee
Replaced " with '
2017-01-21 20:12:35 +01:00
9a3ad88834
Changed from mysqli to PDO, some refactorings, faster sql queries
2017-01-21 13:58:53 +01:00
8254a79c58
Bugfixes & improvements
2017-01-03 15:59:33 +01:00
55141154c0
Replaced " with '
2017-01-03 15:32:59 +01:00
356b2582f3
PPHDoc, formatting, fixes, cleanup
2017-01-03 03:22:48 +01:00
d71e7bbfad
Formatting
2017-01-02 15:49:53 +01:00
7313e15ce8
PSR-2 formatting
2017-01-02 03:57:23 +01:00
1f8d1eb4bb
Fixed "Constant already defined" notice
...
Added more ugly global variables
2017-01-01 18:50:53 +01:00
b8ebd23f6d
bring back filtering by occupancy
2016-12-29 15:33:21 +01:00
fe5dec73ba
bring back filtering by occupancy
2016-12-29 14:51:43 +01:00
4407604793
move data sorting to begin
2016-12-28 14:53:35 +01:00
0603d0dd4e
remove unused code
2016-12-28 12:11:35 +01:00
46528fe1d8
shift view performance improvements
2016-12-27 23:02:05 +01:00
2f2d08c574
fix edit user bug deleting emails
2016-12-27 13:05:30 +01:00
99c7e8ce1a
fixes #298 allow a shift supporter to remove a user from shift
2016-12-24 17:29:12 +01:00
0c15964e6b
#298 hide freeload form from angeltype supporters
2016-12-24 17:02:34 +01:00
e86d75b4d9
begin #298 add privilege and add users to shifts by angeltype supporter
2016-12-24 17:00:03 +01:00
6a591e7557
merged cherry picked commit
2016-11-30 23:31:21 +01:00
45cda10479
merged master and issue
2016-11-30 23:23:49 +01:00
79b9f9448e
initial commit and functionality for no self sign up
2016-11-30 23:20:13 +01:00
1324260e0f
forgot to remove if-statement -.-
2016-11-30 16:17:52 +01:00
f4f6dfefcb
fixed broken logic in controller (cf. to mail to @msquare)
2016-11-30 15:53:47 +01:00
34248bb20c
show freeload comments to supporters (user shift admin)
2016-11-25 14:27:47 +01:00
bae3ede662
fixes #279 fix exporting freeload comment in json export
2016-11-25 13:38:16 +01:00
ff31d0a1c5
fix shift signup state being combined to null
2016-11-24 09:32:32 +01:00
3fd30add3c
fix NPE
2016-11-23 22:31:11 +01:00
356cc9e1d0
reduce complexity of user driver license
2016-11-17 15:04:33 +01:00
7b8d191808
reduce complexity of user driver license
2016-11-17 14:40:21 +01:00
9c4636f5c4
reduce complexity of user driver license
2016-11-17 14:35:04 +01:00
b5784e5961
fix order problem
2016-11-17 13:16:15 +01:00
d64f96b6a1
reduce complexity of angeltype controller
2016-11-17 13:11:44 +01:00
1636688394
reduce complexity of angeltype edit controller
2016-11-17 13:03:28 +01:00
f2630162e9
reduce complexity of password recovery controller
2016-11-15 22:08:41 +01:00
54f3253c32
fix js var names
2016-11-15 21:42:43 +01:00
15243f15fc
fix shift view
2016-11-15 17:22:15 +01:00
918d41ca70
reduce complexity of menu and hints
2016-11-15 16:31:55 +01:00
ec6016cd38
reduce complexity of menu and hints
2016-11-15 16:28:20 +01:00
1a3b4e2a33
redone shift coloring and shift signup state
2016-11-12 23:00:46 +01:00
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
82b9436c50
rename coordinator to supporter
2016-11-11 14:59:25 +01:00
468a10774c
reduce complexity of user driver license controller
2016-11-10 13:55:16 +01:00
1d4811cca5
remove unused code
2016-10-08 09:18:04 +02:00
6d97aa2d27
continue working on shifts calendar renderer
2016-10-05 22:28:39 +02:00
6fff6a6c1a
begin room view and shifts filter renderer
2016-10-05 18:56:50 +02:00
27c9650dc4
reduce complexity of shifts controller
2016-10-04 21:20:38 +02:00
42144ed21c
move static access to datetime parse function
2016-10-04 17:58:56 +02:00
eec10ebfc5
reduce complexity of user angeltypes controller
2016-10-04 16:50:06 +02:00
455e417200
fix variable naming problems
2016-10-04 16:16:00 +02:00
f3a0ce865d
move sql queries from shifts controller to model
2016-10-03 18:32:25 +02:00
09c931dcf5
fix missing variables
2016-10-03 17:55:49 +02:00
6c8a113383
introduce ShiftsFilter
2016-10-03 17:41:14 +02:00
6ff5e7997a
split user_shifts into different functions
2016-10-02 21:19:03 +02:00
d5d2acc7d8
improve code style
2016-10-01 10:48:19 +02:00
1debe567f5
simplify user_angeltype_add_controller
2016-09-30 16:55:47 +02:00
a128bcbb38
use more ValidationResult
2016-09-29 16:04:05 +02:00
c231070dcc
rename ok to valid
2016-09-29 12:33:03 +02:00
f05f1a3cd4
rename to
2016-09-29 12:08:12 +02:00
bd9003f5d5
prohibit inline control structures on controllers
2016-09-29 09:43:08 +02:00
a083c198bb
better log when changing event config
2016-09-27 18:42:10 +02:00
6f6724e55b
update german translation
2016-09-27 18:08:55 +02:00
5957e05bf1
finished rename settings to event config and added more date validation for event config
2016-09-27 17:59:28 +02:00
031fc3057c
rename settings to event config and implement mvc pattern on it
2016-09-27 17:49:39 +02:00
9e884bb444
remove unused code
2016-08-22 20:40:31 +02:00
3f4be08865
remove old update script
2016-08-22 19:32:54 +02:00
d4bba0d468
remove exit code from shifts controller
2016-08-22 19:03:18 +02:00
de917bc543
remove unused code
2016-08-21 23:11:23 +02:00
53ad1b5110
fix codacy unused code
2016-08-21 18:00:39 +02:00
ef60b95555
add a more secure way to delete users containing a password request
2015-12-30 15:48:41 +01:00
dc5b0a6214
finish cleanup of angeltypes controller
2015-12-22 16:25:38 +01:00
f7cf9b327e
#198 log updates on driving license information
2015-12-20 21:07:08 +01:00
0ac05d251c
#198 fixed: driving license feature completed - integrated into angeltypes
2015-12-20 11:36:12 +01:00
2cb44fe517
make angeltype names clickable
2015-12-20 10:35:03 +01:00
facc32f133
#198 add basic driver license information
2015-12-19 23:31:08 +01:00
7bff27d20b
fix #221 : deleting angeltype doesn't log correctly
2015-12-12 19:35:07 +01:00
902a5852a4
fix user result check on user controller
2015-12-05 11:55:35 +01:00
803c0a552f
make multiple vouchers possible
2015-08-12 23:44:39 +02:00
1a0ccddbe9
show number of user angel types to confirm in hint
2015-07-27 17:20:05 +02:00
0a59089e2b
add room model tests
2015-05-14 17:20:46 +02:00
6bede2fd22
harden the sql queries
2014-12-28 13:44:56 +01:00
16ce2eb969
begin cleanup of user edit
2014-12-27 21:55:24 +01:00
8ed077bcec
user voucher feature
2014-12-26 01:49:59 +01:00
34e2f49875
shift signup improvements for shift view
2014-12-25 22:23:18 +01:00
342b79ff3f
more fixes
2014-12-22 20:18:34 +01:00
702047de53
add more icons for better shift view
2014-12-22 18:22:54 +01:00
6a05c3d9de
rewrite create shifts for shifttypes
2014-12-22 17:55:20 +01:00
038bf97178
link to next shift in menu
2014-12-19 22:59:18 +01:00
d02272afd6
add basic shift view
2014-12-19 22:41:55 +01:00
a791a75b0a
integrate shift type into shifts
2014-12-17 17:22:35 +01:00
3f8e5e47c0
add update, delete and view for shift type
2014-12-17 14:59:41 +01:00
526167ed11
add create shift type
2014-12-17 14:59:41 +01:00
c8cc46886b
shift type list
2014-12-17 14:59:41 +01:00
a73e98a8e0
prepare shift types controller and view
2014-12-17 14:59:41 +01:00
807e420883
only log if api key was reset on purpose
2014-12-16 00:54:50 +01:00
d34fae3c40
move hints to toolbar
2014-12-06 22:26:56 +01:00
10d7fce163
fix wrong angel type alarm
2014-12-06 18:55:24 +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
4931fbb372
replace icons with glyphicons
2014-09-28 19:44:53 +02:00
bd2a8b441f
clear up mvc for user list
2014-09-28 15:01:02 +02:00
1d9e1c467c
user list rewritten
2014-09-28 14:50:08 +02:00
4414358cf5
fix wrong nick and api sql query
2014-09-08 13:57:36 +02:00
2716c63648
fix wrong username on angeltype confirm
2014-09-08 13:57:36 +02:00
27b8223611
removed bootstrap.php
2014-09-08 08:38:08 +02:00
0e2b257342
begin to refactor user shift state
2014-08-24 15:51:42 +02:00
c57e450ed2
Changed Angeltypes List Actions to Bootstrap Button Group
2014-08-23 16:25:51 +02:00
f5a094fd8b
add user view, better bootstrap
2014-08-23 01:55:18 +02:00
74647e16d3
add basic bootstrap theme
2014-08-22 22:34:13 +02:00
d394ed2fee
notify coordinators about unconfirmed angeltypes
2014-05-13 16:49:09 +02:00
f1145b8a5e
implemented team/angeltype coordinators
2014-05-13 15:51:45 +02:00
a33fc5e21d
router simplification
2014-05-13 11:20:48 +02:00
13f8a513d4
fix error messages on password recovery
2014-03-12 17:36:55 +01:00
ab450600d7
better integration of angeltypes about
2014-03-09 16:00:13 +01:00
f40b78faac
angeltypes about section
2014-03-09 13:39:04 +01:00
98f355cd86
added angeltype description
2014-03-09 13:12:46 +01:00
82c0d2acc2
controller comments
2014-01-07 16:19:35 +01:00
239c2b1684
reviewed cookies api
2014-01-07 15:50:16 +01:00
27ff879f51
cookie-0007-API-getRoom-show-real-rooms.patch
2014-01-05 19:35:01 +01:00
6664433fab
cookie-0006-API-add-cmd-sendMessage.patch
2014-01-05 19:34:17 +01:00
9dc5dbe3b6
cookie-0005-API-add-getApiKey.patch
2014-01-05 19:33:52 +01:00
5e84539928
rewritten angeltypes and user angeltypes
2014-01-05 19:30:06 +01:00
8fa78b55ac
first api new files
2013-12-29 15:08:33 +01:00
0c98f13eee
user password recovery
2013-12-26 13:34:48 +01:00
ad5899f028
api export for all shifts
2013-12-09 17:10:07 +01:00
3c4321ff76
30c3 theme
2013-10-13 00:52:44 +02:00
a47b1935cb
#119 added basic shift json export support using same pattern like ical export
2013-09-10 14:27:31 +02:00
Igor Scheller