Commit Graph

1148 Commits

Author SHA1 Message Date
Igor Scheller 540efef63e active angels: Bugfix and prevent errors when searching double spaces 2018-12-28 21:39:23 +01:00
Igor Scheller 0150aca6ad Order rooms in shift overview by name
closes #551 (Order of Rooms in overview)
2018-12-28 15:36:45 +01:00
msquare 794df6f99e fixes #548: users with only worklog and no shifts had 0 minutes on admin-active. query fixed 2018-12-27 19:53:48 +01:00
msquare db26412e6c fixes #549: fill missing arrival dates and prevent setting arrival by admin-user instead of admin-arrive 2018-12-27 19:08:35 +01:00
Igor Scheller 689735ad51 Sort users on team page 2018-12-27 14:16:09 +01:00
Igor Scheller acd9ec6966 add multiple shifts: Fix hour regex and sorting, cleanup and formatting 2018-12-26 19:49:01 +01:00
Igor Scheller 36830c43e7 Fix warning if searching two whitespaces and formatting 2018-12-26 19:39:40 +01:00
Igor Scheller 31d9efb2b8 Bugfix: Edit user: Show groups list if angel has no rights 2018-12-25 14:46:14 +01:00
Igor Scheller d214525e24 Sort Angels Alphabetical
closes #541 (Shift Signup: Sort Angels Alphabetical)
2018-12-25 10:25:32 +01:00
jwacalex 8c5b52aa11 reformatted code due to guidelines 2018-12-22 12:10:16 +01:00
jwacalex 60a9c15454 first draft for #536 2018-12-22 12:10:16 +01:00
Igor Scheller b1d8fede46 user: allow up to 40 characters for dect numbers
closes #309 (EPVPN number in DECT field is shortened)
closes #529 (For dect numbers are only 5 digits allowed)
2018-12-22 12:03:24 +01:00
Clemens 482721eb1b user view: Show multiple worklog entries per day
closes #531 (Multiple worklogs on same day not displayed in users shift list (but counted in sum))
2018-12-21 21:18:14 +01:00
Igor Scheller c5621b82cf Implemented /metrics endpoint and reimplemented /stats
closes #418 (/metrics endpoint)

Usage:
```yaml
scrape_configs:
  - job_name: 'engelsystem'
    static_configs:
    - targets: ['engelsystem.example.com:80']
```
2018-12-19 22:36:42 +01:00
Igor Scheller 9a15fbc71e worklog: Fix hours validation
closes #527 (Worklog entries with floating point numbers with a comma dispatches a team of untrained monkeys)
2018-12-18 13:48:46 +01:00
Igor Scheller 204ff4c0e7 rooms admin: Set a maximum character length
closes #525 (Room names with more than 35 characters dispatch a team of untrained monkeys)
2018-12-18 13:22:10 +01:00
Igor Scheller c676e73cf6 php7.3: Fix username validation regex
closes #523 (Login does not work ->Invalid range in character class)
2018-12-18 12:44:09 +01:00
msquare 412be8e188 upgrade chart.js lib and fix bargraph. fixes #511 2018-12-09 13:07:19 +01:00
msquare 93b819025c fix margin of form submit in tables 2018-12-09 12:51:48 +01:00
MichiK 252f003b94 Really fix the data/timepicker CSS and JS
Attaching the timepicker to the input instead of the sorrounding div didn't
turn out as expected. Therefore, I used the same mechanism for DOM attachment
and lazy initialization for the timepicker like for the datepicker.

Instead of trying to load the CSS through webpack and some JS voodoo, it's
a lot simpler to just include it via the normal base theme CSS. This works.
In addition, I noticed that there is an easier way to read the current locale.
No need to do this twice via different ways.

This closes #516.
2018-12-08 21:14:20 +01:00
MichiK 7e53c45890 Change the color of "reset" in admin_arrive 2018-12-07 17:26:44 +01:00
MichiK ed5ee3235e Add timepickers in shifts view 2018-12-05 18:43:51 +01:00
MichiK 4e3232e57a Replace datepicker and remove datepicker inline JS 2018-12-04 21:03:32 +01:00
MichiK 36b7f8d2a2 Fix datepicker
`<input type="date">` and JS datepicker combined cause trouble in some
browsers, so this changes all the date input fields' type to `text`
via JS so that the browser's datepicker is only used when a user has
disabled JavaScript.

In addition, it adds a placeholder so the user knows which date format
to use when entering the date manually.

This closes #507.
2018-12-03 19:21:45 +01:00
Igor Scheller c33940f64a Moved permission checks to Authenticator class 2018-12-02 12:53:31 +01:00
msquare e0de2c2c65 more work on 35c3 theme 2018-11-25 15:40:53 +01:00
Igor Scheller f845a5ab8b Added caching for templating and routing
See #486 (Implement caching)
2018-11-24 16:30:36 +01:00
Igor Scheller 944c29b964 Require POST for sending forms
* Ensure that the form is submitted with a post request
* Replaced several links with forms

Closes #494 (Security Vulnerability)
2018-11-21 19:24:36 +01:00
Igor Scheller 23c0fae36f Added csrf middleware 2018-11-21 19:24:36 +01:00
msquare 8236989be0 fix missing unique mail validation on user register 2018-11-18 12:13:00 +01:00
Igor Scheller 15751f9c7a Fix error when accessing undefined date
Closes #491 (Edit User fails when User never logged in before)
2018-11-02 18:03:40 +01:00
Igor Scheller 88f3bafa5e Replaced `Auth()` with `auth()` 2018-10-31 13:43:23 +01:00
Igor Scheller 82b22160fd Fixed error if shirt size is not configured 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 6187eed3bb Merge remote-tracking branch 'MyIgel/mailing' 2018-09-26 21:31:18 +02:00
Igor Scheller 66038eda14 Merge branch 'twig-templates' 2018-09-23 20:11:37 +02:00
Nos- b2303c0723 Tried to fix inputfields for date, email, tel 2018-09-23 11:48:09 +02:00
Igor Scheller 2a134e6c0b Config: Removed nightshifts query 2018-09-23 11:40:53 +02:00
Igor Scheller 0734807eef Merge remote-tracking branch 'MyIgel/logentry-model' 2018-09-16 12:06:18 +02:00
Igor Scheller d0abc27c07 Merge remote-tracking branch 'MyIgel/translations' 2018-09-15 14:58:31 +02:00
Igor Scheller 8456a3cf6f Moved emojis to assets 2018-09-10 22:49:46 +02:00
Igor Scheller c1a1180d1f Moved frontend, templates and lang to resources 2018-09-10 18:22:48 +02:00
Igor Scheller 222c9fed7d Merge remote-tracking branch 'MyIgel/templating' 2018-09-09 12:11:12 +02:00
Igor Scheller 01e9c22695 Implemented mailing abstraction
Closes #434
2018-09-05 13:44:43 +02:00
Igor Scheller 36dafdb68a Merge remote-tracking branch 'MyIgel/rebuild-psr7' 2018-09-03 22:55:54 +02:00
Igor Scheller 9d34f371cb Added CreditsController 2018-09-03 15:42:51 +02:00
Igor Scheller 9e217d87c0 Template refactoring to use twig 2018-09-02 02:09:56 +02:00
Igor Scheller ac48332166 Models: Added LogEntry model 2018-08-31 03:24:54 +02:00
Igor Scheller 2bebbeb191 Installation: Added migrations for install.sql and update.sql files 2018-08-30 16:07:50 +02:00
Igor Scheller 9d9aa71eb7 Installation: Added migrations for install.sql and update.sql files 2018-08-30 15:53:37 +02:00
Igor Scheller 5456fea503 $bugfixes 2018-08-29 23:46:32 +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 427315195b Moved translation/internationalization to Helpers\Translator class 2018-08-29 23:46:31 +02:00
Igor Scheller bb3d16d273 Added Twig template renderer, closes #338 2018-08-29 23:46:11 +02:00
Igor Scheller 175c335810 Db::selectOne() should return null if result is empty 2018-08-29 18:11:35 +02:00
msquare 1090d5e889
Update shifts_controller.php
fix problem when missing needed angeltype entry
2018-08-28 18:28:09 +02:00
Igor Scheller d93ace2eae Prevent object serialization in session 2018-08-20 21:08:06 +02:00
Igor Scheller d6c8f1a614 Merge branch 'master' to 'rebuild-database' 2018-08-20 21:07:57 +02:00
Igor Scheller f3b3b6683c Added middleware tests 2018-08-19 13:59:39 +02:00
msquare df30f7d5d8 merge pr #427: Use npm to handle frontend dependencies 2018-08-12 12:42:58 +02:00
Bot 28349b69a8 Changed JS to use single quotes instead of double quotes 2018-08-11 22:16:57 +02:00
Igor Scheller 864a086900 Prevent object serialization in session 2018-08-07 16:54:08 +02:00
msquare 2832fe48ee rename some params (codestyle) 2018-08-06 13:10:53 +02:00
msquare 9496e35711 added comments and renamed short method to url generators 2018-08-06 12:57:48 +02:00
msquare 5a83d4fb8b fix broken css class on main menu angel icon 2018-08-06 12:33:08 +02:00
msquare 6dbec2e2fb remove unused code 2018-01-28 14:52:26 +01:00
msquare 0f1da65f2a
Merge pull request #421 from MyIgel/master
Prevent empty string after $tokens = explode(' ', $search);
2018-01-22 20:48:59 +01:00
msquare 2e1c2cf3b5 remove br between shift filter checkboxes 2018-01-22 20:45:31 +01:00
Igor Scheller e44ba84561 Refactoring: moved application bootstrapping to bootstrap.php 2018-01-16 19:56:05 +01:00
Igor Scheller 0d154365a2 models: return null on empty result 2018-01-14 23:07:34 +01:00
Igor Scheller 646ffc1910 $bugfixes... 2018-01-14 18:50:37 +01: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
Igor Scheller 0e8cc2f0a7 database: integrated illuminate/database do Db class, removed unused methods 2018-01-14 13:32:57 +01:00
Igor Scheller b2e5b5c44d Prevent empty string after $tokens = explode(' ', $search); 2018-01-03 01:47:34 +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 73ed2308c1 use user tshirt count 2017-12-30 13:59:41 +01:00
msquare b3ca550ed0 simplify t-shirt statistics 2017-12-30 13:40:24 +01:00
msquare 0314ba19e3 make got t-shirt always available 2017-12-30 13:37:26 +01: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 be3652b44a fix work log logs 2017-12-29 17:30:54 +01:00
msquare 86a38a3372 add user work log entries feature 2017-12-29 17:19:27 +01:00
msquare e7b0e9934d add shift filter buttons at the top 2017-12-29 16:20:30 +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 b59d17918e small improvements of user view 2017-12-29 13:09:35 +01:00
msquare c3b8fa892d tshirt-score for forced active 2017-12-27 20:30:05 +01:00
msquare 8c64532902 fix ical export description 2017-12-27 15:06:39 +01:00
Bot b00743d6d3 Formatting 2017-12-27 13:50:53 +01:00
Igor Scheller 6ceec76e7d feature request: filter angel types based on account settings, closes #362 2017-12-27 13:43:46 +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
Katrin Leinweber a2fa3fce3d rephrase more naturally 2017-12-27 08:48:45 +01:00
msquare 96d4968e1d fix dashboard stats 2017-12-26 17:35:34 +01:00
Igor Scheller 6953090e7d 392: Show warning message when editing html news without proper permissions to save them, Closes #392 2017-12-26 14:35:33 +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
Igor Scheller f8d0a7c5b0 Updated translation / Formatting / Test 2017-12-26 00:21:44 +01:00
Igor Scheller 75eea1681e Removed dead function call 2017-12-25 23:51:15 +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 5f34e15712 fix broken public dashboard shift links 2017-12-23 22:49:56 +01:00
msquare fbbea4eb5f add show on dashboard flag for angeltypes 2017-12-23 11:59:13 +01:00
msquare 81b4e9d2bc solve problem with autobreaks in news text when building html tables 2017-12-20 23:46:04 +01:00
msquare 34da670b6f solve problem with autobreaks in news text when building html tables 2017-12-20 23:42:37 +01:00
msquare 2b52d24c59 solve problem with autobreaks in news text when building html tables 2017-12-20 23:40:46 +01:00
msquare 9969208be2 solve problem with autobreaks in news text when building html tables 2017-12-20 23:35:06 +01:00
msquare a0f70d9819 solve problem with autobreaks in news text when building html tables 2017-12-20 23:21:03 +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 afd7c59d1d fix shift entry delete 2017-12-19 22:24:06 +01:00
msquare fd85034e7f redo shift signoff and icons for delete/confirm/acknowledgment questions 2017-12-19 20:58:01 +01:00
msquare 567ed9ebd2 remove flags since they do not belong to language selection 2017-12-19 19:17:50 +01:00
msquare b60ad7ccfb make shift entry comment private again 2017-12-18 11:25:26 +01:00
msquare 769d8c4af9 better logging of needed angeltypes for shifts and rooms 2017-12-17 13:22:29 +01:00
msquare b2602f8936 add log entries when deleting a room 2017-12-17 11:40:36 +01:00
MichiK 9c54b42a3d Allow dot in user name
0f273988 changed the regular expression for user names. The new regex
does not allow dots anymore in user names, stripping them silently.
We already have at least one user with a dot in their name who can't
login now anymore.
2017-12-15 00:06:34 +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 20f4d44cbf fix union queries for dashboard stats 2017-12-14 19:39:52 +01:00
msquare 35be25a786 fix dashboard using needed angeltypes from room config too for frab shifts 2017-12-14 19:19:04 +01:00
msquare 952dc6921a undo of fix #382: XXE DoS in engelsystem - the feature is actually needed for xcal files 2017-12-14 14:56:29 +01:00
msquare c70e268a2e add fullscreen button to dashboard and update translation to german 2017-12-13 17:50:52 +01:00
msquare a8cf4b9ddf fix #382: XXE DoS in engelsystem 2017-12-13 16:59:28 +01:00