tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-05 10:59:35 +02:00
Code Issues Projects Releases Wiki Activity
17,160 Commits 29 Branches 517 Tags 147 MiB
0a0a990c54
Commit Graph

17160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Joe
963445e743 FIX tab link on top panel changes even when "cancel to browse" was selected 2016-09-30 14:57:15 +13:00
Anton Smith
ae4108bf00 BUG Content-Disposition header breaks in Firefox (#4087) 2016-09-29 13:25:14 +13:00
jeffreyguo
801574b9b0 Update index.md (#4020) 
MINOR: wording correction
 2016-09-29 13:21:17 +13:00
Daniel Hensby
a08a854c9c Merge pull request #6100 from thezenmonkey/patch-3 
Update jquery.js reference
 2016-09-28 14:22:26 +01:00
Richard Rudy
c94eb8adf2 Get jQuery from Google CDN 
jquery is no longer included at the original location. Pulling from the CDN to avoid any other issues if another version gets (re)moved
 2016-09-28 08:20:15 -04:00
Richard Rudy
b2d07a1fd7 Update jquery.js reference 
jquery is no longer included at the path specified. Shoudl be in the admin directory
 2016-09-27 09:54:03 -04:00
Damian Mooyman
5a2e2b7ed5 Merge pull request #6089 from open-sausages/pulls/codecoverage 
Code coverage via CodeCov.io
 2016-09-27 10:23:30 +13:00
Ingo Schommer
0c06c4d389 Fast-finish Travis builds 
The PHP7 build includes code coverage, which makes it run a bit longer now.
In general, we shouldn't wait for allowed_failures with build feedback.
Travis seems to run builds (roughly) in order, so allowed_failures
tend to prolong build times, since it only runs a few builds concurrently.

We'll move the PHP7 build out of allowed_failures eventually,
but I think the general concept still applies:
There's little value in waiting around for allowed_failures builds.

See https://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
 2016-09-27 09:19:41 +13:00
Ingo Schommer
48e98c3d4f Add uncovered files to code coverage 
If the files are never included through the PHP test run,
they won't count as uncovered otherwise.

See https://phpunit.de/manual/current/en/code-coverage-analysis.html#code-coverage-analysis.whitelisting-files
 2016-09-27 08:47:01 +13:00
Ingo Schommer
9cb33ea5bf Fixed @covers namespaces 2016-09-27 07:46:17 +13:00
Daniel Hensby
ad79b5c88c
fixing bad folder caseing 2016-09-26 18:06:40 +01:00
Loz Calver
189ac2eed0 Merge pull request #6088 from webbuilders-group/fix-windows-regression 
BUGIX: Fix regression causing the admin to crash on windows due to FRAMEWORK_DIR being prefixed by a backslash
 2016-09-26 16:00:16 +01:00
Daniel Hensby
74ecaded08
Merge branch '3' 2016-09-26 14:00:58 +01:00
UndefinedOffset
ce91c3820e BUGIX: Fix regression causing the admin to crash on windows due to FRAMEWORK_DIR being prefixed by a backslash 2016-09-26 09:46:00 -03:00
Ingo Schommer
345b4d56e6 Code coverage via CodeCov on PHP7 builds 
PHP7+phpdbg is waaaay faster: http://blog.remirepo.net/post/2015/11/09/PHPUnit-code-coverage-benchmark
 2016-09-26 22:33:03 +13:00
Ingo Schommer
ef966557d8 Merge pull request #6083 from JorisDebonnet/issue-4983 
Set default Varchar size to 255, up from 50 (#4983)
 2016-09-26 22:29:49 +13:00
Joris Debonnet
44e474a687 Set default Varchar size to 255, up from 50 (#4983) 2016-09-26 07:31:40 +02:00
Ingo Schommer
53501c73bc Merge pull request #5909 from timkung/tabset-opentabfromurl-fix 
Fixing TabSet.js error when expected elements are not available
 2016-09-26 17:14:04 +13:00
Andrew Aitken-Fincham
ad0d68d133 add IPUtils.php to control and implement symfony IpUtils (#6062) 2016-09-26 12:44:55 +13:00
Daniel Hensby
99f98e51d0
Merge branch '3' 2016-09-23 17:15:59 +01:00
Daniel Hensby
6022012481
Merge branch '3.4' into 3 2016-09-23 16:33:45 +01:00
Daniel Hensby
004bb8f03a
Merge pull request #5998 from sminnee/remove-bbcode 2016-09-23 15:28:30 +01:00
Damian Mooyman
68ac1283d0 Add changelog placeholder 2016-09-23 16:27:11 +12:00
Damian Mooyman
79bdd6b902 Prune invalid lang files 2016-09-23 16:14:42 +12:00
Damian Mooyman
acc230fc99 Update translations 2016-09-23 16:14:42 +12:00
Damian Mooyman
cbe0ac8507 BUG Fix invalid import form requirements (#6071) 2016-09-23 16:13:09 +12:00
Damian Mooyman
f6f3fe561d Merge pull request #6066 from sminnee/campaignadmin-error-check 
FIX: Graceful degradation if obsolete classnames in ChangeSetItem (fixes #6065)
 2016-09-23 13:03:52 +12:00
Sam Minnee
c52adad1fe FIX: Graceful degradation if obsolete classnames in ChangeSetItem (fixes #6065) 
NEW: Add SilverStripe\ORM\UnexpectedDataException class.

This change provides more graceful handling of the case where a
ChangeSetItem is referencing a no-longer-existing class.

The new exception, SilverStripe\ORM\UnexpectedDataException, is
intended to be available for throwing whenever we have unexpected data
in the database.

It can be trapped by the relevant UIs and more graceful errors than
HTTP 500s can be provided.
 2016-09-23 12:28:32 +12:00
Loz Calver
fc72434ea5 Update 4.0.0.md 2016-09-22 16:56:37 +01:00
Daniel Hensby
87624809d6 Merge pull request #6061 from open-sausages/pulls/4.0/invalid-htaccess-escaping 
BUG Fix incorrect backslash escaping in htaccess template
 2016-09-22 09:38:14 +01:00
Damian Mooyman
65ff0a4d38
BUG Fix incorrect backslash escaping in htaccess template 2016-09-22 19:11:08 +12:00
Damian Mooyman
aa7a9565ce BUG Fix incorrect ssviewertest path (#6060) 2016-09-22 18:03:14 +12:00
Ingo Schommer
60294654d9 Merge pull request #6056 from open-sausages/pulls/4.0/fix-file-validation 
BUG Fix invalid file uploads not being validated
 2016-09-22 16:22:01 +12:00
Ingo Schommer
301436f669 Merge pull request #6005 from open-sausages/pulls/4.0/defaut-string-value 
API Enable default value to be specified for dbstring types at the db level
 2016-09-22 16:09:19 +12:00
Damian Mooyman
e8375111b1
API Enable default value to be specified for dbstring types at the db level 
Fixes #1409
 2016-09-22 15:19:30 +12:00
Damian Mooyman
9a9cd97bc3 BUG Fix invalid file uploads not being validated 2016-09-22 14:55:06 +12:00
Ingo Schommer
86dd56ba49 Merge pull request #6002 from open-sausages/pulls/4.0-react-tabs-props 
Fixed react-bootstrap tabs warnings
 2016-09-22 14:48:26 +12:00
Ingo Schommer
34dcda15ef Rebuild dist files 2016-09-22 14:48:00 +12:00
Ingo Schommer
5d9c8a8b95 Better <CompositeField> prop defaults 
The props.tag default was set directly on props,
but the component used it from props.data.tag,
hence the default was ineffective.

Since empty arrays for props.data override nested React defaults,
there's no built-in way to enforce this default.

Hardcoding a default felt viable here, since the component allows overrides via props.
 2016-09-22 14:46:46 +12:00
Ingo Schommer
5415afe8bf Fixed react-bootstrap tabs warnings 
We can't use our own "id" values here, since react-bootstrap requires internal consistency
between tab containers and tab panes through its own auto-generated identifiers
 2016-09-22 14:46:46 +12:00
Ingo Schommer
368d3ee65e Merge pull request #6051 from sminnee/die-dist-conflicts-die 
FIX: Break dist javascript and onto newlines.
 2016-09-22 14:45:53 +12:00
Sam Minnee
c24201b5f3 FIX: Break dist javascript and onto newlines. 
This doesn’t have much impact on resulting JS size, but it will
hopefully make merge conflicts much less frequent.

The CSS growth is a little higher (6.5% increase in size) but is not
material.

If this materially reduces the number of merge conflicts we have, by
letting the git merge tools resolve some dist file mergers, I think it
would be worth it.

Some example changes in file size:

bundle.js 290K -> 301K
vendor.js 1,325K -> 1,321K
bundle.css 628K -> 669K
 2016-09-22 14:38:17 +12:00
Ingo Schommer
a80ac1651a Merge pull request #6053 from open-sausages/pulls/4.0/restore-cms-tests 
Restore CMS build to CI
 2016-09-22 11:41:16 +12:00
Damian Mooyman
1000e94337 Merge pull request #5954 from open-sausages/pulls/4.0/ssviewer-include-docs 
Clarified <% include %> use in SS4 (fixes #5952)
 2016-09-22 11:33:05 +12:00
Ingo Schommer
54aad839c4 Clarified <% include %> use in SS4 (see #5952) 2016-09-22 11:29:32 +12:00
Ingo Schommer
a96edf4477 Merge pull request #6054 from open-sausages/pulls/4.0/asset-tidy 
A mix of minor tidy up with AssetAdmin
 2016-09-22 11:22:31 +12:00
Paul Clarke
62dcb0d0c4 close panel icon moved up to align with title 2016-09-22 11:21:54 +12:00
Paul Clarke
3d774a02cb Chosen no longer nested within .field 2016-09-22 11:20:29 +12:00
Paul Clarke
ab4592a84a adjust max width of file to expand over max allowable width if thin 2016-09-22 11:20:28 +12:00
Paul Clarke
119d46b734 Update folder icon 2016-09-22 11:20:28 +12:00