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
|
7 years ago |
|
Igor Scheller
|
50da458d89
|
Refactoring: Moved files to array
|
7 years ago |
|
Igor Scheller
|
3002ed9e93
|
Security: Only allow angels with admin_news_html privilege to use HTML
|
7 years ago |
|
Igor Scheller
|
cc01c906ba
|
#336: Integration of symfony/http-foundation request
|
7 years ago |
|
Igor Scheller
|
73175e2b64
|
#337: Added routing
|
7 years ago |
|
Andrej Rode
|
eeae07e625
|
add edited_at_timestamp to shift creation to fix mysql error
|
7 years ago |
|
Andrej Rode
|
5f305121a4
|
fix order by not in select clause for >mysql-5.7
|
7 years ago |
|
Andrej Rode
|
dc6fb49f44
|
fix only_full_group_by mysql default behaviour
|
7 years ago |
|
msquare
|
581b81f1b2
|
fix wrong request get
|
8 years ago |
|
msquare
|
7f4aa6daa5
|
remove exit commands after redirects (redirect does already die)
|
8 years ago |
|
msquare
|
f82e5456d2
|
dried code by introducing selectOne for select queries with only one result line expected
|
8 years ago |
|
msquare
|
69a1ee2bfe
|
use glyph bool icons on room list
|
8 years ago |
|
msquare
|
5cffcd7fdf
|
fix angeltype edit and display bugs
|
8 years ago |
|
msquare
|
4effb7e59f
|
fix lane rendering
|
8 years ago |
|
msquare
|
a0af8d4624
|
further switching to db exceptions instead of return false
|
8 years ago |
|
msquare
|
5794c4cab8
|
clear delete queries from false resuls
|
8 years ago |
|
msquare
|
4d08434d31
|
fix problem with html select containing 0 as key
|
8 years ago |
|
msquare
|
a157004f4a
|
handle failed db queries in Db class
|
8 years ago |
|
Igor Scheller
|
e1762e7764
|
replaced template_render with dynamic renderer class
|
8 years ago |
|
Igor Scheller
|
d4ad70804b
|
Removed overwhelmed page
|
8 years ago |
|
Igor Scheller
|
7d5d905fcf
|
Moved $themes array to config
|
8 years ago |
|
Igor Scheller
|
b7ebb05b8e
|
Passwords should be posted
|
8 years ago |
|
Igor Scheller
|
ec45216899
|
Merge remote-tracking branch 'engelsystem/feature-igel-rewrite'
|
8 years ago |
|
msquare
|
8ae0123635
|
unarrived angels can enter a shift (has been disabled for 33c3)
|
8 years ago |
|
msquare
|
903a1f9790
|
remove 24h shift filter time range limit
|
8 years ago |
|
msquare
|
e93dd774a5
|
fix small issues on checking success of a db query
|
8 years ago |
|
Igor Scheller
|
3a1e460249
|
Changed $_GET, $_POST and $_REQUEST to use the Request object
|
8 years ago |
|
Igor Scheller
|
cdf14f9d3f
|
Reapplied "Merge pull request #321 from raboof/wantsToDrive"
|
8 years ago |
|
Igor Scheller
|
317c91a22f
|
Reapplied "Merge pull request #319 from jwacalex/gh_317_unable_to_edit_hidden_room_in_admin"
|
8 years ago |
|
Igor Scheller
|
a2b9edc6a3
|
Reapplied "Merge pull request #314 from Scriptkiddi/master"
|
8 years ago |
|
Arnout Engelen
|
b688b928db
|
Read wants_to_drive field correctly
|
8 years ago |
|
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
|
8 years ago |
|
Arnout Engelen
|
cf20b65902
|
Reword 'wants to operate a car for the PL'
As discussed in #sha2017-angel
|
8 years ago |
|
jwacalex
|
b6d394e982
|
first fix for #317. hidden rooms can be seen with admin_rooms priviledge
|
8 years ago |
|
Igor Scheller
|
cd30017b97
|
Some fixes
|
8 years ago |
|
Igor Scheller
|
37c32ad08f
|
Added PDO::ATTR_EMULATE_PREPARES => false
|
8 years ago |
|
Igor Scheller
|
68da2a4eb8
|
Renamed "default_theme" config to "theme"
|
8 years ago |
|
Fritz Otlinghaus
|
c9336840ff
|
Update email_helper.php
|
8 years ago |
|
Fritz Otlinghaus
|
6f367eefe0
|
Update email_helper.php
|
8 years ago |
|
Igor Scheller
|
781f830678
|
Fixes and improvements
|
8 years ago |
|
Bot
|
3de0cc840f
|
Removed spaces
|
8 years ago |
|
Igor Scheller
|
8506d6d27e
|
Refactoring: Config cleanup / moved to class
|
8 years ago |
|
Bot
|
740026a9de
|
Replaced [0-9] with \d
|
8 years ago |
|
Bot
|
915ce28fee
|
Replaced " with '
|
8 years ago |
|
Igor Scheller
|
9a3ad88834
|
Changed from mysqli to PDO, some refactorings, faster sql queries
|
8 years ago |
|
Igor Scheller
|
f7c09cb7ff
|
Added exception handler
|
8 years ago |
|
Igor Scheller
|
8254a79c58
|
Bugfixes & improvements
|
8 years ago |
|
Igor Scheller
|
1c27bf1375
|
Removed $angeltype from function Shift_signup_allowed_*
|
8 years ago |
|
Bot
|
55141154c0
|
Replaced " with '
|
8 years ago |
|
Bot
|
356b2582f3
|
PPHDoc, formatting, fixes, cleanup
|
8 years ago |
|
Bot
|
d71e7bbfad
|
Formatting
|
8 years ago |
|
Bot
|
7313e15ce8
|
PSR-2 formatting
|
8 years ago |
|
Igor Scheller
|
84f6990db2
|
Merged branch origin/master
|
8 years ago |
|
Igor Scheller
|
94b5250414
|
Added composer with parsedown requirement
|
8 years ago |
|
msquare
|
4a95dfa171
|
Merge pull request #307 from MyIgel/real-path
Fix relative paths: missing / on internationalization
|
8 years ago |
|
msquare
|
29128763fd
|
Merge pull request #306 from MyIgel/config-fix-constant
Fixes "Constant already defined" notice
|
8 years ago |
|
Igor Scheller
|
1f0ca24f5c
|
Fix relative paths: missing / on internationalization
|
8 years ago |
|
Igor Scheller
|
1f8d1eb4bb
|
Fixed "Constant already defined" notice
Added more ugly global variables
|
8 years ago |
|
Igor Scheller
|
5e850171e2
|
Fixed "Constant already defined" notice
|
8 years ago |
|
Igor Scheller
|
f894ca5fa4
|
Fix relative paths
|
8 years ago |
|
Igor Scheller
|
00d8709ae8
|
Fix relative paths
|
8 years ago |
|
msquare
|
b8ebd23f6d
|
bring back filtering by occupancy
|
8 years ago |
|
msquare
|
51eb22a1c6
|
fix shift signup state calculation
|
8 years ago |
|
msquare
|
3fbd62ab7d
|
bring back coloring for admins
|
8 years ago |
|
msquare
|
fe5dec73ba
|
bring back filtering by occupancy
|
8 years ago |
|
msquare
|
68aeb14edb
|
bring back filtering by angeltype
|
8 years ago |
|
msquare
|
5600476c56
|
fix missing users on active angels view
|
8 years ago |
|
msquare
|
4407604793
|
move data sorting to begin
|
8 years ago |
|
msquare
|
6c4bb0da31
|
move data sorting to begin
|
8 years ago |
|
msquare
|
cbeb45ef16
|
redo
|
8 years ago |
|
msquare
|
45200b503d
|
improve needed angel types query
|
8 years ago |
|
msquare
|
0603d0dd4e
|
remove unused code
|
8 years ago |
|
msquare
|
363cc8f6b5
|
more performance using union
|
8 years ago |
|
msquare
|
75945fdbbd
|
more performance using union
|
8 years ago |
|
msquare
|
eccbf32f68
|
redo
|
8 years ago |
|
msquare
|
84527c2252
|
redo
|
8 years ago |
|
msquare
|
65a665ee49
|
reduce max shift filter duration to 24h
|
8 years ago |
|
msquare
|
aed9f2c96c
|
bring back needed angeltypes from rooms
|
8 years ago |
|
msquare
|
860252bce8
|
select only one room per default
|
8 years ago |
|
msquare
|
46528fe1d8
|
shift view performance improvements
|
8 years ago |
|
msquare
|
ffc33993d4
|
overwhelmed
|
8 years ago |
|
msquare
|
2840bb6198
|
no signup for shifts for angels that are not arrived
|
8 years ago |
|
msquare
|
b05b235cf8
|
fix slow query
|
8 years ago |
|
msquare
|
9975e42d3c
|
fix edit user bug deleting emails
|
8 years ago |
|
msquare
|
2f2d08c574
|
fix edit user bug deleting emails
|
8 years ago |
|
msquare
|
07a0ed37ec
|
fix angeltype supporter privilege for signing up users to shift
|
8 years ago |
|
msquare
|
827de98256
|
fix room delete bug in pentabarf import temporarily
|
8 years ago |
|
msquare
|
5f9d508b02
|
fix #297 show date on every time tick in shift calendar
|
8 years ago |
|
msquare
|
549cd6534a
|
reduce number of sql queries on shift calendar
|
8 years ago |
|
msquare
|
b3f92834b0
|
reduce number of sql queries on shift calendar
|
8 years ago |
|
msquare
|
deb41c4b64
|
reduce number of sql queries on shift calendar
|
8 years ago |
|
msquare
|
99c7e8ce1a
|
fixes #298 allow a shift supporter to remove a user from shift
|
8 years ago |
|
msquare
|
0c15964e6b
|
#298 hide freeload form from angeltype supporters
|
8 years ago |
|
msquare
|
e86d75b4d9
|
begin #298 add privilege and add users to shifts by angeltype supporter
|
8 years ago |
|
msquare
|
188891c147
|
use planned arrival time validation for register page
|
8 years ago |
|
msquare
|
5b9ff7b7bf
|
fix that free shifts become green
|
8 years ago |
|
msquare
|
b8c26b0fd0
|
fix that free shifts become green
|
8 years ago |
|
msquare
|
9e804ba91a
|
fix that free shifts become green
|
8 years ago |
|
msquare
|
acfe7309f6
|
remove angeltype contact fields until the feature is ready
|
8 years ago |
|
msquare
|
2f0a63a4a1
|
remove angeltype contact radios for now
|
8 years ago |
|
msquare
|
e26eb952f4
|
update binary lang file
|
8 years ago |
|
msquare
|
deac80e700
|
merge #253
|
8 years ago |
|
jwacalex
|
6a591e7557
|
merged cherry picked commit
|
8 years ago |
|
jwacalex
|
45cda10479
|
merged master and issue
|
8 years ago |
|
jwacalex
|
79b9f9448e
|
initial commit and functionality for no self sign up
|
8 years ago |
|
jwacalex
|
1324260e0f
|
forgot to remove if-statement -.-
|
8 years ago |
|
jwacalex
|
f4f6dfefcb
|
fixed broken logic in controller (cf. to mail to @msquare)
|
8 years ago |
|
Leandra Eberle
|
687c333322
|
Update Descriptions
|
8 years ago |
|
Leandra Eberle
|
acbaaf4364
|
Update Descriptions
|
8 years ago |
|
Leandra Eberle
|
10517213f6
|
Update Descriptions
|
8 years ago |
|
Leandra Eberle
|
0401e90f00
|
Update Descriptions
|
8 years ago |
|
msquare
|
561e8ec36c
|
better msg placement on angeltype view
|
8 years ago |
|
msquare
|
34248bb20c
|
show freeload comments to supporters (user shift admin)
|
8 years ago |
|
msquare
|
476d1daeb7
|
fixes #280 shift entries finished by user returns no freeloaded shifts
|
8 years ago |
|
msquare
|
bae3ede662
|
fixes #279 fix exporting freeload comment in json export
|
8 years ago |
|
msquare
|
a8bcb19eaa
|
fix shift view bars
|
8 years ago |
|
msquare
|
4f6db20ae4
|
fix shift view bars
|
8 years ago |
|
Leandra Eberle
|
67df8da061
|
Typo Changes and Descriptions
|
8 years ago |
|
gnomus
|
dc49b9af41
|
Update guest_login.php
|
8 years ago |
|
msquare
|
ff31d0a1c5
|
fix shift signup state being combined to null
|
8 years ago |
|
msquare
|
16e9a69c0d
|
fixes #277 date parsing returns the start of the day now
|
8 years ago |
|
msquare
|
321566d4b0
|
Merge pull request #278 from leaneb/master
Change Ask an Arch Angel title
|
8 years ago |
|
Leandra Eberle
|
4116e0114e
|
Change ask an Arch Angel, to Ask the Heaven because the Arch Angel only role is deprecated
|
8 years ago |
|
msquare
|
3fd30add3c
|
fix NPE
|
8 years ago |
|
msquare
|
be8c47a175
|
add 33c3 theme
|
8 years ago |
|
msquare
|
5ae328b2b1
|
hide event countdown for mobile clients
|
8 years ago |
|
msquare
|
409761ce4b
|
rebuild login page
|
8 years ago |
|
msquare
|
9098b8e80d
|
reduce complexity of user view
|
8 years ago |
|
msquare
|
bd54bec595
|
add ValidationResult to namespace
|
8 years ago |
|
msquare
|
356cc9e1d0
|
reduce complexity of user driver license
|
8 years ago |
|
msquare
|
7b8d191808
|
reduce complexity of user driver license
|
8 years ago |
|
msquare
|
9c4636f5c4
|
reduce complexity of user driver license
|
8 years ago |
|
msquare
|
b5784e5961
|
fix order problem
|
8 years ago |
|
msquare
|
d64f96b6a1
|
reduce complexity of angeltype controller
|
8 years ago |
|
msquare
|
1636688394
|
reduce complexity of angeltype edit controller
|
8 years ago |
|
msquare
|
f2630162e9
|
reduce complexity of password recovery controller
|
8 years ago |
|
msquare
|
ac53559fea
|
fix shift calendar headers
|
8 years ago |
|
msquare
|
54f3253c32
|
fix js var names
|
8 years ago |
|
msquare
|
79ca2f1772
|
add fixed shift calendar headers and timelane
|
8 years ago |
|
msquare
|
5299ca2103
|
reduce complexity of shift view
|
8 years ago |
|
msquare
|
5a93050a06
|
localize date rendering for eventconfig info
|
8 years ago |
|
msquare
|
15243f15fc
|
fix shift view
|
8 years ago |
|
msquare
|
ec40e10ebd
|
fix unused code
|
8 years ago |
|
msquare
|
53a306f14b
|
make departure date nullable
|
8 years ago |
|
msquare
|
918d41ca70
|
reduce complexity of menu and hints
|
8 years ago |
|
msquare
|
ec6016cd38
|
reduce complexity of menu and hints
|
8 years ago |
|
msquare
|
16ed2ae683
|
fixed settings validation
|
8 years ago |
|
msquare
|
d3e942f742
|
Merge pull request #273 from anykraus/typo-sheduler-scheduler
minor typo fixed (sheduler to scheduler)
|
8 years ago |
|
msquare
|
7cf2a9bb9b
|
split templates into different files
|
8 years ago |
|
msquare
|
1a1ca1d1b5
|
split templates into different files
|
8 years ago |