Daniel Hensby
b984959170
Merge branch '4.1' into 4.2
2018-07-23 13:30:49 +01:00
Gerald Baumeister
df5395b101
Added check for php-intl requirement
2018-07-16 18:08:25 +02:00
Daniel Hensby
8703839eb1
FIX updateValidatePassword calls need to be masked from backtraces
2018-07-15 01:06:45 +01:00
Daniel Hensby
d8430f549d
Address feedback
2018-06-20 14:46:50 +12:00
Damian Mooyman
6da72d686f
Maybe fix it?
2018-06-20 14:46:50 +12:00
Damian Mooyman
f2c2ded27f
BUG Ensure that build includes extra classes
2018-06-20 14:46:50 +12:00
Damian Mooyman
fbfd454d65
ENHANCEMENT Ensure test DB is flushed on either DDL or transaction-disabled tests
...
Fixes #8182
2018-06-20 14:46:50 +12:00
Damian Mooyman
d52c4dd602
BUG Make regression in #7839 safer
2018-06-14 16:45:09 +12:00
Robbie Averill
acc8d48b11
FIX SapphireTest can load relative fixtures in subfolders, switch "needs db" priority check order
...
A minute performance gain by checking instance properties for "uses database" before loading and parsing PHPDoc
annotations for the same thing, rather than doing it afterwards.
2018-06-14 13:59:44 +12:00
Daniel Hensby
ec956a682d
API Moving tests to use transactions
2018-06-13 09:35:45 +12:00
Damian Mooyman
77a45c0dbc
Merge remote-tracking branch 'origin/4.1' into 4
...
# Conflicts:
# src/Forms/HTMLEditor/HTMLEditorSanitiser.php
# src/ORM/DataObjectSchema.php
# src/ORM/Queries/SQLSelect.php
# src/View/Parsers/ShortcodeParser.php
2018-06-11 10:19:04 +12:00
Ingo Schommer
80c30c7b05
Merge pull request #8089 from creative-commoners/pulls/4.1/fix-maori-macron
...
FIX Add macron to Māori language name
2018-06-08 14:07:05 +12:00
Robbie Averill
e0993043f8
Merge branch '4.1' into 4
2018-05-30 15:08:39 +12:00
Robbie Averill
c8b0bc0ad7
Merge branch '4.0' into 4.1
...
# Conflicts:
# src/ORM/DataObject.php
# tests/php/ORM/DataObjectDuplicationTest.php
# tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Robbie Averill
ea16e28aa7
Merge branch '4.1' into 4
2018-05-28 18:33:56 +12:00
Robbie Averill
6d98a912c9
Merge branch 'heads/4.1.1' into 4.1
2018-05-28 18:26:20 +12:00
Robbie Averill
3a537bc745
Merge branch 'heads/4.0.4' into 4.0
2018-05-28 17:50:07 +12:00
Robbie Averill
722202fef4
Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
...
# Conflicts:
# src/Control/Director.php
2018-05-24 15:41:11 +12:00
Robbie Averill
c308416afa
FIX Add macron to Māori language name
2018-05-23 11:22:30 +12:00
Damian Mooyman
865ebb3398
ENHANCEMENT Improve upgrading experience. ( #8025 )
...
* ENHANCEMENT Improve upgrading experience.
Show errors and back button if errors encountered during install
BUG Fix hard-coded 'mysite' folder
Fixes #8024
* Patch behat tests to work with new buttons
2018-05-21 22:08:34 +12:00
Damian Mooyman
2e13ae746f
[ss-2018-006] Prevent code execution in template value resolution
2018-05-14 17:05:31 +12:00
Gorrie Coe
59f598d639
Added isset check for registered controller links in dev admin
2018-04-24 22:34:37 +12:00
Damian Mooyman
b07e13d2f8
BUG Fix incorrect installer base tag generation ( #8018 )
...
Fixes #7926
2018-04-24 10:53:08 +12:00
Damian Mooyman
f83691e7f7
BUG Make invalid dev actions 404 not 500 error
...
Fixes #8012
2018-04-18 11:37:31 +12:00
Robbie Averill
af2c3886b9
Merge branch '4.1' into 4
2018-04-10 16:27:00 +12:00
Robbie Averill
09b4f26151
Merge branch '4.0' into 4.1
2018-04-10 16:18:08 +12:00
Damian Mooyman
e11ba9a2d7
BUG Fix many_many through crashing ModelAdmin
2018-04-10 14:51:49 +12:00
Damian Mooyman
5ff6874dbc
Merge remote-tracking branch 'origin/4.1' into 4
2018-04-04 17:38:26 +12:00
Will Rossiter
20c6ddd354
Use ModuleResourceLoader for fixtures path
...
This adds the ability to refer to a fixture file path by the ModuleResourceLoader path (e.g protected static $fixture_file = 'vendor/module:tests/fixtures.yml')
2018-03-28 10:36:56 +13:00
Damian Mooyman
df9e0e40d3
Deprecate useDraftStage
2018-03-22 17:23:50 +13:00
Damian Mooyman
7e73ad2101
Extensible test session
2018-03-21 17:28:02 +13:00
Damian Mooyman
6fef72062b
Restore old functionaltest behaviour
2018-03-21 16:56:40 +13:00
Damian Mooyman
5a069e2e75
remove unnecessary use
2018-03-21 16:44:14 +13:00
Damian Mooyman
ba94e020e7
Fix FunctionalTest not setting persistent versioned mode
2018-03-21 16:07:31 +13:00
Daniel Hensby
2c121e8a07
new approach
2018-03-19 11:48:17 +00:00
Daniel Hensby
7f7fe73b77
Reduce dependence on session state for accessing draft stages
2018-03-19 11:48:16 +00:00
Daniel Hensby
ced2ba1f64
API Move CSV writing/reading to league/csv library
2018-02-22 09:22:37 +13:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1
2018-02-09 15:19:15 +00:00
Damian Mooyman
0a486b8f57
BUG Fix issue with CLIDebugView failing on class name of existing class
...
Fixes #7827
2018-02-09 09:52:32 +13:00
Damian Mooyman
dd3fbf2c73
BUG Fix installer checking wrong location for files
2018-02-08 10:50:27 +13:00
Damian Mooyman
e359948eb3
Merge remote-tracking branch 'origin/4.0' into 4
...
# Conflicts:
# src/Core/CoreKernel.php
2018-02-05 17:52:38 +13:00
Damian Mooyman
288aaf083c
BUG Fix issue with DebugView failing on class name of existing class
...
Fixes #7827
2018-02-05 10:45:49 +13:00
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
20348b5f42
BUG Fix upgrade-code doctor with public path
2018-01-16 15:38:12 +13: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
Damian Mooyman
529e341dbc
Merge pull request #7699 from open-sausages/pulls/4/html-in-security-msg
...
ENHANCEMENT Allow html in security failure message
2017-12-14 14:30:09 +13:00
Damian Mooyman
1c8576cee7
Linting cleanup
2017-12-14 14:18:41 +13:00
Damian Mooyman
8b1b9f022b
Fix linting issues
2017-12-14 13:50:52 +13:00
Damian Mooyman
6b384f4b35
Merge branch '4.0' into 4
2017-12-07 13:52:00 +13:00
