Commit Graph

296 Commits

Author SHA1 Message Date
msquare 35be25a786 fix dashboard using needed angeltypes from room config too for frab shifts 2017-12-14 19:19:04 +01:00
msquare af8454598c improve public dashboard 2017-12-13 11:55:59 +01:00
msquare ff94df53d6 finish basic public dashboard 2017-12-12 21:57:57 +01:00
msquare afb77d22ba move room db queries to model 2017-12-10 18:56:40 +01:00
msquare 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
msquare e5880c51a2 fix #376: Removing supporter rights does not work 2017-12-06 19:21:46 +01:00
msquare 0f273988c9 fix user nick validation, fixes #369 2017-12-01 19:03:15 +01:00
msquare cbc7f54ad8 fix query for creating angeltypes 2017-11-29 16:55:51 +01:00
msquare 928e707015 add shift calendar to angeltype view 2017-11-24 12:01:19 +01:00
msquare d8476f244d complete feature contact info for angeltypes, fixes #275 2017-11-24 10:02:52 +01:00
msquare 1c77c45bcf fix problem with default values, fixes #354, fixes #353 2017-11-19 13:48:34 +01:00
msquare 3ee1a4b0c7 fix problem with default value for userangeltype.supporter, fixes #352 2017-11-19 13:29:45 +01:00
msquare 88ea992f9c fix sql queries with bools 2017-11-19 13:19:56 +01:00
Igor Scheller 4817658862 Merge branch 'noc0lour:fix_setup_bugs', closes #335 2017-09-25 20:25:00 +02:00
Igor Scheller e6ed8a3017 Changed LogEntries table: Use log level instead of nick name 2017-09-19 19:45:02 +02:00
Igor Scheller 0a20883aa8 Reimplementation of 2840bb619 (signup requires arrival), closes #330 2017-08-31 12:32:08 +02:00
Bot a473a56f1d Formatting 2017-08-30 00:22:02 +02:00
Andrej Rode eeae07e625 add edited_at_timestamp to shift creation to fix mysql error 2017-08-16 01:31:53 +02:00
Andrej Rode dc6fb49f44 fix only_full_group_by mysql default behaviour 2017-08-16 00:19:16 +02:00
msquare f82e5456d2 dried code by introducing selectOne for select queries with only one result line expected 2017-07-28 20:11:09 +02:00
msquare 5cffcd7fdf fix angeltype edit and display bugs 2017-07-28 19:44:54 +02:00
msquare a0af8d4624 further switching to db exceptions instead of return false 2017-07-28 19:15:52 +02:00
msquare 5794c4cab8 clear delete queries from false resuls 2017-07-28 18:50:00 +02:00
msquare a157004f4a handle failed db queries in Db class 2017-07-23 11:46:54 +02:00
msquare 8ae0123635 unarrived angels can enter a shift (has been disabled for 33c3) 2017-07-19 21:32:42 +02:00
msquare 903a1f9790 remove 24h shift filter time range limit 2017-07-19 21:30:18 +02:00
msquare e93dd774a5 fix small issues on checking success of a db query 2017-07-19 21:28:26 +02:00
Igor Scheller cdf14f9d3f Reapplied "Merge pull request #321 from raboof/wantsToDrive" 2017-07-17 23:43:47 +02:00
Igor Scheller 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
Arnout Engelen 3d8dea3733 Form validation: should tick at least on license
Owning a car is not sufficient, select at least one kind of drivers' license
2017-04-30 13:01:33 +02:00
jwacalex b6d394e982 first fix for #317. hidden rooms can be seen with admin_rooms priviledge 2017-04-11 17:25:34 +02:00
Igor Scheller cd30017b97 Some fixes 2017-03-03 08:31:25 +01:00
Igor Scheller 781f830678 Fixes and improvements 2017-01-22 01:16:00 +01:00
Bot 3de0cc840f Removed spaces 2017-01-22 01:12:57 +01:00
Igor Scheller 8506d6d27e Refactoring: Config cleanup / moved to class 2017-01-21 23:07:20 +01:00
Bot 740026a9de Replaced [0-9] with \d 2017-01-21 20:12:48 +01:00
Bot 915ce28fee Replaced " with ' 2017-01-21 20:12:35 +01:00
Igor Scheller 9a3ad88834 Changed from mysqli to PDO, some refactorings, faster sql queries 2017-01-21 13:58:53 +01:00
Igor Scheller 8254a79c58 Bugfixes & improvements 2017-01-03 15:59:33 +01:00
Igor Scheller 1c27bf1375 Removed $angeltype from function Shift_signup_allowed_* 2017-01-03 15:33:10 +01:00
Bot 55141154c0 Replaced " with ' 2017-01-03 15:32:59 +01:00
Bot 356b2582f3 PPHDoc, formatting, fixes, cleanup 2017-01-03 03:22:48 +01:00
Bot d71e7bbfad Formatting 2017-01-02 15:49:53 +01:00
Bot 7313e15ce8 PSR-2 formatting 2017-01-02 03:57:23 +01:00
msquare b8ebd23f6d bring back filtering by occupancy 2016-12-29 15:33:21 +01:00
msquare 51eb22a1c6 fix shift signup state calculation 2016-12-29 15:24:57 +01:00
msquare fe5dec73ba bring back filtering by occupancy 2016-12-29 14:51:43 +01:00
msquare 68aeb14edb bring back filtering by angeltype 2016-12-29 14:16:00 +01:00
msquare cbeb45ef16 redo 2016-12-28 14:34:09 +01:00
msquare 45200b503d improve needed angel types query 2016-12-28 14:32:26 +01:00
msquare 0603d0dd4e remove unused code 2016-12-28 12:11:35 +01:00
msquare 363cc8f6b5 more performance using union 2016-12-28 01:09:40 +01:00
msquare 75945fdbbd more performance using union 2016-12-28 00:48:16 +01:00
msquare eccbf32f68 redo 2016-12-28 00:26:54 +01:00
msquare 84527c2252 redo 2016-12-28 00:16:59 +01:00
msquare 65a665ee49 reduce max shift filter duration to 24h 2016-12-28 00:11:42 +01:00
msquare aed9f2c96c bring back needed angeltypes from rooms 2016-12-28 00:02:55 +01:00
msquare 46528fe1d8 shift view performance improvements 2016-12-27 23:02:05 +01:00
msquare 2840bb6198 no signup for shifts for angels that are not arrived 2016-12-27 19:13:24 +01:00
msquare b05b235cf8 fix slow query 2016-12-27 16:02:13 +01:00
msquare 07a0ed37ec fix angeltype supporter privilege for signing up users to shift 2016-12-26 23:47:10 +01:00
msquare b3f92834b0 reduce number of sql queries on shift calendar 2016-12-26 14:33:18 +01:00
msquare deb41c4b64 reduce number of sql queries on shift calendar 2016-12-26 14:26:49 +01:00
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