iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,236 Commits 4 Branches 0 Tags 22 MiB
Commit Graph

664 Commits

Author SHA1 Message Date
Igor Scheller 4817658862 Merge branch 'noc0lour:fix_setup_bugs', closes #335 2017-09-25 20:25:00 +02:00
Igor Scheller 945fcb079a Added registration_enabled configuration 2017-09-20 12:18:08 +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 8c81adc8e8 Implemented container 2017-08-31 17:30:54 +02:00
Igor Scheller 0a20883aa8 Reimplementation of 2840bb619 (signup requires arrival), closes #330 2017-08-31 12:32:08 +02:00
Igor Scheller 2bd127c011 Use symfony session 2017-08-30 19:57:01 +02:00
Igor Scheller 96f1d9fd54 Bugfixes 2017-08-30 15:35:12 +02:00
Bot a473a56f1d Formatting 2017-08-30 00:22:02 +02:00
Igor Scheller 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
Igor Scheller 3002ed9e93 Security: Only allow angels with admin_news_html privilege to use HTML 2017-08-29 22:22:53 +02:00
Igor Scheller cc01c906ba #336: Integration of symfony/http-foundation request 2017-08-29 21:52:07 +02:00
Igor Scheller 73175e2b64 #337: Added routing 2017-08-28 17:34:00 +02:00
Andrej Rode 5f305121a4 fix order by not in select clause for >mysql-5.7 2017-08-16 00:45:56 +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 69a1ee2bfe use glyph bool icons on room list 2017-07-28 19:49:32 +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
Igor Scheller e1762e7764 replaced template_render with dynamic renderer class 2017-07-20 02:30:53 +02:00
Igor Scheller d4ad70804b Removed overwhelmed page 2017-07-20 02:10:53 +02:00
Igor Scheller 7d5d905fcf Moved $themes array to config 2017-07-20 01:14:28 +02:00
Igor Scheller 3a1e460249 Changed $_GET, $_POST and $_REQUEST to use the Request object 2017-07-19 11:44:16 +02:00
Igor Scheller 68da2a4eb8 Renamed "default_theme" config to "theme" 2017-03-02 08:11:52 +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
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 29128763fd Merge pull request #306 from MyIgel/config-fix-constant 
Fixes "Constant already defined" notice
 2017-01-02 00:09:18 +01:00
Igor Scheller 1f8d1eb4bb Fixed "Constant already defined" notice 
Added more ugly global variables
 2017-01-01 18:50:53 +01:00
Igor Scheller 00d8709ae8 Fix relative paths 2017-01-01 05:58:42 +01:00
msquare fe5dec73ba bring back filtering by occupancy 2016-12-29 14:51:43 +01:00
msquare 5600476c56 fix missing users on active angels view 2016-12-28 18:30:09 +01:00
msquare 4407604793 move data sorting to begin 2016-12-28 14:53:35 +01:00
msquare 6c4bb0da31 move data sorting to begin 2016-12-28 14:49:00 +01:00
msquare 0603d0dd4e remove unused code 2016-12-28 12:11:35 +01:00
msquare 860252bce8 select only one room per default 2016-12-27 23:07:44 +01:00
msquare 46528fe1d8 shift view performance improvements 2016-12-27 23:02:05 +01:00
msquare ffc33993d4 overwhelmed 2016-12-27 19:16:26 +01:00
msquare 9975e42d3c fix edit user bug deleting emails 2016-12-27 13:10:18 +01:00
msquare 2f2d08c574 fix edit user bug deleting emails 2016-12-27 13:05:30 +01:00
msquare 827de98256 fix room delete bug in pentabarf import temporarily 2016-12-26 19:08:59 +01:00
msquare 188891c147 use planned arrival time validation for register page 2016-12-23 16:22:46 +01:00
msquare bae3ede662 fixes #279 fix exporting freeload comment in json export 2016-11-25 13:38:16 +01:00
Leandra Eberle 67df8da061 Typo Changes and Descriptions 2016-11-24 22:47:32 +01:00
gnomus dc49b9af41 Update guest_login.php 2016-11-24 12:22:18 +01:00
msquare 16e9a69c0d fixes #277 date parsing returns the start of the day now 2016-11-24 09:25:28 +01:00
Leandra Eberle 4116e0114e Change ask an Arch Angel, to Ask the Heaven because the Arch Angel only role is deprecated 2016-11-24 00:17:01 +01:00
msquare 5ae328b2b1 hide event countdown for mobile clients 2016-11-20 17:54:16 +01:00
msquare 409761ce4b rebuild login page 2016-11-18 15:36:02 +01:00
msquare 9c4636f5c4 reduce complexity of user driver license 2016-11-17 14:35:04 +01:00
msquare 1636688394 reduce complexity of angeltype edit controller 2016-11-17 13:03:28 +01:00
msquare ac53559fea fix shift calendar headers 2016-11-15 22:00:17 +01:00
msquare 918d41ca70 reduce complexity of menu and hints 2016-11-15 16:31:55 +01:00
msquare ec6016cd38 reduce complexity of menu and hints 2016-11-15 16:28:20 +01:00
msquare 16ed2ae683 fixed settings validation 2016-11-14 19:10:29 +01:00
msquare d3e942f742 Merge pull request #273 from anykraus/typo-sheduler-scheduler 
minor typo fixed (sheduler to scheduler)
 2016-11-14 18:21:58 +01:00
msquare 5f2871538a fix css problem with rooms table 2016-11-11 17:07:40 +01:00
msquare 03c9d1ef5d reduce complexity of user settings main 2016-11-11 17:00:51 +01:00
msquare beb0db6852 fix misspellings 2016-11-11 16:42:47 +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 f6da9148e7 fix missing var check 2016-11-10 13:38:31 +01:00
msquare defdb3007c Merge pull request #272 from anykraus/#271-admin_active 
fix admin_active.php not displaying (issue #271)
 2016-11-09 22:04:22 +01:00
msquare a8e3e91448 implement shift calendar into user shift page 2016-11-07 20:55:37 +01:00
anykraus 8c22ec7f6d typo fixed (sheduler to scheduler) 2016-11-07 20:24:01 +01:00
anykraus efb7dbfb01 fix admin_active.php not displaying (issue #271) 
Reverts 53ad1b5110 "fix codacy unused code" partially. (where $shift_sum_formula was removed from global)
 2016-11-02 02:04:43 +01:00
msquare 6fff6a6c1a begin room view and shifts filter renderer 2016-10-05 18:56:50 +02:00
msquare a50b26490c reduce complexity of shiftsfilter update 2016-10-04 18:52:52 +02:00
msquare aa628208ec reduce complexity of shift view 2016-10-04 18:36:57 +02:00
msquare 676f5e1627 small code style improvements 2016-10-04 18:11:26 +02:00
msquare 42144ed21c move static access to datetime parse function 2016-10-04 17:58:56 +02:00
msquare eec10ebfc5 reduce complexity of user angeltypes controller 2016-10-04 16:50:06 +02:00
msquare 455e417200 fix variable naming problems 2016-10-04 16:16:00 +02:00
msquare 51d270db28 restore ical export 2016-10-03 19:37:00 +02:00
msquare f3a0ce865d move sql queries from shifts controller to model 2016-10-03 18:32:25 +02:00
msquare d59809d6d2 bring back session filter store 2016-10-02 23:32:10 +02:00
msquare 5e66007f06 introduce ShiftsFilter 2016-10-02 23:00:01 +02:00
msquare 6ff5e7997a split user_shifts into different functions 2016-10-02 21:19:03 +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 9ad9088260 make short variable names longer 2016-09-29 19:31:26 +02:00
msquare 07ddbb0f4c make short variable names longer 2016-09-29 12:45:06 +02:00
msquare f05f1a3cd4 rename to 2016-09-29 12:08:12 +02:00
msquare 81e5a6482c remove unused global from login 2016-09-29 11:32:03 +02:00
msquare 91dafb19ec prohibit inline control structures on pages 2016-09-29 10:53:17 +02:00
msquare 5170fd7f6e prohibit inline control structures on helpers 2016-09-29 09:49:25 +02:00
msquare 6685beb397 display event countdowns on start page 2016-09-29 09:25:06 +02:00
msquare 6384eca1ce display user welcome message 2016-09-28 07:28:51 +02:00
msquare a083c198bb better log when changing event config 2016-09-27 18:42:10 +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
msquare 3f4be08865 remove old update script 2016-08-22 19:32:54 +02:00
msquare 14d20933f7 improve quality of user atom 2016-08-22 19:23:23 +02:00
msquare 54e6f422ce cleanup guest stats 2016-08-22 19:11:09 +02:00
msquare 79588ff2cf split user atom into different functions 2016-08-22 19:08:10 +02:00
msquare d4bba0d468 remove exit code from shifts controller 2016-08-22 19:03:18 +02:00
msquare de917bc543 remove unused code 2016-08-21 23:11:23 +02:00
msquare f02148af35 fix rename bug 2016-08-21 23:00:58 +02:00
msquare 28e5a3b978 user_ical rewrite (remove codacy issues) 2016-08-21 22:58:09 +02:00
msquare 191328d703 fix method names, quotes, duplication in forms.js 2016-08-21 20:14:09 +02:00
msquare 53ad1b5110 fix codacy unused code 2016-08-21 18:00:39 +02:00
kamishetty sreeja 8a20b43f6d Added Feature Admin Settings Page 2016-07-14 13:49:38 +05:30
Philip Häusler 1da3cba5a7 fixes #241 problem when adding rooms 2016-02-01 11:48:40 +01:00
Philip Häusler c4179df503 fixes #237 bug when editing a room without changing its name 2016-01-19 11:35:00 +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 1983db901b better error message for creating room with name that is already used 2015-12-29 21:50:09 +01:00
Philip Häusler 2af1fd582e put message input to the top 2015-12-29 18:13:05 +01:00
Philip Häusler b479cdaef8 fix room creation 2015-12-29 17:57:16 +01:00
Philip Häusler 522546795b search only for nickname on active angel page 2015-12-29 15:32:58 +01:00
Philip Häusler 4684d708fb better shift cancel messages and workflow 2015-12-28 17:47:02 +01:00
Philip Häusler 99d36e47b8 redirect to other users page on shift cancel 2015-12-28 17:42:29 +01:00
Philip Häusler 897053e049 redirect to users profile page after marking as arrived or not arrived 2015-12-27 23:20:09 +01:00
Philip Häusler 667466b9d0 add minutes to start and end of talks for frab import 2015-12-26 12:37:29 +01:00
Philip Häusler 28edf6bd48 make register log entry include link to userpage 2015-12-12 19:39:30 +01:00
Philip Häusler 3790818baf fix user delete log entry 2015-12-04 21:50:39 +01:00
Max Weller 0dc8da68f4 display room number in admin_rooms edit form 2015-12-02 18:59:38 +01:00
Felix Favre 73208016bf change date format in shift table 
fixes #202
 2015-08-26 15:03:53 +02:00
Felix Favre e4bd324801 changed all y-m-d date formats to Y-m-d date formats 
part of #202
 2015-08-26 15:00:48 +02:00
Felix Favre 2df2398b87 add more information to ical export 
fixes #175
 2015-08-26 14:29:51 +02:00
Philip Häusler 128ee0911f fix wrong data at arrival statistics 2015-08-16 23:32:39 +02:00
Philip Häusler c4ee004095 rework arrival stat graphs and tables 2015-08-16 23:13:13 +02:00
gnomus b3aa6cc473 Change Register form E-Mailfield to form_email 2015-08-16 20:38:41 +02:00
Philip Häusler cac86ef509 add planned date of departure 2015-08-15 14:54:25 +02:00
Philip Häusler bc84710e9d wording 2015-08-14 17:40:58 +02:00
Philip Häusler 28788e6702 put shirt statistics into one table 2015-08-14 14:16:09 +02:00
Philip Häusler e8daa4d2ce add table of needed shirts to user active page 2015-08-14 14:06:33 +02:00
Philip Häusler fc0d97344e made shift creation angeltypes smaller (like room editing) 2015-08-14 12:42:18 +02:00
Philip Häusler 42150cc6e9 add log entry for deleting own shift entries 2015-08-14 09:28:32 +02:00
Philip Häusler 3d7e378b67 change default end date on creating shifts 2015-08-13 22:57:40 +02:00
Philip Häusler 1cd6a4f4f6 keep the show all users checkbox 2015-08-13 22:57:29 +02:00
Philip Häusler f9fb12c7f1 show all forced active angels 2015-08-13 22:38:32 +02:00
Philip Häusler 34be996f22 add possibility to show already done shifts in admin active view 2015-08-13 20:28:48 +02:00
Philip Häusler 1c9a3fa89e fix group rights management 2015-08-13 11:46:06 +02:00
Philip Häusler 723961c19e User shift admins see free and occupied shifts by default 2015-08-13 11:22:25 +02:00
Philip Häusler df526fa2bf fix problem with beeing informed about shift changes 2015-08-13 10:48:39 +02:00
Philip Häusler 681d52fe0f fix frab import problem on creating rooms 2015-08-12 20:43:22 +02:00
Philip Häusler 1dcd6c0f3f fix loggin on setting rooms angeltypes 2015-08-09 17:56:03 +02:00
Philip Häusler bc0354fbff responsive resizing for graphs is broken -> turn off 2015-07-27 17:36:42 +02:00
Philip Häusler bae55f78fd swap chart and table 2015-07-18 21:34:14 +02:00
Philip Häusler d414c455a2 responsive chart 2015-07-18 21:32:50 +02:00
Philip Häusler 46f0636f2f arrival statistics 2015-07-18 21:27:30 +02:00
Philip Häusler 18644cac7a fixes #196: make users planned arrival date editable in user settings and show it in their own profile 2015-07-15 21:53:19 +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 218b305a3e fix broken session creation 2015-06-07 13:33:59 +02:00
Philip Häusler 0a59089e2b add room model tests 2015-05-14 17:20:46 +02:00
Philip Häusler 9af229094d display user nicks on shift json export 2015-01-05 13:58:34 +01:00
Philip Häusler 48e4787548 set force active user to active 2015-01-05 13:58:24 +01:00
Philip Häusler ca37de95da fix shift update 2014-12-28 14:56:02 +01:00
Philip Häusler 739eddefd5 better shift sign up restriction 2014-12-28 14:20:16 +01:00
Philip Häusler 6bede2fd22 harden the sql queries 2014-12-28 13:44:56 +01:00
Philip Häusler cb46534569 move shift edit buttons 2014-12-28 01:30:29 +01:00
Philip Häusler 0b70fc2a7f better shift sign up buttons in shift view 2014-12-28 01:27:41 +01:00
Philip Häusler 502a52394e redirect to users page on shift cancel by admin 2014-12-27 23:38:23 +01:00
Philip Häusler 16ce2eb969 begin cleanup of user edit 2014-12-27 21:55:24 +01:00
Philip Häusler 247d9b65c1 remove user angeltype administration from user-edit 2014-12-27 21:48:08 +01:00
Philip Häusler 582c429fd4 allow admin to sign up more angels than needed again 2014-12-27 00:15:41 +01:00
Philip Häusler 8d6175a273 user cannot signup for full shifts 2014-12-26 23:48:16 +01:00
Philip Häusler dc412ba826 sort meetings by date 2014-12-26 19:22:03 +01:00
Philip Häusler 71a23be3d4 fade out for not arrived angels 2014-12-26 19:11:26 +01:00
Philip Häusler 9007bb6790 sort news by date 2014-12-26 18:39:16 +01:00
Philip Häusler 8764be8604 display room per shift in shift table 2014-12-26 14:31:37 +01:00
Philip Häusler fc4a5e0e7a fix shift creation for shifttypes 2014-12-26 02:34:57 +01:00
Philip Häusler 9cabdb1d78 shift edit for shifttypes 2014-12-26 02:27:54 +01:00
Philip Häusler 33bafad9b7 fix wrong redirect after shift edit 2014-12-26 01:26:17 +01:00
Philip Häusler 34e2f49875 shift signup improvements for shift view 2014-12-25 22:23:18 +01:00
Philip Häusler 3770ab8271 add import progress 2014-12-22 20:30:29 +01:00
Philip Häusler 0fda4a9181 update german translation 2014-12-22 20:25:19 +01:00
Philip Häusler 342b79ff3f more fixes 2014-12-22 20:18:34 +01:00
Philip Häusler 2d587478a1 fix different bugs with shift types 2014-12-22 20:06:37 +01:00
Philip Häusler 702047de53 add more icons for better shift view 2014-12-22 18:22:54 +01:00
Philip Häusler c12e5336fb display shifts with title 2014-12-22 18:06:58 +01:00
Philip Häusler 6a05c3d9de rewrite create shifts for shifttypes 2014-12-22 17:55:20 +01:00
Philip Häusler 0dbd0ea599 add basic shift view 2014-12-19 23:04:26 +01:00
Felix Favre 2f20540a6b more infos in shift view 2014-12-19 23:02:50 +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
Felix Favre 807e420883 only log if api key was reset on purpose 2014-12-16 00:54:50 +01:00
Felix Favre b299b0e085 reworked user editing of angeltypes 
fixes #170
 2014-12-16 00:16:10 +01:00
Felix Favre f20e24f589 shift page styling 2014-12-15 23:09:06 +01:00
Felix Favre be1bb5fbeb add simple search to log view 2014-12-15 21:23:57 +01:00
Philip Häusler 388dd0e136 display date 2014-12-15 19:08:40 +01:00
Felix Favre ed001633e6 Own Shifts ignore the filled filter. 
issue #134
 2014-12-13 01:56:29 +01:00
Felix Favre 3e958227aa fix shift collision display 2014-12-13 00:34:27 +01:00
Felix Favre e9bbd967ff add freeload info to shiftentry update log 
issue #28
 2014-12-12 23:40:36 +01:00
Felix Favre bc6aa9a209 responsify create room form 2014-12-12 22:55:56 +01:00
Felix Favre 1cc84a967a change default selection 2014-12-12 22:41:35 +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