tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-01 00:49:33 +02:00
Code Issues Projects Releases Wiki Activity
18,936 Commits 29 Branches 516 Tags 147 MiB
120c772966
Commit Graph

18936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Joe
120c772966 Add TreeDropdownField from React to Entwine 2017-09-04 12:15:41 +12:00
Damian Mooyman
458e919a69 Merge pull request #7331 from open-sausages/pulls/4.0/enable-mce-lists 
Enable TinyMCE list buttons
 2017-09-04 09:59:18 +12:00
Saophalkun Ponlu
08fa3d6e3d
Enable TinyMCE list buttons 2017-09-04 09:30:07 +12:00
Chris Joe
9fb5a2a693 Merge pull request #7329 from open-sausages/pulls/4.0/file-upgrade-docs 
DOCS Upgrading file docs
 2017-09-01 13:39:18 +12:00
Damian Mooyman
fdc5ad7337
DOCS Upgrading file docs 2017-09-01 13:14:43 +12:00
Loz Calver
526cff4e55 Merge pull request #7330 from silverstripe/pulls/fix-hasone-docs 
Fix incorrect $has_one documentation
 2017-08-31 14:00:59 +01:00
Matt Peel
acc58c2b68 Fix incorrect $has_one documentation 
The first mention of `$has_one` and `$db` in this file is incorrect, which is misleading. It's explained properly later on in the document, but it's easy to get it wrong based on this first code snippet.
 2017-09-01 00:48:07 +12:00
Chris Joe
76f2358f3b Merge pull request #7324 from open-sausages/pulls/4/env-type-docs 
DOCS Corrected env type docs (fixes #7290)
 2017-08-30 11:44:55 +12:00
Christopher Joe
02c1a5199b Docs tweaked sentence wording to be more descriptive 2017-08-30 10:41:01 +12:00
Ingo Schommer
64af679c35 DOCS Corrected env type docs (fixes #7290) 2017-08-30 08:35:41 +12:00
Chris Joe
b2c4b7123e Merge pull request #7322 from open-sausages/pulls/4.0/allow-external-includes 
ENHANCEMENT Allow <% include %> to fallback outside of the Includes folder
 2017-08-29 16:48:58 +12:00
Damian Mooyman
98c10b089c
ENHANCEMENT Allow <% include %> to fallback outside of the Includes folder 
Fixes #7108
 2017-08-29 16:15:46 +12:00
Damian Mooyman
34aede5197 Merge pull request #7318 from open-sausages/pulls/4.0/no-requirements-to-combine 
Fix add combinedFiles to clear logic - ss4
 2017-08-29 14:54:50 +12:00
Christopher Joe
e4b506cbe7
Fix add combinedFiles to clear logic 2017-08-29 13:52:14 +12:00
Damian Mooyman
2a0805dda7 Merge pull request #7311 from sminnee/reduce-is-ready-usage 
FIX: Removed unnecessary database_is_ready call.
 2017-08-25 14:45:42 +12:00
Sam Minnee
8c15e451c6 FIX: Removed unnecessary database_is_ready call. 
This shaves about 45ms from every request (PHP 7.1 on a 2013 rMBP), 
cutting down execution time of a “hello world” controller by about 33%.

database_is_ready is still used in dev/build and ?flush=1 to stop people
from people bypassing security by DOSing the database or otherwise
forcing a DatabaseException
 2017-08-25 13:06:12 +12:00
Daniel Hensby
85f4a41c67 Merge pull request #7309 from andrewandante/pulls/update_test_for_raw2htmlid 
add test for backslash on Convert::raw2htmlid
 2017-08-24 11:43:25 +01:00
Andrew Aitken-Fincham
4d098fc2ad add test for backslash on Convert::raw2htmlid 2017-08-24 11:15:44 +01:00
Damian Mooyman
d52e972453 Merge pull request #7308 from creative-commoners/pulls/4.0/fix-alternative-db-name-when-session-not-started 
FIX Do not try and access sessions when they are not ready
 2017-08-24 16:07:52 +12:00
Damian Mooyman
9ff62cf6a0 Merge pull request #7307 from creative-commoners/pulls/4.0/fix-gridfield-delete-button 
FIX Use correct bootstrap class or GridFieldDetailForm delete button
 2017-08-24 15:57:32 +12:00
Robbie Averill
5a9131a116 FIX Do not try and access sessions when they are not ready 2017-08-24 14:43:27 +12:00
Robbie Averill
c4ff9df1b0 FIX Use correct bootstrap class or GridFieldDetailForm delete button 2017-08-24 14:34:06 +12:00
Chris Joe
deec9b411b Merge pull request #7300 from open-sausages/pulls/4.0/flush-live-backurl 
BUG Capture errors after a reload token redirect to login url
 2017-08-24 14:00:33 +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
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