tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-15 22:16:32 +02:00
Code Issues Projects Releases Wiki Activity
19,116 Commits 30 Branches 526 Tags 154 MiB
13b4722aaf
Commit Graph

19116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
52eb0bf214 Merge pull request #7306 from patricknelson/issue-7305-template-manifest-injector 
NEW: Ability to override SS_TemplateManifest via Injector (fixes #7305)
 2017-08-24 13:41:08 +12:00
Damian Mooyman
d5b3280498 Merge pull request #7302 from robbieaverill/pulls/4.0/has-class-returns-bool 
API Make FormField::hasClass return a boolean instead of an int
 2017-08-24 13:19:30 +12:00
Damian Mooyman
80cf096a6e
BUG Prioritise SS_BASE_URL over flakey SCRIPT_FILENAME check 2017-08-24 12:58:04 +12: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
Patrick Nelson
fdd501182e NEW: Ability to override SS_TemplateManifest via Injector (fixes #7305) 2017-08-23 17:34:07 -07:00
Chris Joe
8edf070a13 Merge pull request #7303 from open-sausages/pulls/4.0/constant-logging 
BUG Fix BASE_URL for CLI
 2017-08-24 11:56:10 +12:00
Damian Mooyman
b59bd4e6a1 Merge pull request #7295 from open-sausages/pulls/4.0/opt-in-gridfield-versioning 
Docs for https://github.com/silverstripe/silverstripe-versioned/pull/35/
 2017-08-24 11:29:12 +12:00
Damian Mooyman
6b1dfddcb8
Docs for https://github.com/silverstripe/silverstripe-versioned/pull/35/ 2017-08-24 10:46:32 +12:00
Loz Calver
ecc619248b Merge pull request #7298 from robbieaverill/pulls/4.0/replace-stat-usage 
Replace use of Configurable stat() with config()->get(), will be deprecated in future
 2017-08-23 10:12:40 +01:00
Robbie Averill
595ba75a50 API Make FormField::hasClass return a boolean instead of an int 2017-08-23 16:23:28 +12:00
Damian Mooyman
1b087221d2
BUG Fix BASE_URL on CLI 
Fixes #7256
 2017-08-23 14:48:46 +12:00
Damian Mooyman
2c34af72e1
ENHANCEMENT Log user constants during CI for debugging improvements 2017-08-23 14:23:33 +12:00
Chris Joe
376294f354 Merge pull request #7294 from open-sausages/pulls/4.0/remove-mcrypt 
Remove mcrypt references
 2017-08-23 12:53:39 +12:00
Damian Mooyman
14761a9246
Remove mcrypt 
Use session for alternativeDatabaseName instead
Fixes #7280
 2017-08-23 12:13:32 +12:00
Robbie Averill
8ebc13ae4e Replace use of Configurable stat() with config()->get(), will be deprecated in future 2017-08-23 09:42:10 +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
fc2a603915 BUG Don’t construct extension_instances on objects that never use them 2017-08-22 15:47:24 +12:00
Damian Mooyman
90ba24733d Reduce unnecessary calls to Extension and DataExtension configs 2017-08-22 15:47:24 +12:00
Damian Mooyman
598a2c91e3 Reduce calls to i18n.default_config 2017-08-22 15:47:24 +12:00
Damian Mooyman
179a9fca28 Merge pull request #7292 from sminnee/injector-dependency-speedup 
FIX: Prevent repeated lookup of obj.dependencies by Injector
 2017-08-22 14:30:35 +12:00
Damian Mooyman
db8619f11a Merge pull request #7291 from open-sausages/pulls/4.0/stop-spacing-out 
Fix trim accept header parts
 2017-08-22 12:21:41 +12:00
Sam Minnee
c50cd34df6 FIX: Prevent repeated lookup of obj.dependencies by Injector 
This unnecessary repeated call to Injector slows down the construction
of frequently instantiated classes.

On admin/pages, this reduced execution from 1.67s to 1.56s, and it
reduced the impact of having an extension added to DBField by 33%
(from 100ms to 67ms)
 2017-08-22 12:12:32 +12:00
Christopher Joe
249c7048d9 Fix trim accept header parts 2017-08-21 15:31:13 +12:00
Chris Joe
c8d8adfefe Merge pull request #7287 from open-sausages/pulls/4.0/fix-multi-configs 
BUG Fix issue with multiple editors breaking plugins
 2017-08-21 10:58:27 +12:00
Daniel Hensby
304889ff2f Merge pull request #7281 from sminnee/test-php72 
NEW: Test on php 7.2
 2017-08-18 21:22:10 +01:00
Damian Mooyman
ce5e15df6e BUG Fix issue with multiple editors breaking plugins 2017-08-18 16:33:16 +12:00
Daniel Hensby
33c2c7bfe7
Merge branch '3' into 4 2017-08-17 15:06:00 +01:00
Daniel Hensby
a39325f1fc Merge pull request #7285 from open-sausages/pulls/4.0/schema-ing-our-path-to-victory 
Enhancement Add a path option for the schema data,  …
 2017-08-17 14:55:35 +01:00
Daniel Hensby
c09305be9e
Merge branch '3.6' into 3 2017-08-17 14:31:57 +01:00
Daniel Hensby
921f615e19
Merge branch '3.5' into 3.6 2017-08-17 14:14:31 +01:00
Christopher Joe
9dc11eff43 Enhancement Add a path option for the schema data, so a full tree is not required for this data 2017-08-17 16:08:27 +12:00
Chris Joe
506ae52e62 Merge pull request #7262 from open-sausages/pulls/4.0/bootstrap-upgrade 
Upgrade bootstrap class names
 2017-08-17 15:46:34 +12:00
Damian Mooyman
7ad081a20b Merge pull request #7288 from dhensby/pulls/3.5/write-no-change-edit 
FIX Don't update LastEdited on skipped writes
 2017-08-17 15:09:03 +12:00
Daniel Hensby
eb80a5f9e8
FIX LastEdited no longer updated on skipped writes 2017-08-16 23:39:22 +01:00
Daniel Hensby
1ae07ac2a3
TEST Prove LastEdited is updated when no changes are made 2017-08-16 22:26:47 +01:00
Damian Mooyman
bbded44056 Upgrade bootstrap class names 2017-08-16 10:50:09 +12:00
Sam Minnee
02cd720748 FIX: Remove deprecated assert() usage. 
This stopped working in PHP 7.2
 2017-08-15 20:45:57 +12:00
Chris Joe
ac91a4598a Merge pull request #7275 from open-sausages/pulls/4.0/enable-behat-config-fixtures 
API Enable config files to be loaded for behat tests
 2017-08-15 12:58:49 +12:00
Sam Minnee
0926b04512 FIX: Fix latent bug in DataObject 
This didn’t show up until we ran tests on PHP 7.3-dev
 2017-08-15 11:13:57 +12:00
Sam Minnee
0eebeedd03 NEW: Test php 7.2 
Travis now supports PHP 7.2 testing, and we should add this to our suite
so that SilverStripe 4 can be released with PHP 7.2 support.

PHP 7.2 is due for released in November, a little after when SS4 is
expected to go stable.
 2017-08-15 11:06:37 +12:00
Damian Mooyman
c14233f743
API Enable config files to be loaded for behat tests 2017-08-15 10:30:29 +12:00
Daniel Hensby
c0211927aa
Merge branch '3' into 4 2017-08-14 21:18:03 +01:00
Daniel Hensby
23a726f385
Merge branch '3.6' into 3 2017-08-14 13:43:28 +01:00
Daniel Hensby
a3b72c500d
Merge branch '3.5' into 3.6 2017-08-14 12:55:09 +01:00
Chris Joe
388ff1df74 Merge pull request #7273 from open-sausages/pulls/4.0/recipe-info 
Provide information related to recipe
 2017-08-14 23:06:40 +12:00
James Pluck
b04a1ab41c Fix Truncate Error Issue when using views in a Unittest. 
When using a view in a SilverStripe project, whenever the tear down scripts for the Unittests are run the following error occurs:

Couldn't run query:
TRUNCATE "ActivityPoints_view"
Table 'ss_tmpdb2391727.ActivityPoints_view' doesn't exist

This was due to the MySQLSchemaManager::tableList() function assuming that all records in the TABLES were actual tables containing data.

This small tweak fixes the issue by modifying the SQL to filter out views from the list before truncating.
 2017-08-14 15:22:19 +12:00
Saophalkun Ponlu
29cb4f2f07 Provide information related to recipe 2017-08-14 10:24:48 +12:00
Chris Joe
b0af45231a Merge pull request #7257 from open-sausages/pulls/4.0/cascade-deletes 
API Implement cascade_deletes
 2017-08-09 16:07:02 +12:00
Damian Mooyman
323644c7bb
API Implement cascade_deletes 2017-08-09 15:14:00 +12:00
Damian Mooyman
4572b01068 Merge pull request #7255 from robbieaverill/pulls/4.0/index-columns-docs-and-exception 
FIX Throw exception when "value" is used to define indexes. Update docs.
 2017-08-09 14:24:29 +12:00