Damian Mooyman
38a63ad73f
Merge pull request #6327 from open-sausages/pulls/4.0/file-icon-update
...
Update doc icons for files area
2016-11-24 10:34:55 +13:00
Damian Mooyman
76f64efe14
Merge pull request #6331 from silverstripe/bugfix-framework-core-manifest-manifest-cache-file-ds
...
Replace hard-coded directory separators constant
2016-11-24 10:01:06 +13:00
Christopher Pitt
06d1297fbe
Replace hard-coded directory separators constant
...
This removes warnings when building the manifest cache in Windows environments.
2016-11-24 08:05:56 +13:00
Daniel Hensby
67496d3eb0
Merge pull request #6315 from open-sausages/pulls/4.0/namespace-tests-squashed
...
API Namespace all tests
2016-11-23 08:07:45 +00:00
Damian Mooyman
22cb3d0d74
Fix various ORM test issues
2016-11-23 19:25:12 +13:00
Damian Mooyman
00c9c2c775
BUG Fix DataObject::dbObject assigning incorrect table to DBField instance
2016-11-23 19:25:12 +13:00
Damian Mooyman
cac326eebb
API Add getExtraDataObjects() and getExtraControllers() methods to SapphireTest
2016-11-23 19:25:12 +13:00
Damian Mooyman
6e8304ff2f
API Namespace framework tests
2016-11-23 19:25:12 +13:00
Damian Mooyman
789cb5b465
Move files to psr-2 standard locations
2016-11-23 19:25:12 +13:00
Paul Clarke
f5923cf433
Update doc icons
2016-11-23 11:26:38 +13:00
Damian Mooyman
8ab382ed78
ENHANCEMENT: Insert media modal in react
2016-11-22 17:50:17 +13:00
Paul Clarke
35e313de17
Enhancement Fix height for modal in IE10
...
Enhancement Remove link color specific to header
Enhancement Close panel class renamed, as it is not always top right
2016-11-22 16:58:01 +13:00
Damian Mooyman
43917edc97
Cleanup FeatureContext
2016-11-22 16:58:01 +13:00
Christopher Joe
875811fdfd
API Create loading state for schema
...
API Create stateOverride state for schema
Enhancement Moved crumbs property to rely on redux state
Enhancement Updated file app icon names
API Added InsertMediaModal functionality to HtmlEditorField
API Removed dependency on schema ID that is returned from server
API Added afterMessages property for FormBuilder to display content after the alert message
2016-11-22 16:58:00 +13:00
Daniel Hensby
bcc21c2403
Merge branch '3'
2016-11-10 01:09:35 +00:00
Daniel Hensby
cfbfe1427c
Merge pull request #6302 from jonom/shortcode-parse-extension-points
...
API Added extension points to ShortcodeParser
2016-11-09 11:23:16 +00:00
Paul
61abbfbd60
Merge pull request #6289 from open-sausages/pulls/4.0/folder-spacing
...
State variables for pages and files
2016-11-09 09:47:55 +13:00
Jonathon Menz
ffd9938652
API ShortcodeParser getter and extension points
2016-11-08 11:23:52 -08:00
Daniel Hensby
955e02ab90
Merge branch '3.4' into 3
2016-11-08 17:03:10 +00:00
Daniel Hensby
a2c34fbb02
Merge pull request #6303 from open-sausages/pulls/4.0/safari-layout-bugs
...
Safari layout bugs
2016-11-08 10:46:32 +00:00
Paul Clarke
276392c3b2
build js
2016-11-08 17:45:22 +13:00
Paul Clarke
5666dab4b3
Added page/file sate variables
2016-11-08 17:41:11 +13:00
Paul Clarke
47179313eb
Remove scroll from preview auto as its in iframe
2016-11-08 17:23:06 +13:00
Paul Clarke
2acbad1bb0
Rewrite preview for border-box and use variables
2016-11-08 17:23:06 +13:00
Paul Clarke
c5510fc416
Mobile device variables
2016-11-08 17:23:06 +13:00
Paul Clarke
b1be159155
Remove js sizing
2016-11-08 17:23:06 +13:00
Paul Clarke
9dbb5c0a1a
fix safari tabs active border
2016-11-08 17:23:06 +13:00
Paul Clarke
aca9deed23
Fix for safari scroll in campaign area
2016-11-08 17:23:06 +13:00
Martijn
1ec56a1202
Prevent undefined index notices
2016-11-07 15:09:35 +00:00
Daniel Hensby
cbd3aa0949
Merge pull request #6299 from silverstripe/revert-6237-modeladmin-showImportForm
...
Revert "Added $showSearchForm to ModelAdmin"
2016-11-07 13:42:55 +00:00
Daniel Hensby
27206c9240
Revert "Added $showSearchForm to ModelAdmin"
2016-11-07 13:42:47 +00:00
Daniel Hensby
250a4672fb
Merge pull request #6237 from Zauberfisch/modeladmin-showImportForm
...
Added $showSearchForm to ModelAdmin
2016-11-07 13:42:34 +00:00
Daniel Hensby
38ccce656b
Merge pull request #6201 from open-sausages/pulls/4.0/update-devtools
...
Update devtools code to reflect the new API
2016-11-07 13:13:26 +00:00
Daniel Hensby
3f1be23c57
Merge pull request #6294 from open-sausages/pulls/4.0/safari-layout-bugs
...
Safari layout bugs for page actions toolbar and menu toggle area
2016-11-07 13:11:54 +00:00
Daniel Hensby
d5402d9dce
Merge pull request #6186 from ntd/pr5
...
BUG Use simplexml_load_string instead of simplexml_load_file
2016-11-07 12:16:32 +00:00
Paul Clarke
aafa448bdd
Capitalise title
2016-11-07 14:08:42 +13:00
Paul Clarke
d109992a37
Safari fix for menu toggle position and bottom of menu
2016-11-07 13:57:46 +13:00
Christopher Joe
8c15e53feb
Update devtools code to reflect the new API
2016-11-07 09:08:01 +13:00
Damian Mooyman
df1354238a
Merge pull request #6276 from dhensby/pulls/3.4/versioned-phpdoc
...
DOCS Fix up some PHPDoc on Versioned
2016-11-07 08:56:46 +13:00
Daniel Hensby
d66c031244
Merge pull request #6292 from webbuilders-group/base-path-fix
...
BUGFIX: Fixed crash when BASE_PATH is set by assuming the location of Constants.php
2016-11-04 21:45:50 +00:00
UndefinedOffset
f18ef75c3d
BUGFIX: Fixed crash when BASE_PATH is set by assuming the location of Constants.php
2016-11-04 13:43:42 -03:00
Daniel Hensby
683bde6d82
Merge pull request #3535 from manja/3.1
2016-11-03 14:40:39 +00:00
Daniel Hensby
0a835c6fe7
Merge branch '3.4' into 3
2016-11-03 13:27:31 +00:00
Daniel Hensby
5f99c4aa5f
Merge branch '3.3' into 3.4
2016-11-03 13:27:11 +00:00
Daniel Hensby
fad53ae33e
Merge branch '3.2' into 3.3
2016-11-03 13:26:30 +00:00
Daniel Hensby
6eebf07a8e
Merge branch '3.1' into 3.2
2016-11-03 13:20:11 +00:00
Daniel Hensby
c914dde7d1
Update travis build to use target branch as core release
2016-11-03 13:17:41 +00:00
Damian Mooyman
857caa8fff
Merge pull request #6274 from SpiritLevel/PDO-as-default-in-webinstaller
...
Setting default db adapter in installation as PDO MySQL
2016-11-03 17:42:20 +13:00
Damian Mooyman
91f51a6783
Merge branch '3.4' into pulls/3.4/versioned-phpdoc
2016-11-03 17:41:02 +13:00
Damian Mooyman
182c9fb70f
Merge pull request #6282 from sminnee/fix-32
...
FIX: Ensure that builds use the 3.2 dependencies.
2016-11-03 17:40:30 +13:00
