Commit Graph

897 Commits

Author SHA1 Message Date
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
Igor Scheller a2b9edc6a3 Reapplied "Merge pull request #314 from Scriptkiddi/master" 2017-07-17 22:17:58 +02:00
Arnout Engelen b688b928db Read wants_to_drive field correctly 2017-04-30 13:02:38 +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
Arnout Engelen cf20b65902 Reword 'wants to operate a car for the PL'
As discussed in #sha2017-angel
2017-04-30 13:00:53 +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 37c32ad08f Added PDO::ATTR_EMULATE_PREPARES => false 2017-03-02 12:48:48 +01:00
Igor Scheller 68da2a4eb8 Renamed "default_theme" config to "theme" 2017-03-02 08:11:52 +01:00
Fritz Otlinghaus c9336840ff Update email_helper.php 2017-02-03 17:23:06 +01:00
Fritz Otlinghaus 6f367eefe0 Update email_helper.php 2017-02-03 17:14:46 +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 f7c09cb7ff Added exception handler 2017-01-20 21:12:19 +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
Igor Scheller 84f6990db2 Merged branch origin/master 2017-01-02 02:21:53 +01:00
Igor Scheller 94b5250414 Added composer with parsedown requirement 2017-01-02 02:19:17 +01:00
msquare 4a95dfa171 Merge pull request #307 from MyIgel/real-path
Fix relative paths: missing / on internationalization
2017-01-02 00:10:49 +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 1f0ca24f5c Fix relative paths: missing / on internationalization 2017-01-01 19:49:59 +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 5e850171e2 Fixed "Constant already defined" notice 2017-01-01 15:43:20 +01:00
Igor Scheller f894ca5fa4 Fix relative paths 2017-01-01 15:25:21 +01:00
Igor Scheller 00d8709ae8 Fix relative paths 2017-01-01 05:58:42 +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 3fbd62ab7d bring back coloring for admins 2016-12-29 14:56:09 +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 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 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 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 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 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 07a0ed37ec fix angeltype supporter privilege for signing up users to shift 2016-12-26 23:47:10 +01:00
msquare 827de98256 fix room delete bug in pentabarf import temporarily 2016-12-26 19:08:59 +01:00
msquare 5f9d508b02 fix #297 show date on every time tick in shift calendar 2016-12-26 18:39:29 +01:00
msquare 549cd6534a reduce number of sql queries on shift calendar 2016-12-26 14:40:28 +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 0c15964e6b #298 hide freeload form from angeltype supporters 2016-12-24 17:02:34 +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 188891c147 use planned arrival time validation for register page 2016-12-23 16:22:46 +01:00
msquare 5b9ff7b7bf fix that free shifts become green 2016-12-23 12:50:27 +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 acfe7309f6 remove angeltype contact fields until the feature is ready 2016-12-15 08:51:19 +01:00
msquare 2f0a63a4a1 remove angeltype contact radios for now 2016-12-13 17:59:42 +01:00
msquare e26eb952f4 update binary lang file 2016-12-13 17:59:42 +01:00
msquare deac80e700 merge #253 2016-12-13 17:58:41 +01:00
jwacalex 6a591e7557 merged cherry picked commit 2016-11-30 23:31:21 +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
jwacalex 1324260e0f forgot to remove if-statement -.- 2016-11-30 16:17:52 +01:00
jwacalex f4f6dfefcb fixed broken logic in controller (cf. to mail to @msquare) 2016-11-30 15:53:47 +01:00
Leandra Eberle 687c333322 Update Descriptions 2016-11-26 16:44:28 +01:00
Leandra Eberle acbaaf4364 Update Descriptions 2016-11-26 16:43:22 +01:00
Leandra Eberle 10517213f6 Update Descriptions 2016-11-26 16:33:07 +01:00
Leandra Eberle 0401e90f00 Update Descriptions 2016-11-26 16:23:49 +01:00
msquare 561e8ec36c better msg placement on angeltype view 2016-11-25 14:55:19 +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 a8bcb19eaa fix shift view bars 2016-11-25 13:06:05 +01:00
msquare 4f6db20ae4 fix shift view bars 2016-11-25 13:03:41 +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 ff31d0a1c5 fix shift signup state being combined to null 2016-11-24 09:32:32 +01:00
msquare 16e9a69c0d fixes #277 date parsing returns the start of the day now 2016-11-24 09:25:28 +01:00
msquare 321566d4b0 Merge pull request #278 from leaneb/master
Change Ask an Arch Angel title
2016-11-24 09:15:05 +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 3fd30add3c fix NPE 2016-11-23 22:31:11 +01:00
msquare be8c47a175 add 33c3 theme 2016-11-23 17:52:58 +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 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 356cc9e1d0 reduce complexity of user driver license 2016-11-17 15:04:33 +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 b5784e5961 fix order problem 2016-11-17 13:16:15 +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 ac53559fea fix shift calendar headers 2016-11-15 22:00:17 +01:00
msquare 54f3253c32 fix js var names 2016-11-15 21:42:43 +01:00
msquare 79ca2f1772 add fixed shift calendar headers and timelane 2016-11-15 21:33:54 +01:00
msquare 5299ca2103 reduce complexity of shift view 2016-11-15 17:54:59 +01:00
msquare 5a93050a06 localize date rendering for eventconfig info 2016-11-15 17:41:02 +01:00
msquare 15243f15fc fix shift view 2016-11-15 17:22:15 +01:00
msquare ec40e10ebd fix unused code 2016-11-15 16:58:12 +01:00
msquare 53a306f14b make departure date nullable 2016-11-15 16:36:03 +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 7cf2a9bb9b split templates into different files 2016-11-14 18:14:32 +01:00
msquare 1a1ca1d1b5 split templates into different files 2016-11-14 18:14:23 +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 c61e888de4 change shift coloring 2016-11-12 12:56:10 +01:00
msquare c10ab2d8d2 reduce complexity of shift signup allowed 2016-11-12 12:50:52 +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 468a10774c reduce complexity of user driver license controller 2016-11-10 13:55:16 +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 dfc9e209a5 fix parsedown 2016-11-09 19:25:55 +01:00
msquare af9328f558 split angeltype about view into different methods 2016-11-09 18:05:00 +01:00
msquare 0ba0ce207d split angeltype view into different methods 2016-11-09 18:02:01 +01:00
msquare 22520532c7 fix shift occupied calculation 2016-11-07 21:24:05 +01:00
msquare 125f34133d remove unused var 2016-11-07 21:11:05 +01:00
msquare a8e3e91448 implement shift calendar into user shift page 2016-11-07 20:55:37 +01:00
msquare db7f8c1ab3 split shift calendar renderer into different classes 2016-11-07 20:50:15 +01:00
anykraus 8c22ec7f6d typo fixed (sheduler to scheduler) 2016-11-07 20:24:01 +01:00
msquare cf8cc5f592 change shift table to html5 2016-11-05 10:06:06 +01:00
msquare 902866ff3a add first design of new shift markup 2016-11-03 18:28:22 +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 1d4811cca5 remove unused code 2016-10-08 09:18:04 +02:00