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

395 Commits

Author SHA1 Message Date
Igor Scheller 88f3bafa5e Replaced `Auth()` with `auth()` 2018-10-31 13:43:23 +01:00
Igor Scheller a2aaba9cab User: Bugfixes & code cleanup 2018-10-31 13:43:23 +01:00
Igor Scheller d7aea575ff Replaced more sql queries and old data 2018-10-31 13:43:23 +01:00
Igor Scheller 57932be428 Moved arrival_date to state 2018-10-31 13:43:23 +01:00
Igor Scheller 4e09ee3eb2 Replaced more user related stuff 
(Contains some buggy stuff too...)
 2018-10-31 13:43:23 +01:00
Igor Scheller 7c6afc2bfe Removed `User($id)` function 🎉 2018-10-31 13:43:23 +01:00
Igor Scheller 89e62c95a7 Changed more functions 🎉 2018-10-31 13:43:23 +01:00
Igor Scheller b069a938c6 Changed user_link and some other user functions to use the user id 2018-10-31 13:43:23 +01:00
Igor Scheller 2dcb7cc2de Replaced some global `$user` variables 2018-10-31 13:43:23 +01:00
Igor Scheller d15946df2d Changed `src/` code and templates to use the new user model 2018-10-31 13:43:23 +01:00
Igor Scheller b443b53919 Translation: added pluralization support 2018-10-30 22:50:22 +01:00
Igor Scheller 90e1a94962 Make application name configurable 
* Added app_name configuration option
* Extended `EngelsystemMailer` to prepend the application name to all mails

Closes #426
 2018-10-30 22:50:22 +01:00
Igor Scheller 7f61dc95be EventConfig: Merge event configuration from database to global config 2018-10-30 21:13:56 +01:00
Igor Scheller 7762c0eb2b Translatable user groups & cutoff fix 
Closes #318 (Typo: "irt Manager" instead of "Shirt Manager")
 2018-10-24 19:18:35 +02:00
Igor Scheller 66038eda14 Merge branch 'twig-templates' 2018-09-23 20:11:37 +02:00
Igor Scheller 2a134e6c0b Config: Removed nightshifts query 2018-09-23 11:40:53 +02:00
Igor Scheller d0abc27c07 Merge remote-tracking branch 'MyIgel/translations' 2018-09-15 14:58:31 +02:00
Igor Scheller 9e217d87c0 Template refactoring to use twig 2018-09-02 02:09:56 +02:00
Bot e8f8fc7f5f Replaced gettext translation `_()` with `__()` that uses the Translator class 2018-08-29 23:46:32 +02:00
Igor Scheller acfe72cb91 Removed translation from config file 2018-08-29 23:46:32 +02:00
Igor Scheller d6c8f1a614 Merge branch 'master' to 'rebuild-database' 2018-08-20 21:07:57 +02:00
Bot 28349b69a8 Changed JS to use single quotes instead of double quotes 2018-08-11 22:16:57 +02:00
Bot 5227fe6a94 Formatting 2018-01-14 18:09:34 +01:00
Igor Scheller fe58e4f422 database: updated checks for selectOne 2018-01-14 17:47:26 +01:00
mia c83771ed62
Fixes #401 
Display "shift started" instead of "shift starts" when shift has already started.
 2018-01-01 16:55:59 +00:00
msquare c961269bb7 better hour formatting 2017-12-30 12:07:10 +01:00
msquare d66dc43aec fix worklog entry view 2017-12-29 19:08:57 +01:00
msquare ee9fbda098 add work date to work log 2017-12-29 18:57:11 +01:00
msquare d95e488893 add work log creator infor 2017-12-29 17:37:08 +01:00
msquare 86a38a3372 add user work log entries feature 2017-12-29 17:19:27 +01:00
msquare 14584b9611 small improvements of user view 2017-12-29 13:18:28 +01:00
msquare be6bd2f3d3 small improvements of user view 2017-12-29 13:13:45 +01:00
msquare 3993e553d1 small improvements of user view 2017-12-29 13:12:56 +01:00
msquare c3b8fa892d tshirt-score for forced active 2017-12-27 20:30:05 +01:00
Bot b00743d6d3 Formatting 2017-12-27 13:50:53 +01:00
msquare 02b775684d some beauty for the my shifts table 2017-12-27 12:45:48 +01:00
msquare 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
msquare abf4b1da30 check if logged in before sign up 2017-12-27 11:35:26 +01:00
Igor Scheller f1b7946975 Removed some short ifs from Shifts_view.php 2017-12-26 14:35:33 +01:00
msquare db11dd1d0f fix room view 2017-12-26 12:45:35 +01:00
msquare a7dc640385 add my shifts button to shift view 2017-12-26 12:17:51 +01:00
msquare 0101993284 fix dashboard rows 2017-12-26 10:52:32 +01:00
msquare d4ccc14d6c fix dashboard rows 2017-12-26 10:51:23 +01:00
msquare 6aaf8d6f53 fix #389: Public Dashboard Stats 2017-12-26 10:47:39 +01:00
Bot 952c7892f3 Formatting & Docstrings 2017-12-25 23:51:15 +01:00
klemens a6cf4c9ce9 spelling fixes 2017-12-25 21:29:00 +01:00
msquare 6f29b6492d show forced active on user view 2017-12-24 10:48:04 +01:00
msquare 05aad262bb show forced active on user view 2017-12-24 10:21:52 +01:00
msquare fbbea4eb5f add show on dashboard flag for angeltypes 2017-12-23 11:59:13 +01:00
msquare a1c032642f introduce new shift signup state for not arrived angels 2017-12-20 23:12:17 +01:00
msquare 2c04e35bed introduce new shift signup state for not arrived angels 2017-12-20 23:05:46 +01:00
msquare 7a3bdda483 rewrite controller for creating shift entries 2017-12-20 00:54:57 +01:00
msquare 1289101f6e rewrite controller for creating shift entries 2017-12-20 00:42:58 +01:00
msquare fd85034e7f redo shift signoff and icons for delete/confirm/acknowledgment questions 2017-12-19 20:58:01 +01:00
msquare b60ad7ccfb make shift entry comment private again 2017-12-18 11:25:26 +01:00
msquare 3ea35788be finetuning dashboard layout 2017-12-14 20:09:51 +01:00
msquare a5f4de9509 finetuning dashboard layout 2017-12-14 20:03:34 +01:00
msquare c70e268a2e add fullscreen button to dashboard and update translation to german 2017-12-13 17:50:52 +01:00
msquare cf7eb80a92 fix dashboard ajax reload 2017-12-13 16:51:38 +01:00
gnomus c3d22ad517
Replace window reload with jquery ajax load 2017-12-13 14:43:17 +01:00
msquare 991058a9e4 improve public dashboard 2017-12-13 12:37:05 +01:00
msquare adc62470c5 improve public dashboard 2017-12-13 12:22:26 +01:00
msquare 582b1a739a improve public dashboard 2017-12-12 22:09:01 +01:00
msquare 3379ea10b2 improve public dashboard 2017-12-12 22:04:12 +01:00
msquare 59b8e76d12 improve public dashboard 2017-12-12 22:00:29 +01:00
msquare ff94df53d6 finish basic public dashboard 2017-12-12 21:57:57 +01:00
msquare 74f3677f19 add quick+dirty public dashboard 2017-12-11 22:26:36 +01:00
msquare cbe88ad801 remove some unused code 2017-12-10 15:12:39 +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 6dfa70974e ask for dect number if user arrived 2017-12-03 20:45:15 +01:00
MichiK bc3f777b23 Rename 'supporter(s)' to 'Supporter(s)' 2017-12-02 16:31:37 +01:00
msquare 962e7d5726 Hide 'You are not marked as arrived' notification in header until congress starts, fixes #368 2017-11-30 21:32:04 +01:00
msquare e54a10b816 add shift calendar to angeltype view fix tab jumps 2017-11-24 12:09:28 +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 b95d4ece8a increase readability of hints with links, refs #357 2017-11-19 16:41:20 +01:00
Igor Scheller d34b160b5c Added links to notifications, closes #357 2017-11-19 16:29:51 +01:00
Igor Scheller 945fcb079a Added registration_enabled configuration 2017-09-20 12:18:08 +02:00
msquare db8b6b2520 change shift renderer global add user link 2017-09-16 17:14:45 +02:00
Igor Scheller 0a20883aa8 Reimplementation of 2840bb619 (signup requires arrival), closes #330 2017-08-31 12:32:08 +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 73175e2b64 #337: Added routing 2017-08-28 17:34:00 +02:00
msquare 5cffcd7fdf fix angeltype edit and display bugs 2017-07-28 19:44:54 +02:00
msquare 4effb7e59f fix lane rendering 2017-07-28 19:28:11 +02:00
msquare a0af8d4624 further switching to db exceptions instead of return false 2017-07-28 19:15:52 +02:00
Igor Scheller cdf14f9d3f Reapplied "Merge pull request #321 from raboof/wantsToDrive" 2017-07-17 23:43:47 +02: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 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 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 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 363cc8f6b5 more performance using union 2016-12-28 01:09:40 +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 5f9d508b02 fix #297 show date on every time tick in shift calendar 2016-12-26 18:39:29 +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 5b9ff7b7bf fix that free shifts become green 2016-12-23 12:50:27 +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
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
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 bae3ede662 fixes #279 fix exporting freeload comment in json export 2016-11-25 13:38:16 +01:00
msquare 4f6db20ae4 fix shift view bars 2016-11-25 13:03:41 +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 9098b8e80d reduce complexity of user view 2016-11-18 08:47:52 +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 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 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 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 c61e888de4 change shift coloring 2016-11-12 12:56:10 +01:00
msquare 247166f28b improve code of user settings 2016-11-11 16:34:23 +01:00
msquare 82b9436c50 rename coordinator to supporter 2016-11-11 14:59:25 +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 db7f8c1ab3 split shift calendar renderer into different classes 2016-11-07 20:50:15 +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
msquare 1d4811cca5 remove unused code 2016-10-08 09:18:04 +02: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 eec10ebfc5 reduce complexity of user angeltypes controller 2016-10-04 16:50:06 +02:00
msquare 51d270db28 restore ical export 2016-10-03 19:37:00 +02:00
msquare 6c8a113383 introduce ShiftsFilter 2016-10-03 17:41:14 +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 e965f8d041 prohibit inline control structures on model and view 2016-09-29 11:18:17 +02:00
msquare 6685beb397 display event countdowns on start page 2016-09-29 09:25:06 +02:00
msquare 50bf7feff0 show event info in footer text line 2016-09-28 11:46:40 +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 6f6724e55b update german translation 2016-09-27 18:08:55 +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 53ad1b5110 fix codacy unused code 2016-08-21 18:00:39 +02:00
Philip Häusler 99c8751059 some minor text changes on user vouchers 2016-03-22 14:51:30 +01:00
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 2cb44fe517 make angeltype names clickable 2015-12-20 10:35:03 +01:00
Philip Häusler facc32f133 #198 add basic driver license information 2015-12-19 23:31:08 +01: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
Philip Häusler a7189482e9 add shift creator and editor 2015-08-15 23:36:38 +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 18e49ee06a put active+shirt info into a new line 2015-08-14 13:20:24 +02:00
Philip Häusler 41280a17f5 added hint about nightshifts 2015-08-14 12:32:54 +02:00
Philip Häusler 3d7e378b67 change default end date on creating shifts 2015-08-13 22:57:40 +02:00
Philip Häusler 5742306095 fix wrong user shift edit link 2015-08-13 09:13:13 +02:00
Philip Häusler 2823c0e438 fix angel list with multiple vouchers 2015-08-12 23:47:06 +02:00
Philip Häusler 803c0a552f make multiple vouchers possible 2015-08-12 23:44:39 +02:00
Philip Häusler 6376b90e9f introduce table buttons to angeltype view 2015-07-27 17:14:41 +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 a6ab81b834 fix overfull progress bars 2014-12-28 01:35:36 +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 af52251cef angelnames were too fat. 2014-12-27 21:32:02 +01:00
Philip Häusler 77273425f7 fade out for not arrived angels 2014-12-26 18:59:32 +01:00
Philip Häusler bd48de258a update german translation 2014-12-26 18:51:06 +01:00
Philip Häusler 47b52bc3f6 count confirmed and unconfirmed angels 2014-12-26 16:57:58 +01:00
Philip Häusler c602d0208f integrate voucher into user state 2014-12-26 01:57:15 +01:00
Philip Häusler 7cb3a772ed integrate vouche into user state 2014-12-26 01:56:16 +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 342b79ff3f more fixes 2014-12-22 20:18:34 +01:00
Philip Häusler 702047de53 add more icons for better shift view 2014-12-22 18:22:54 +01:00