d7aea575ff
Replaced more sql queries and old data
2018-10-31 13:43:23 +01:00
57932be428
Moved arrival_date to state
2018-10-31 13:43:23 +01:00
4e09ee3eb2
Replaced more user related stuff
...
(Contains some buggy stuff too...)
2018-10-31 13:43:23 +01:00
7c6afc2bfe
Removed `User($id)` function 🎉
2018-10-31 13:43:23 +01:00
89e62c95a7
Changed more functions 🎉
2018-10-31 13:43:23 +01:00
b069a938c6
Changed user_link and some other user functions to use the user id
2018-10-31 13:43:23 +01:00
2dcb7cc2de
Replaced some global `$user` variables
2018-10-31 13:43:23 +01:00
d15946df2d
Changed `src/` code and templates to use the new user model
2018-10-31 13:43:23 +01:00
b443b53919
Translation: added pluralization support
2018-10-30 22:50:22 +01:00
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
7f61dc95be
EventConfig: Merge event configuration from database to global config
2018-10-30 21:13:56 +01:00
7762c0eb2b
Translatable user groups & cutoff fix
...
Closes #318 (Typo: "irt Manager" instead of "Shirt Manager")
2018-10-24 19:18:35 +02:00
6187eed3bb
Merge remote-tracking branch 'MyIgel/mailing'
2018-09-26 21:31:18 +02:00
66038eda14
Merge branch 'twig-templates'
2018-09-23 20:11:37 +02:00
b2303c0723
Tried to fix inputfields for date, email, tel
2018-09-23 11:48:09 +02:00
2a134e6c0b
Config: Removed nightshifts query
2018-09-23 11:40:53 +02:00
0734807eef
Merge remote-tracking branch 'MyIgel/logentry-model'
2018-09-16 12:06:18 +02:00
d0abc27c07
Merge remote-tracking branch 'MyIgel/translations'
2018-09-15 14:58:31 +02:00
8456a3cf6f
Moved emojis to assets
2018-09-10 22:49:46 +02:00
c1a1180d1f
Moved frontend, templates and lang to resources
2018-09-10 18:22:48 +02:00
222c9fed7d
Merge remote-tracking branch 'MyIgel/templating'
2018-09-09 12:11:12 +02:00
01e9c22695
Implemented mailing abstraction
...
Closes #434
2018-09-05 13:44:43 +02:00
36dafdb68a
Merge remote-tracking branch 'MyIgel/rebuild-psr7'
2018-09-03 22:55:54 +02:00
9d34f371cb
Added CreditsController
2018-09-03 15:42:51 +02:00
9e217d87c0
Template refactoring to use twig
2018-09-02 02:09:56 +02:00
ac48332166
Models: Added LogEntry model
2018-08-31 03:24:54 +02:00
2bebbeb191
Installation: Added migrations for install.sql and update.sql files
2018-08-30 16:07:50 +02:00
9d9aa71eb7
Installation: Added migrations for install.sql and update.sql files
2018-08-30 15:53:37 +02:00
5456fea503
$bugfixes
2018-08-29 23:46:32 +02:00
e8f8fc7f5f
Replaced gettext translation `_()` with `__()` that uses the Translator class
2018-08-29 23:46:32 +02:00
acfe72cb91
Removed translation from config file
2018-08-29 23:46:32 +02:00
427315195b
Moved translation/internationalization to Helpers\Translator class
2018-08-29 23:46:31 +02:00
bb3d16d273
Added Twig template renderer, closes #338
2018-08-29 23:46:11 +02:00
175c335810
Db::selectOne() should return null if result is empty
2018-08-29 18:11:35 +02:00
1090d5e889
Update shifts_controller.php
...
fix problem when missing needed angeltype entry
2018-08-28 18:28:09 +02:00
d93ace2eae
Prevent object serialization in session
2018-08-20 21:08:06 +02:00
d6c8f1a614
Merge branch 'master' to 'rebuild-database'
2018-08-20 21:07:57 +02:00
f3b3b6683c
Added middleware tests
2018-08-19 13:59:39 +02:00
df30f7d5d8
merge pr #427 : Use npm to handle frontend dependencies
2018-08-12 12:42:58 +02:00
28349b69a8
Changed JS to use single quotes instead of double quotes
2018-08-11 22:16:57 +02:00
864a086900
Prevent object serialization in session
2018-08-07 16:54:08 +02:00
2832fe48ee
rename some params (codestyle)
2018-08-06 13:10:53 +02:00
9496e35711
added comments and renamed short method to url generators
2018-08-06 12:57:48 +02:00
5a83d4fb8b
fix broken css class on main menu angel icon
2018-08-06 12:33:08 +02:00
6dbec2e2fb
remove unused code
2018-01-28 14:52:26 +01:00
0f1da65f2a
Merge pull request #421 from MyIgel/master
...
Prevent empty string after $tokens = explode(' ', $search);
2018-01-22 20:48:59 +01:00
2e1c2cf3b5
remove br between shift filter checkboxes
2018-01-22 20:45:31 +01:00
e44ba84561
Refactoring: moved application bootstrapping to bootstrap.php
2018-01-16 19:56:05 +01:00
0d154365a2
models: return null on empty result
2018-01-14 23:07:34 +01:00
646ffc1910
$bugfixes...
2018-01-14 18:50:37 +01:00
5227fe6a94
Formatting
2018-01-14 18:09:34 +01:00
fe58e4f422
database: updated checks for selectOne
2018-01-14 17:47:26 +01:00
0e8cc2f0a7
database: integrated illuminate/database do Db class, removed unused methods
2018-01-14 13:32:57 +01:00
b2e5b5c44d
Prevent empty string after $tokens = explode(' ', $search);
2018-01-03 01:47:34 +01:00
c83771ed62
Fixes #401
...
Display "shift started" instead of "shift starts" when shift has already started.
2018-01-01 16:55:59 +00:00
73ed2308c1
use user tshirt count
2017-12-30 13:59:41 +01:00
b3ca550ed0
simplify t-shirt statistics
2017-12-30 13:40:24 +01:00
0314ba19e3
make got t-shirt always available
2017-12-30 13:37:26 +01:00
c961269bb7
better hour formatting
2017-12-30 12:07:10 +01:00
d66dc43aec
fix worklog entry view
2017-12-29 19:08:57 +01:00
ee9fbda098
add work date to work log
2017-12-29 18:57:11 +01:00
d95e488893
add work log creator infor
2017-12-29 17:37:08 +01:00
be3652b44a
fix work log logs
2017-12-29 17:30:54 +01:00
86a38a3372
add user work log entries feature
2017-12-29 17:19:27 +01:00
e7b0e9934d
add shift filter buttons at the top
2017-12-29 16:20:30 +01:00
14584b9611
small improvements of user view
2017-12-29 13:18:28 +01:00
be6bd2f3d3
small improvements of user view
2017-12-29 13:13:45 +01:00
3993e553d1
small improvements of user view
2017-12-29 13:12:56 +01:00
b59d17918e
small improvements of user view
2017-12-29 13:09:35 +01:00
c3b8fa892d
tshirt-score for forced active
2017-12-27 20:30:05 +01:00
8c64532902
fix ical export description
2017-12-27 15:06:39 +01:00
b00743d6d3
Formatting
2017-12-27 13:50:53 +01:00
6ceec76e7d
feature request: filter angel types based on account settings, closes #362
2017-12-27 13:43:46 +01:00
02b775684d
some beauty for the my shifts table
2017-12-27 12:45:48 +01:00
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
abf4b1da30
check if logged in before sign up
2017-12-27 11:35:26 +01:00
a2fa3fce3d
rephrase more naturally
2017-12-27 08:48:45 +01:00
96d4968e1d
fix dashboard stats
2017-12-26 17:35:34 +01:00
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
f1b7946975
Removed some short ifs from Shifts_view.php
2017-12-26 14:35:33 +01:00
db11dd1d0f
fix room view
2017-12-26 12:45:35 +01:00
a7dc640385
add my shifts button to shift view
2017-12-26 12:17:51 +01:00
0101993284
fix dashboard rows
2017-12-26 10:52:32 +01:00
d4ccc14d6c
fix dashboard rows
2017-12-26 10:51:23 +01:00
6aaf8d6f53
fix #389 : Public Dashboard Stats
2017-12-26 10:47:39 +01:00
f8d0a7c5b0
Updated translation / Formatting / Test
2017-12-26 00:21:44 +01:00
75eea1681e
Removed dead function call
2017-12-25 23:51:15 +01:00
952c7892f3
Formatting & Docstrings
2017-12-25 23:51:15 +01:00
a6cf4c9ce9
spelling fixes
2017-12-25 21:29:00 +01:00
6f29b6492d
show forced active on user view
2017-12-24 10:48:04 +01:00
05aad262bb
show forced active on user view
2017-12-24 10:21:52 +01:00
5f34e15712
fix broken public dashboard shift links
2017-12-23 22:49:56 +01:00
fbbea4eb5f
add show on dashboard flag for angeltypes
2017-12-23 11:59:13 +01:00
81b4e9d2bc
solve problem with autobreaks in news text when building html tables
2017-12-20 23:46:04 +01:00
34da670b6f
solve problem with autobreaks in news text when building html tables
2017-12-20 23:42:37 +01:00
2b52d24c59
solve problem with autobreaks in news text when building html tables
2017-12-20 23:40:46 +01:00
9969208be2
solve problem with autobreaks in news text when building html tables
2017-12-20 23:35:06 +01:00
a0f70d9819
solve problem with autobreaks in news text when building html tables
2017-12-20 23:21:03 +01:00
a1c032642f
introduce new shift signup state for not arrived angels
2017-12-20 23:12:17 +01:00
2c04e35bed
introduce new shift signup state for not arrived angels
2017-12-20 23:05:46 +01:00
7a3bdda483
rewrite controller for creating shift entries
2017-12-20 00:54:57 +01:00
1289101f6e
rewrite controller for creating shift entries
2017-12-20 00:42:58 +01:00
afd7c59d1d
fix shift entry delete
2017-12-19 22:24:06 +01:00
fd85034e7f
redo shift signoff and icons for delete/confirm/acknowledgment questions
2017-12-19 20:58:01 +01:00
567ed9ebd2
remove flags since they do not belong to language selection
2017-12-19 19:17:50 +01:00
b60ad7ccfb
make shift entry comment private again
2017-12-18 11:25:26 +01:00
769d8c4af9
better logging of needed angeltypes for shifts and rooms
2017-12-17 13:22:29 +01:00
b2602f8936
add log entries when deleting a room
2017-12-17 11:40:36 +01:00
9c54b42a3d
Allow dot in user name
...
0f273988
2017-12-15 00:06:34 +01:00
3ea35788be
finetuning dashboard layout
2017-12-14 20:09:51 +01:00
a5f4de9509
finetuning dashboard layout
2017-12-14 20:03:34 +01:00
20f4d44cbf
fix union queries for dashboard stats
2017-12-14 19:39:52 +01:00
35be25a786
fix dashboard using needed angeltypes from room config too for frab shifts
2017-12-14 19:19:04 +01:00
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
c70e268a2e
add fullscreen button to dashboard and update translation to german
2017-12-13 17:50:52 +01:00
a8cf4b9ddf
fix #382 : XXE DoS in engelsystem
2017-12-13 16:59:28 +01:00
cf7eb80a92
fix dashboard ajax reload
2017-12-13 16:51:38 +01:00
c3d22ad517
Replace window reload with jquery ajax load
2017-12-13 14:43:17 +01:00
5278be1f0f
add link to public dashboard from shift view
2017-12-13 12:53:07 +01:00
991058a9e4
improve public dashboard
2017-12-13 12:37:05 +01:00
adc62470c5
improve public dashboard
2017-12-13 12:22:26 +01:00
af8454598c
improve public dashboard
2017-12-13 11:55:59 +01:00
582b1a739a
improve public dashboard
2017-12-12 22:09:01 +01:00
3379ea10b2
improve public dashboard
2017-12-12 22:04:12 +01:00
59b8e76d12
improve public dashboard
2017-12-12 22:00:29 +01:00
ff94df53d6
finish basic public dashboard
2017-12-12 21:57:57 +01:00
d5631297dc
better logging of needed angeltypes for shifts and rooms
2017-12-12 20:04:36 +01:00
74f3677f19
add quick+dirty public dashboard
2017-12-11 22:26:36 +01:00
afb77d22ba
move room db queries to model
2017-12-10 18:56:40 +01:00
aae8c77ed1
fix #212 : Duplicate entry for Room name
2017-12-10 18:36:53 +01:00
dbf6e64a2c
change write permission check to catch exceptions
2017-12-10 18:10:28 +01:00
cbe88ad801
remove some unused code
2017-12-10 15:12:39 +01:00
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
32d14f493b
Fix sign-up to shifts by supporter
...
Any user with the `shiftentry_edit_angeltype_supporter` privilege was
able to sign up any users of the correct angeltype to any shift that
they could sign up themselves because the shift entry controller only
checks for the global privilege an not the fact that the user is indeed
supporter for the angeltype in question.
2017-12-07 18:52:07 +01:00
e5880c51a2
fix #376 : Removing supporter rights does not work
2017-12-06 19:21:46 +01:00
6dfa70974e
ask for dect number if user arrived
2017-12-03 20:45:15 +01:00
bc3f777b23
Rename 'supporter(s)' to 'Supporter(s)'
2017-12-02 16:31:37 +01:00
e7d605c6d9
fix log on confirming angels
2017-12-02 14:44:41 +01:00
0f273988c9
fix user nick validation, fixes #369
2017-12-01 19:03:15 +01:00
a5f5dc52c8
update bootstrap-datepicker and set orientation to bottom, fixes #370
2017-12-01 09:28:11 +01:00
962e7d5726
Hide 'You are not marked as arrived' notification in header until congress starts, fixes #368
2017-11-30 21:32:04 +01:00
9e04e2d4a0
fix age validation
2017-11-29 17:41:12 +01:00
cbc7f54ad8
fix query for creating angeltypes
2017-11-29 16:55:51 +01:00
0b45d2a88f
#366 Feature: Time Interval Buttons (on Shifts page), closes #366
2017-11-29 13:30:41 +01:00
25e434bce4
Refactored ExceptionHandler
2017-11-25 11:27:38 +01:00
6eea072376
Added ExceptionHandler Interface
2017-11-25 11:27:38 +01:00
e54a10b816
add shift calendar to angeltype view fix tab jumps
2017-11-24 12:09:28 +01:00
928e707015
add shift calendar to angeltype view
2017-11-24 12:01:19 +01:00
d8476f244d
complete feature contact info for angeltypes, fixes #275
2017-11-24 10:02:52 +01:00
bb2681a7c8
add validation of dect numbers
2017-11-21 19:00:42 +01:00
b95d4ece8a
increase readability of hints with links, refs #357
2017-11-19 16:41:20 +01:00
d34b160b5c
Added links to notifications, closes #357
2017-11-19 16:29:51 +01:00
15c50ab315
fix minor cody style issues (codacy)
2017-11-19 15:13:48 +01:00
deae2a1721
fix removing users from shift, fixes #359
2017-11-19 14:52:55 +01:00
86e41e2949
change logging of needed angeltypes for created shifts
2017-11-19 13:55:18 +01:00
1c77c45bcf
fix problem with default values, fixes #354 , fixes #353
2017-11-19 13:48:34 +01:00
3ee1a4b0c7
fix problem with default value for userangeltype.supporter, fixes #352
2017-11-19 13:29:45 +01:00
88ea992f9c
fix sql queries with bools
2017-11-19 13:19:56 +01:00
4eedad6c89
fix problem with default values on registration
2017-11-19 12:03:29 +01:00
f9ab269758
fix problem with default values on registration
2017-11-19 12:02:11 +01:00
6b74705f37
fix problem with default values on registration
2017-11-19 12:00:42 +01:00
d8de02db34
fix problem with default values on registration
2017-11-19 11:59:37 +01:00
59cd65cb50
fix problem with validation of planned arrival date
2017-11-19 11:58:19 +01:00
7df64c82a6
fix problem with bools in queries
2017-11-19 11:52:39 +01:00
c62833bb51
fix problem with default value when registering
2017-11-19 11:45:22 +01:00
eec161a852
fix problem with default age when registering
2017-11-19 11:34:12 +01:00
50f24271eb
fix all redirects to home (because of new urls redirect to ? wont work anymore)
2017-11-19 10:45:08 +01:00
e9a28eb20e
fix log message from changing event config
2017-11-19 10:32:21 +01:00
ad948bdd32
Added RequestServiceProvider and SessionServiceProvider
2017-11-01 16:12:01 +01:00
e727b367cc
Moved includes to own file
2017-11-01 12:35:45 +01:00
60fd72cd1a
Added service providers
2017-10-31 13:40:13 +01:00
4817658862
Merge branch 'noc0lour:fix_setup_bugs', closes #335
2017-09-25 20:25:00 +02:00
d49e49c364
Implemented service provider functionality
2017-09-22 14:13:19 +02:00
783c58611a
Added app path to container
2017-09-21 20:52:19 +02:00
212760d4c9
Changed Container to Illuminate/Container
...
@see https://laravel.com/docs/5.5/container
@see https://davejamesmiller.com/2017/06/15/laravel-illuminate-container-in-depth
2017-09-21 18:37:37 +02:00
945fcb079a
Added registration_enabled configuration
2017-09-20 12:18:08 +02:00
c6ef1120f8
Set cookie to httponly
2017-09-20 11:07:25 +02:00
5b12eecdd6
Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'
2017-09-20 01:24:56 +02:00
86c0713baa
Added helpers unit test
2017-09-20 01:10:14 +02:00
e6ed8a3017
Changed LogEntries table: Use log level instead of nick name
2017-09-19 19:45:02 +02:00
b3b65743cd
Added Logger
2017-09-19 18:30:42 +02:00
20a6fa07f8
Implemented container
2017-09-19 14:51:46 +02:00
0ac9818764
Added Application
2017-09-19 14:50:46 +02:00
db8b6b2520
change shift renderer global add user link
2017-09-16 17:14:45 +02:00
8c81adc8e8
Implemented container
2017-08-31 17:30:54 +02:00
0a20883aa8
Reimplementation of 2840bb619 (signup requires arrival), closes #330
2017-08-31 12:32:08 +02:00
2bd127c011
Use symfony session
2017-08-30 19:57:01 +02:00
96f1d9fd54
Bugfixes
2017-08-30 15:35:12 +02:00
a473a56f1d
Formatting
2017-08-30 00:22:02 +02:00
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
50da458d89
Refactoring: Moved files to array
2017-08-29 22:39:35 +02:00
3002ed9e93
Security: Only allow angels with admin_news_html privilege to use HTML
2017-08-29 22:22:53 +02:00
cc01c906ba
#336 : Integration of symfony/http-foundation request
2017-08-29 21:52:07 +02:00
73175e2b64
#337 : Added routing
2017-08-28 17:34:00 +02:00
eeae07e625
add edited_at_timestamp to shift creation to fix mysql error
2017-08-16 01:31:53 +02:00
5f305121a4
fix order by not in select clause for >mysql-5.7
2017-08-16 00:45:56 +02:00
dc6fb49f44
fix only_full_group_by mysql default behaviour
2017-08-16 00:19:16 +02:00
581b81f1b2
fix wrong request get
2017-07-28 20:33:14 +02:00
7f4aa6daa5
remove exit commands after redirects (redirect does already die)
2017-07-28 20:26:12 +02:00
f82e5456d2
dried code by introducing selectOne for select queries with only one result line expected
2017-07-28 20:11:09 +02:00
69a1ee2bfe
use glyph bool icons on room list
2017-07-28 19:49:32 +02:00
5cffcd7fdf
fix angeltype edit and display bugs
2017-07-28 19:44:54 +02:00
4effb7e59f
fix lane rendering
2017-07-28 19:28:11 +02:00
a0af8d4624
further switching to db exceptions instead of return false
2017-07-28 19:15:52 +02:00
5794c4cab8
clear delete queries from false resuls
2017-07-28 18:50:00 +02:00
4d08434d31
fix problem with html select containing 0 as key
2017-07-23 12:09:42 +02:00
a157004f4a
handle failed db queries in Db class
2017-07-23 11:46:54 +02:00
e1762e7764
replaced template_render with dynamic renderer class
2017-07-20 02:30:53 +02:00
d4ad70804b
Removed overwhelmed page
2017-07-20 02:10:53 +02:00
7d5d905fcf
Moved $themes array to config
2017-07-20 01:14:28 +02:00
b7ebb05b8e
Passwords should be posted
2017-07-20 01:03:59 +02:00
ec45216899
Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'
2017-07-19 23:35:20 +02:00
8ae0123635
unarrived angels can enter a shift (has been disabled for 33c3)
2017-07-19 21:32:42 +02:00
903a1f9790
remove 24h shift filter time range limit
2017-07-19 21:30:18 +02:00
e93dd774a5
fix small issues on checking success of a db query
2017-07-19 21:28:26 +02:00
3a1e460249
Changed $_GET, $_POST and $_REQUEST to use the Request object
2017-07-19 11:44:16 +02:00
cdf14f9d3f
Reapplied "Merge pull request #321 from raboof/wantsToDrive"
2017-07-17 23:43:47 +02:00
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
a2b9edc6a3
Reapplied "Merge pull request #314 from Scriptkiddi/master"
2017-07-17 22:17:58 +02:00
b688b928db
Read wants_to_drive field correctly
2017-04-30 13:02:38 +02:00
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
cf20b65902
Reword 'wants to operate a car for the PL'
...
As discussed in #sha2017-angel
2017-04-30 13:00:53 +02:00
b6d394e982
first fix for #317 . hidden rooms can be seen with admin_rooms priviledge
2017-04-11 17:25:34 +02:00
cd30017b97
Some fixes
2017-03-03 08:31:25 +01:00
37c32ad08f
Added PDO::ATTR_EMULATE_PREPARES => false
2017-03-02 12:48:48 +01:00
68da2a4eb8
Renamed "default_theme" config to "theme"
2017-03-02 08:11:52 +01:00
c9336840ff
Update email_helper.php
2017-02-03 17:23:06 +01:00
6f367eefe0
Update email_helper.php
2017-02-03 17:14:46 +01:00
781f830678
Fixes and improvements
2017-01-22 01:16:00 +01:00
3de0cc840f
Removed spaces
2017-01-22 01:12:57 +01:00
8506d6d27e
Refactoring: Config cleanup / moved to class
2017-01-21 23:07:20 +01:00
740026a9de
Replaced [0-9] with \d
2017-01-21 20:12:48 +01:00
915ce28fee
Replaced " with '
2017-01-21 20:12:35 +01:00
9a3ad88834
Changed from mysqli to PDO, some refactorings, faster sql queries
2017-01-21 13:58:53 +01:00
f7c09cb7ff
Added exception handler
2017-01-20 21:12:19 +01:00
8254a79c58
Bugfixes & improvements
2017-01-03 15:59:33 +01:00
1c27bf1375
Removed $angeltype from function Shift_signup_allowed_*
2017-01-03 15:33:10 +01:00
55141154c0
Replaced " with '
2017-01-03 15:32:59 +01:00
356b2582f3
PPHDoc, formatting, fixes, cleanup
2017-01-03 03:22:48 +01:00
d71e7bbfad
Formatting
2017-01-02 15:49:53 +01:00
7313e15ce8
PSR-2 formatting
2017-01-02 03:57:23 +01:00
84f6990db2
Merged branch origin/master
2017-01-02 02:21:53 +01:00
94b5250414
Added composer with parsedown requirement
2017-01-02 02:19:17 +01:00
4a95dfa171
Merge pull request #307 from MyIgel/real-path
...
Fix relative paths: missing / on internationalization
2017-01-02 00:10:49 +01:00
29128763fd
Merge pull request #306 from MyIgel/config-fix-constant
...
Fixes "Constant already defined" notice
2017-01-02 00:09:18 +01:00
1f0ca24f5c
Fix relative paths: missing / on internationalization
2017-01-01 19:49:59 +01:00
1f8d1eb4bb
Fixed "Constant already defined" notice
...
Added more ugly global variables
2017-01-01 18:50:53 +01:00
5e850171e2
Fixed "Constant already defined" notice
2017-01-01 15:43:20 +01:00
f894ca5fa4
Fix relative paths
2017-01-01 15:25:21 +01:00
00d8709ae8
Fix relative paths
2017-01-01 05:58:42 +01:00
b8ebd23f6d
bring back filtering by occupancy
2016-12-29 15:33:21 +01:00
51eb22a1c6
fix shift signup state calculation
2016-12-29 15:24:57 +01:00
3fbd62ab7d
bring back coloring for admins
2016-12-29 14:56:09 +01:00
fe5dec73ba
bring back filtering by occupancy
2016-12-29 14:51:43 +01:00
68aeb14edb
bring back filtering by angeltype
2016-12-29 14:16:00 +01:00
5600476c56
fix missing users on active angels view
2016-12-28 18:30:09 +01:00
4407604793
move data sorting to begin
2016-12-28 14:53:35 +01:00
6c4bb0da31
move data sorting to begin
2016-12-28 14:49:00 +01:00
cbeb45ef16
redo
2016-12-28 14:34:09 +01:00
45200b503d
improve needed angel types query
2016-12-28 14:32:26 +01:00
0603d0dd4e
remove unused code
2016-12-28 12:11:35 +01:00
363cc8f6b5
more performance using union
2016-12-28 01:09:40 +01:00
75945fdbbd
more performance using union
2016-12-28 00:48:16 +01:00
eccbf32f68
redo
2016-12-28 00:26:54 +01:00
84527c2252
redo
2016-12-28 00:16:59 +01:00
65a665ee49
reduce max shift filter duration to 24h
2016-12-28 00:11:42 +01:00
aed9f2c96c
bring back needed angeltypes from rooms
2016-12-28 00:02:55 +01:00
860252bce8
select only one room per default
2016-12-27 23:07:44 +01:00
46528fe1d8
shift view performance improvements
2016-12-27 23:02:05 +01:00
ffc33993d4
overwhelmed
2016-12-27 19:16:26 +01:00
2840bb6198
no signup for shifts for angels that are not arrived
2016-12-27 19:13:24 +01:00
b05b235cf8
fix slow query
2016-12-27 16:02:13 +01:00
9975e42d3c
fix edit user bug deleting emails
2016-12-27 13:10:18 +01:00
2f2d08c574
fix edit user bug deleting emails
2016-12-27 13:05:30 +01:00
07a0ed37ec
fix angeltype supporter privilege for signing up users to shift
2016-12-26 23:47:10 +01:00
827de98256
fix room delete bug in pentabarf import temporarily
2016-12-26 19:08:59 +01:00
5f9d508b02
fix #297 show date on every time tick in shift calendar
2016-12-26 18:39:29 +01:00
549cd6534a
reduce number of sql queries on shift calendar
2016-12-26 14:40:28 +01:00
b3f92834b0
reduce number of sql queries on shift calendar
2016-12-26 14:33:18 +01:00
deb41c4b64
reduce number of sql queries on shift calendar
2016-12-26 14:26:49 +01:00
99c7e8ce1a
fixes #298 allow a shift supporter to remove a user from shift
2016-12-24 17:29:12 +01:00
0c15964e6b
#298 hide freeload form from angeltype supporters
2016-12-24 17:02:34 +01:00
e86d75b4d9
begin #298 add privilege and add users to shifts by angeltype supporter
2016-12-24 17:00:03 +01:00
188891c147
use planned arrival time validation for register page
2016-12-23 16:22:46 +01:00
5b9ff7b7bf
fix that free shifts become green
2016-12-23 12:50:27 +01:00
b8c26b0fd0
fix that free shifts become green
2016-12-23 12:48:34 +01:00
9e804ba91a
fix that free shifts become green
2016-12-23 12:46:32 +01:00
acfe7309f6
remove angeltype contact fields until the feature is ready
2016-12-15 08:51:19 +01:00
2f0a63a4a1
remove angeltype contact radios for now
2016-12-13 17:59:42 +01:00
e26eb952f4
update binary lang file
2016-12-13 17:59:42 +01:00
deac80e700
merge #253
2016-12-13 17:58:41 +01:00
6a591e7557
merged cherry picked commit
2016-11-30 23:31:21 +01:00
45cda10479
merged master and issue
2016-11-30 23:23:49 +01:00
79b9f9448e
initial commit and functionality for no self sign up
2016-11-30 23:20:13 +01:00
1324260e0f
forgot to remove if-statement -.-
2016-11-30 16:17:52 +01:00
f4f6dfefcb
fixed broken logic in controller (cf. to mail to @msquare)
2016-11-30 15:53:47 +01:00
687c333322
Update Descriptions
2016-11-26 16:44:28 +01:00
acbaaf4364
Update Descriptions
2016-11-26 16:43:22 +01:00
10517213f6
Update Descriptions
2016-11-26 16:33:07 +01:00
0401e90f00
Update Descriptions
2016-11-26 16:23:49 +01:00
561e8ec36c
better msg placement on angeltype view
2016-11-25 14:55:19 +01:00
34248bb20c
show freeload comments to supporters (user shift admin)
2016-11-25 14:27:47 +01:00
476d1daeb7
fixes #280 shift entries finished by user returns no freeloaded shifts
2016-11-25 13:58:43 +01:00
bae3ede662
fixes #279 fix exporting freeload comment in json export
2016-11-25 13:38:16 +01:00
a8bcb19eaa
fix shift view bars
2016-11-25 13:06:05 +01:00
4f6db20ae4
fix shift view bars
2016-11-25 13:03:41 +01:00
67df8da061
Typo Changes and Descriptions
2016-11-24 22:47:32 +01:00
dc49b9af41
Update guest_login.php
2016-11-24 12:22:18 +01:00
ff31d0a1c5
fix shift signup state being combined to null
2016-11-24 09:32:32 +01:00
16e9a69c0d
fixes #277 date parsing returns the start of the day now
2016-11-24 09:25:28 +01:00
321566d4b0
Merge pull request #278 from leaneb/master
...
Change Ask an Arch Angel title
2016-11-24 09:15:05 +01:00
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
3fd30add3c
fix NPE
2016-11-23 22:31:11 +01:00
be8c47a175
add 33c3 theme
2016-11-23 17:52:58 +01:00
5ae328b2b1
hide event countdown for mobile clients
2016-11-20 17:54:16 +01:00
409761ce4b
rebuild login page
2016-11-18 15:36:02 +01:00
9098b8e80d
reduce complexity of user view
2016-11-18 08:47:52 +01:00
bd54bec595
add ValidationResult to namespace
2016-11-18 08:20:17 +01:00
356cc9e1d0
reduce complexity of user driver license
2016-11-17 15:04:33 +01:00
7b8d191808
reduce complexity of user driver license
2016-11-17 14:40:21 +01:00
9c4636f5c4
reduce complexity of user driver license
2016-11-17 14:35:04 +01:00
b5784e5961
fix order problem
2016-11-17 13:16:15 +01:00
d64f96b6a1
reduce complexity of angeltype controller
2016-11-17 13:11:44 +01:00
1636688394
reduce complexity of angeltype edit controller
2016-11-17 13:03:28 +01:00
f2630162e9
reduce complexity of password recovery controller
2016-11-15 22:08:41 +01:00
ac53559fea
fix shift calendar headers
2016-11-15 22:00:17 +01:00
54f3253c32
fix js var names
2016-11-15 21:42:43 +01:00
79ca2f1772
add fixed shift calendar headers and timelane
2016-11-15 21:33:54 +01:00
5299ca2103
reduce complexity of shift view
2016-11-15 17:54:59 +01:00
5a93050a06
localize date rendering for eventconfig info
2016-11-15 17:41:02 +01:00
15243f15fc
fix shift view
2016-11-15 17:22:15 +01:00
ec40e10ebd
fix unused code
2016-11-15 16:58:12 +01:00
53a306f14b
make departure date nullable
2016-11-15 16:36:03 +01:00
918d41ca70
reduce complexity of menu and hints
2016-11-15 16:31:55 +01:00
ec6016cd38
reduce complexity of menu and hints
2016-11-15 16:28:20 +01:00
16ed2ae683
fixed settings validation
2016-11-14 19:10:29 +01:00
d3e942f742
Merge pull request #273 from anykraus/typo-sheduler-scheduler
...
minor typo fixed (sheduler to scheduler)
2016-11-14 18:21:58 +01:00
7cf2a9bb9b
split templates into different files
2016-11-14 18:14:32 +01:00
1a1ca1d1b5
split templates into different files
2016-11-14 18:14:23 +01:00
f568141164
add shift legend and fix dark theme
2016-11-14 17:58:15 +01:00
0ab9f4f988
fix shift ended recognition and displayed time range end
2016-11-14 17:40:24 +01:00
1a3b4e2a33
redone shift coloring and shift signup state
2016-11-12 23:00:46 +01:00
106a678808
fix wrong variable
2016-11-12 20:15:25 +01:00
7bafe3f24c
fix shift occupied method
2016-11-12 19:05:36 +01:00
c61e888de4
change shift coloring
2016-11-12 12:56:10 +01:00
c10ab2d8d2
reduce complexity of shift signup allowed
2016-11-12 12:50:52 +01:00
5f2871538a
fix css problem with rooms table
2016-11-11 17:07:40 +01:00
03c9d1ef5d
reduce complexity of user settings main
2016-11-11 17:00:51 +01:00
beb0db6852
fix misspellings
2016-11-11 16:42:47 +01:00
247166f28b
improve code of user settings
2016-11-11 16:34:23 +01:00
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
82b9436c50
rename coordinator to supporter
2016-11-11 14:59:25 +01:00
468a10774c
reduce complexity of user driver license controller
2016-11-10 13:55:16 +01:00
f6da9148e7
fix missing var check
2016-11-10 13:38:31 +01:00
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
dfc9e209a5
fix parsedown
2016-11-09 19:25:55 +01:00
af9328f558
split angeltype about view into different methods
2016-11-09 18:05:00 +01:00
0ba0ce207d
split angeltype view into different methods
2016-11-09 18:02:01 +01:00
22520532c7
fix shift occupied calculation
2016-11-07 21:24:05 +01:00
125f34133d
remove unused var
2016-11-07 21:11:05 +01:00
a8e3e91448
implement shift calendar into user shift page
2016-11-07 20:55:37 +01:00
db7f8c1ab3
split shift calendar renderer into different classes
2016-11-07 20:50:15 +01:00
8c22ec7f6d
typo fixed (sheduler to scheduler)
2016-11-07 20:24:01 +01:00
cf8cc5f592
change shift table to html5
2016-11-05 10:06:06 +01:00
902866ff3a
add first design of new shift markup
2016-11-03 18:28:22 +01:00
efb7dbfb01
fix admin_active.php not displaying (issue #271 )
...
Reverts 53ad1b5110
2016-11-02 02:04:43 +01:00
1d4811cca5
remove unused code
2016-10-08 09:18:04 +02:00
c48335e702
improve shift rendering
2016-10-07 17:22:48 +02:00
6d97aa2d27
continue working on shifts calendar renderer
2016-10-05 22:28:39 +02:00
6fff6a6c1a
begin room view and shifts filter renderer
2016-10-05 18:56:50 +02:00
27c9650dc4
reduce complexity of shifts controller
2016-10-04 21:20:38 +02:00
a50b26490c
reduce complexity of shiftsfilter update
2016-10-04 18:52:52 +02:00
aa628208ec
reduce complexity of shift view
2016-10-04 18:36:57 +02:00
676f5e1627
small code style improvements
2016-10-04 18:11:26 +02:00
42144ed21c
move static access to datetime parse function
2016-10-04 17:58:56 +02:00
eec10ebfc5
reduce complexity of user angeltypes controller
2016-10-04 16:50:06 +02:00
455e417200
fix variable naming problems
2016-10-04 16:16:00 +02:00
51d270db28
restore ical export
2016-10-03 19:37:00 +02:00
f3a0ce865d
move sql queries from shifts controller to model
2016-10-03 18:32:25 +02:00
09c931dcf5
fix missing variables
2016-10-03 17:55:49 +02:00
6c8a113383
introduce ShiftsFilter
2016-10-03 17:41:14 +02:00
d59809d6d2
bring back session filter store
2016-10-02 23:32:10 +02:00
5e66007f06
introduce ShiftsFilter
2016-10-02 23:00:01 +02:00
6ff5e7997a
split user_shifts into different functions
2016-10-02 21:19:03 +02:00
d5d2acc7d8
improve code style
2016-10-01 10:48:19 +02:00
6dfefc3bb9
small code improvements
2016-09-30 18:49:33 +02:00
b87eb49b93
reduce complexity of table()
2016-09-30 17:38:26 +02:00
3738d071f8
remove long array syntax
2016-09-30 17:08:20 +02:00
1debe567f5
simplify user_angeltype_add_controller
2016-09-30 16:55:47 +02:00
9fce3b22aa
fix issues after changing codestyle
2016-09-30 16:55:23 +02:00
9ad9088260
make short variable names longer
2016-09-29 19:31:26 +02:00
a128bcbb38
use more ValidationResult
2016-09-29 16:04:05 +02:00
07ddbb0f4c
make short variable names longer
2016-09-29 12:45:06 +02:00
c231070dcc
rename ok to valid
2016-09-29 12:33:03 +02:00
f05f1a3cd4
rename to
2016-09-29 12:08:12 +02:00
81e5a6482c
remove unused global from login
2016-09-29 11:32:03 +02:00
4c288e957e
prohibit inline control structures on includes and index
2016-09-29 11:28:42 +02:00
e965f8d041
prohibit inline control structures on model and view
2016-09-29 11:18:17 +02:00
91dafb19ec
prohibit inline control structures on pages
2016-09-29 10:53:17 +02:00
1ec19b46f3
prohibit inline control structures on mailers
2016-09-29 09:50:31 +02:00
5170fd7f6e
prohibit inline control structures on helpers
2016-09-29 09:49:25 +02:00
bd9003f5d5
prohibit inline control structures on controllers
2016-09-29 09:43:08 +02:00
6685beb397
display event countdowns on start page
2016-09-29 09:25:06 +02:00
50bf7feff0
show event info in footer text line
2016-09-28 11:46:40 +02:00
6384eca1ce
display user welcome message
2016-09-28 07:28:51 +02:00
a083c198bb
better log when changing event config
2016-09-27 18:42:10 +02:00
6f6724e55b
update german translation
2016-09-27 18:08:55 +02:00
5957e05bf1
finished rename settings to event config and added more date validation for event config
2016-09-27 17:59:28 +02:00
031fc3057c
rename settings to event config and implement mvc pattern on it
2016-09-27 17:49:39 +02:00
45bbf95972
fix settings validation
2016-09-27 17:49:39 +02:00
9e884bb444
remove unused code
2016-08-22 20:40:31 +02:00
3f4be08865
remove old update script
2016-08-22 19:32:54 +02:00
14d20933f7
improve quality of user atom
2016-08-22 19:23:23 +02:00
54e6f422ce
cleanup guest stats
2016-08-22 19:11:09 +02:00
79588ff2cf
split user atom into different functions
2016-08-22 19:08:10 +02:00
d4bba0d468
remove exit code from shifts controller
2016-08-22 19:03:18 +02:00
de917bc543
remove unused code
2016-08-21 23:11:23 +02:00
f02148af35
fix rename bug
2016-08-21 23:00:58 +02:00
28e5a3b978
user_ical rewrite (remove codacy issues)
2016-08-21 22:58:09 +02:00
191328d703
fix method names, quotes, duplication in forms.js
2016-08-21 20:14:09 +02:00
53ad1b5110
fix codacy unused code
2016-08-21 18:00:39 +02:00
8a20b43f6d
Added Feature Admin Settings Page
2016-07-14 13:49:38 +05:30
99c8751059
some minor text changes on user vouchers
2016-03-22 14:51:30 +01:00
d0a07a74cc
remove preg replace with e flag for php 7
2016-03-22 14:41:36 +01:00
661e5595c4
issue #242 - make app caluclate number of vouchers for angels
2016-02-07 13:00:28 +01:00
1da3cba5a7
fixes #241 problem when adding rooms
2016-02-01 11:48:40 +01:00
c4179df503
fixes #237 bug when editing a room without changing its name
2016-01-19 11:35:00 +01:00
ef60b95555
add a more secure way to delete users containing a password request
2015-12-30 15:48:41 +01:00
1983db901b
better error message for creating room with name that is already used
2015-12-29 21:50:09 +01:00
2af1fd582e
put message input to the top
2015-12-29 18:13:05 +01:00
b479cdaef8
fix room creation
2015-12-29 17:57:16 +01:00
522546795b
search only for nickname on active angel page
2015-12-29 15:32:58 +01:00
4684d708fb
better shift cancel messages and workflow
2015-12-28 17:47:02 +01:00
99d36e47b8
redirect to other users page on shift cancel
2015-12-28 17:42:29 +01:00
897053e049
redirect to users profile page after marking as arrived or not arrived
2015-12-27 23:20:09 +01:00
667466b9d0
add minutes to start and end of talks for frab import
2015-12-26 12:37:29 +01:00
570037eed0
fix problem that angeltypes lose their restriction when edited by a coordinator
2015-12-22 21:05:10 +01:00
dc5b0a6214
finish cleanup of angeltypes controller
2015-12-22 16:25:38 +01:00
f7cf9b327e
#198 log updates on driving license information
2015-12-20 21:07:08 +01:00
0ac05d251c
#198 fixed: driving license feature completed - integrated into angeltypes
2015-12-20 11:36:12 +01:00
2cb44fe517
make angeltype names clickable
2015-12-20 10:35:03 +01:00
facc32f133
#198 add basic driver license information
2015-12-19 23:31:08 +01:00
761897a942
add 32c3 design
2015-12-16 15:32:54 +01:00
28edf6bd48
make register log entry include link to userpage
2015-12-12 19:39:30 +01:00
7bff27d20b
fix #221 : deleting angeltype doesn't log correctly
2015-12-12 19:35:07 +01:00
0e0f7f0516
fix #203 : message popover not workin in safari
2015-12-12 19:27:53 +01:00
d68c91be18
remove sessionhelper
2015-12-09 16:31:51 +01:00
a92e1e3ea6
Merge pull request #213 from engelsystem/remove-sessionhelper
...
remove sessionhelper
2015-12-09 16:29:04 +01:00
902a5852a4
fix user result check on user controller
2015-12-05 11:55:35 +01:00
3790818baf
fix user delete log entry
2015-12-04 21:50:39 +01:00
0dc8da68f4
display room number in admin_rooms edit form
2015-12-02 18:59:38 +01:00
ecf25f5d2a
replace overcomplicated regex for email validation with php function
2015-08-26 15:24:33 +02:00
73208016bf
change date format in shift table
...
fixes #202
2015-08-26 15:03:53 +02:00
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
1af6b8cf20
How Mysql Connection Error to user
...
fixes #207
2015-08-26 14:51:00 +02:00
2df2398b87
add more information to ical export
...
fixes #175
2015-08-26 14:29:51 +02:00
8c1f6d2c9c
removed sessionhelper. we should let this handle the server administrator within the PHP config
2015-08-26 13:33:38 +02:00
128ee0911f
fix wrong data at arrival statistics
2015-08-16 23:32:39 +02:00
c4ee004095
rework arrival stat graphs and tables
2015-08-16 23:13:13 +02:00
a67237d0ef
Named Function Correctly
2015-08-16 21:05:27 +02:00
73197995d7
Merge pull request #209 from engelsystem/feature-shift-types
...
Add Email Form Helper
2015-08-16 20:42:25 +02:00
7306545e32
Add Email Form Helper
2015-08-16 20:41:23 +02:00
b3aa6cc473
Change Register form E-Mailfield to form_email
2015-08-16 20:38:41 +02:00
a7189482e9
add shift creator and editor
2015-08-15 23:36:38 +02:00
cac86ef509
add planned date of departure
2015-08-15 14:54:25 +02:00
bc84710e9d
wording
2015-08-14 17:40:58 +02:00
28788e6702
put shirt statistics into one table
2015-08-14 14:16:09 +02:00
e8daa4d2ce
add table of needed shirts to user active page
2015-08-14 14:06:33 +02:00
18e49ee06a
put active+shirt info into a new line
2015-08-14 13:20:24 +02:00
fc0d97344e
made shift creation angeltypes smaller (like room editing)
2015-08-14 12:42:18 +02:00
41280a17f5
added hint about nightshifts
2015-08-14 12:32:54 +02:00
42150cc6e9
add log entry for deleting own shift entries
2015-08-14 09:28:32 +02:00
3d7e378b67
change default end date on creating shifts
2015-08-13 22:57:40 +02:00
1cd6a4f4f6
keep the show all users checkbox
2015-08-13 22:57:29 +02:00
f9fb12c7f1
show all forced active angels
2015-08-13 22:38:32 +02:00
34be996f22
add possibility to show already done shifts in admin active view
2015-08-13 20:28:48 +02:00
1c9a3fa89e
fix group rights management
2015-08-13 11:46:06 +02:00
723961c19e
User shift admins see free and occupied shifts by default
2015-08-13 11:22:25 +02:00
df526fa2bf
fix problem with beeing informed about shift changes
2015-08-13 10:48:39 +02:00
5742306095
fix wrong user shift edit link
2015-08-13 09:13:13 +02:00
2823c0e438
fix angel list with multiple vouchers
2015-08-12 23:47:06 +02:00
803c0a552f
make multiple vouchers possible
2015-08-12 23:44:39 +02:00
681d52fe0f
fix frab import problem on creating rooms
2015-08-12 20:43:22 +02:00
18585285a3
fix user update problem
2015-08-11 12:04:22 +02:00
1dcd6c0f3f
fix loggin on setting rooms angeltypes
2015-08-09 17:56:03 +02:00
c06573bb87
add maintenance mode
2015-08-09 17:46:57 +02:00
bc0354fbff
responsive resizing for graphs is broken -> turn off
2015-07-27 17:36:42 +02:00
1a0ccddbe9
show number of user angel types to confirm in hint
2015-07-27 17:20:05 +02:00
6376b90e9f
introduce table buttons to angeltype view
2015-07-27 17:14:41 +02:00
386a3c3298
remove duplication from unconfirmed angeltypes hint
2015-07-27 17:05:16 +02:00
bae55f78fd
swap chart and table
2015-07-18 21:34:14 +02:00
d414c455a2
responsive chart
2015-07-18 21:32:50 +02:00
46f0636f2f
arrival statistics
2015-07-18 21:27:30 +02:00
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
4aec1b1536
fix doubleclick bug on user hint popover
2015-07-12 20:06:34 +02:00
8c518d4c34
add arrival date feature
2015-07-12 14:45:58 +02:00
66c7e67a03
remove avatars
2015-07-12 13:51:39 +02:00
53737666c6
add bootstrap datepicker
2015-07-12 13:45:47 +02:00
993d6a4f59
add cccamp15 design
2015-07-12 12:44:09 +02:00
86a4773243
add log entry test
2015-06-07 20:42:01 +02:00
Igor Scheller