Robbie Averill
|
df4d2bd838
|
Merge branch '4.0' into 4.1
# Conflicts:
# lang/da.yml
# lang/eo.yml
# lang/fi.yml
# lang/it.yml
# lang/nl.yml
# lang/sv.yml
|
2018-11-09 11:36:34 +02:00 |
|
Werner M. Krauß
|
3f321f935a
|
Convert::memstring2bytes should return integer value
bytes are by nature an integer
fixes #8572
|
2018-11-07 17:01:36 +01:00 |
|
Loz Calver
|
11fe5b3adf
|
Implement ConfirmationTokenChain to handle multiple tokens at once
|
2018-11-07 11:33:24 +13:00 |
|
Loz Calver
|
8d7c2dafab
|
[SS-2018-019] Add confirmation token to dev/build
|
2018-11-07 11:33:24 +13:00 |
|
Loz Calver
|
02ad0f44aa
|
Implement ConfirmationTokenChain to handle multiple tokens at once
|
2018-11-07 11:32:55 +13:00 |
|
Loz Calver
|
af000bea9b
|
[SS-2018-019] Add confirmation token to dev/build
|
2018-11-07 11:32:55 +13:00 |
|
Robbie Averill
|
6d2665d687
|
Merge branch '4.0' into 4.1
|
2018-11-06 11:04:28 +01:00 |
|
Werner M. Krauß
|
adafd73943
|
Convert::memstring2bytes should preserve -1
fixes #8570
|
2018-11-06 10:22:13 +01:00 |
|
Daniel Hensby
|
ce58890baf
|
Merge branch '4.0' into 4.1
|
2018-06-11 09:27:42 +01:00 |
|
Damian Mooyman
|
c070e989c4
|
BUG Safely handle empty injector factory responses
Fixes issue with ImageBackendFactory returning null and breaking injector
|
2018-06-06 16:45:16 +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 |
|
Damian Mooyman
|
d935140a95
|
[ss-2018-005] Prevent unauthenticated isDev / isTest being allowed
|
2018-05-14 17:03:39 +12:00 |
|
Daniel Hensby
|
80bf0fc487
|
FIX bad syntax
|
2018-05-02 11:43:12 +01:00 |
|
Daniel Hensby
|
d5e2d3fa67
|
Merge branch '3.6' into 4.0
|
2018-05-01 21:47:17 +01:00 |
|
Aaron Carlino
|
0863bac29a
|
Update getVariables to return a copy of globals rather than including the reference in an array merge
|
2018-02-27 09:52:36 +13:00 |
|
Aaron Carlino
|
d91648dd6e
|
Update getVariables to return a copy of globals rather than including the reference in an array merge
|
2018-02-23 16:25:41 +13:00 |
|
Damian Mooyman
|
0b7cf80331
|
BUG Fix incorrect convert slashes argument
|
2018-02-13 16:33:35 +13:00 |
|
Daniel Hensby
|
62057befdb
|
Merge branch '4.0' into 4
|
2018-02-06 10:08:17 +00:00 |
|
Daniel Hensby
|
28ca11dd7e
|
FIX Regex range identifier correctly escaped
|
2018-02-05 15:17:20 +00: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 |
|
Daniel Hensby
|
c959160375
|
FIX Misnamed test namespaces
|
2018-01-16 17:41:18 +00:00 |
|
Daniel Hensby
|
e4b936c7c7
|
Merge branch '4.0' into 4
|
2018-01-12 14:40:33 +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 |
|
Daniel Hensby
|
de6afd4405
|
TEST Cant reliably use Injector to replace Extensions
|
2018-01-11 14:08:29 +00:00 |
|
Christopher Joe
|
cc72b5c852
|
BUG Added warning for auto-generated table_name for non-test classes
|
2017-11-27 20:22:37 +13:00 |
|
Damian Mooyman
|
b9cb1e69e6
|
BUG Replace phpdotenv with thread-safe replacement
|
2017-10-20 18:43:11 +13:00 |
|
Christopher Joe
|
3560a0418d
|
rename TEMP_FOLDER to TEMP_PATH
|
2017-10-09 12:41:34 +13:00 |
|
Damian Mooyman
|
313f8c7ac3
|
Merge pull request #7439 from creative-commoners/pulls/4.0/trim-injector-names
FIX Trim whitespace off names in Injector
|
2017-10-09 12:31:11 +13:00 |
|
Robbie Averill
|
3bdc8c7e65
|
FIX Trim whitespace off names in Injector
|
2017-10-06 15:52:44 +13:00 |
|
Damian Mooyman
|
b996e2c22c
|
API Extensions are now stateless
ENHANCEMENT Injector now lazy-loads services more intelligently
|
2017-10-06 14:53:44 +13:00 |
|
Damian Mooyman
|
4dbd727206
|
BUG Config updates are now applied after middleware not before
|
2017-10-05 12:30:21 +13:00 |
|
Damian Mooyman
|
1b6d0144c5
|
BUG Fix resource mapping for TinyMCE
API add ModuleResource::getRelativeResource()
|
2017-10-04 17:44:04 +13:00 |
|
Damian Mooyman
|
fa57deeba4
|
ENHANCEMENT Allow vendor modules with url rewriting
API Introduce ModuleResource feature
|
2017-09-29 10:28:38 +13:00 |
|
Damian Mooyman
|
da27948777
|
Merge pull request #7373 from dhensby/pulls/4/rate-limit-security
NEW RateLimiter for Security controller
|
2017-09-28 11:01:37 +13:00 |
|
Damian Mooyman
|
e4fd9b4ff7
|
Code style fixes
|
2017-09-28 09:54:29 +13:00 |
|
Daniel Hensby
|
5f739c111e
|
added ratelimiter tests
|
2017-09-27 16:42:04 +01:00 |
|
Damian Mooyman
|
261302a121
|
ENHANCEMENT Don't force all class names to lowercase
Speeds up autoloading because composer psr-4 works properly now
|
2017-09-20 15:14:55 +12:00 |
|
Andrew Aitken-Fincham
|
4d098fc2ad
|
add test for backslash on Convert::raw2htmlid
|
2017-08-24 11:15:44 +01:00 |
|
Damian Mooyman
|
47fced8880
|
BUG Capture errors after a reload token redirect to login url
Fixes #7289
|
2017-08-24 12:55:04 +12:00 |
|
Damian Mooyman
|
9b4d689bb2
|
Lazy-load custom methods and extensions on CustomMethods and Extensible traits
No longer need constructExtensions()
|
2017-08-22 15:47:24 +12:00 |
|
Damian Mooyman
|
0681567102
|
BUG Fix flushing on live mode (#7241)
* BUG Fix flushing on live mode
Fixes #7217
* Clarify injector service documentation
|
2017-08-07 13:53:23 +12:00 |
|
Daniel Hensby
|
6aeab571db
|
Merge pull request #7195 from open-sausages/pulls/4.0/missing-unnested-from
BUG Fix unassigned nestedFrom
|
2017-07-24 17:07:07 +01:00 |
|
Daniel Hensby
|
4a1fb37d0f
|
Rename badly named test helper
|
2017-07-21 15:59:14 +01:00 |
|
Damian Mooyman
|
2385b73855
|
BUG fix config rules to match updated Except
|
2017-07-21 15:02:27 +12:00 |
|
Damian Mooyman
|
6fd6a38949
|
BUG Fix unassigned nestedFrom
Fixes #7194
|
2017-07-21 08:58:19 +12:00 |
|
Daniel Hensby
|
d7095c2213
|
Merge branch '3' into 4
|
2017-07-18 14:19:16 +01:00 |
|
Damian Mooyman
|
de7b746094
|
Merge pull request #7180 from robbieaverill/pulls/4.0/remove-config-update-use
Use merge and set instead of update for config calls
|
2017-07-18 09:16:20 +12:00 |
|
Robbie Averill
|
da4e46e4de
|
FIX Use merge and set instead of update for config calls
|
2017-07-17 17:59:40 +12:00 |
|