Commit Graph

17097 Commits

Author SHA1 Message Date
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
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
Paul Clarke
3f06d4f327 style dimensions 2016-09-22 11:20:28 +12:00
Ingo Schommer
c36d947faa Merge pull request #6050 from open-sausages/pulls/4.0/highlighted-file-tweak
API Move PreviewLink logic into File dataobject
2016-09-22 10:42:04 +12:00
Ingo Schommer
ca620c1c14 Merge pull request #6036 from open-sausages/pulls/4.0/fix-cms-buttons
BUG fix issue with popup menu appearing on the left
2016-09-22 09:17:20 +12:00
Ingo Schommer
c309632b72 Merge pull request #6031 from open-sausages/pulls/4.0/fix-campaign-admin
BUG Fix error in campaign area
2016-09-22 09:14:30 +12:00
Damian Mooyman
9062680ccc Restore CMS build to CI 2016-09-22 08:31:56 +12:00
Christopher Joe
ea50e30079 API Move PreviewLink logic into File dataobject 2016-09-21 17:37:35 +12:00
Damian Mooyman
ef88619d2f BUG Fix error in campaign area
Fix alignment of add campaign fields
2016-09-21 17:36:51 +12:00
Ingo Schommer
e1b827f7c8 Optimise webpack build time (#6049)
* Rename bundles (prep for webpack optimisation)

This might or might not reduce the overall repo size,
because git can combine similar chunks in the newly generated files

* Optimise webpack build time

Consolidates bundles, since a separation of bundle-framework.js vs. bundle-legacy.js
vs. bundle-lib.js no longer makes sense - they're all loaded upfront anyway,
since we'll be introducing more react-powered logic alongside the "legacy" JavaScript.

By consolidating into fewer bundles, we give the optimisation scripts (UglifyJS)
more options to reduce the overall file size.

The main motivation for a vendor.js is to shorten rebuild times:
Most active development is happening in files required through bundle.js.
This commit drastically reduces the rebuild time for those changes (15s to 4s).
2016-09-21 17:14:43 +12:00
Damian Mooyman
5a59c4f4b4 API Add bootstrap button row template
API Add bootstrap button template
BUG fix draft / published preview selector
2016-09-21 15:59:12 +12:00
Chris Joe
a85ba1222b Add helper-circle and block icons (#6035) 2016-09-21 15:15:59 +12:00
Chris Joe
51ef369630 FIX stringify api call body to work for IE10 (#6032)
* FIX stringify api call body to work for IE10

* Pull out functions defined in createEndpointFetcher
2016-09-21 14:45:30 +12:00
Ingo Schommer
183b3915d3 Merge pull request #6045 from sminnee/fix-pr-builds
FIX: Make PR builds work.
2016-09-21 13:22:09 +12:00