Damian Mooyman
|
a3c52f901a
|
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
# src/Core/TempFolder.php
# src/ORM/DataObject.php
# src/View/ThemeResourceLoader.php
# src/includes/constants.php
# tests/php/Control/SimpleResourceURLGeneratorTest.php
# tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
# tests/php/View/RequirementsTest.php
|
2018-01-22 14:57:05 +13:00 |
|
Daniel Hensby
|
db610aaf3b
|
Fixing string concat CS issues
|
2018-01-16 18:39:30 +00:00 |
|
Damian Mooyman
|
8d077203d4
|
API Implement support for public/ webroot folder (#7741)
* API Implement support for public/ webroot folder
* Bugfixes and refactor based on feedback
|
2018-01-12 16:25:02 +13:00 |
|
Chris Joe
|
cafa3fc29a
|
BUG switch to trigger_error() when a resource is not found (#7468)
* BUG switch to `trigger_error()` when a resource is not found rather than throw an exception
* Add unit test for module url failing
|
2017-10-16 16:11:42 +13:00 |
|
Damian Mooyman
|
fa57deeba4
|
ENHANCEMENT Allow vendor modules with url rewriting
API Introduce ModuleResource feature
|
2017-09-29 10:28:38 +13:00 |
|