Damian Mooyman
4b7d31377b
PSR2: Automatic fixes
2016-11-29 12:33:28 +13:00
Damian Mooyman
1b1e921e3d
PSR2: Whitespace-only changes
2016-11-29 12:31:16 +13:00
Daniel Hensby
1be2e70a2a
Merge branch '3'
2016-11-24 14:18:09 +00:00
Daniel Hensby
1529c84212
Merge branch '3.5' into 3
2016-11-23 23:56:14 +00:00
Daniel Hensby
602062802e
Merge branch '3.4' into 3.5
2016-11-23 23:55:31 +00:00
Daniel Hensby
406307c77b
Merge branch '3.3' into 3.4
2016-11-23 23:29:25 +00:00
Daniel Hensby
b7bb7a46da
Merge branch '3.2' into 3.3
2016-11-23 22:26:15 +00:00
Daniel Hensby
17eb351f81
Merge branch '3.1' into 3.2
2016-11-23 21:54:22 +00:00
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
730512f036
Merge pull request #6328 from dhensby/pulls/3.1/test-i18n-fix
...
FIX Tests shouldnt set date or time format to null
2016-11-24 10:01:42 +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
Damian Mooyman
396a47f824
Merge pull request #6330 from silverstripe/bugfix-framework-core-manifest-manifest-cache-ds
...
Replace hard-coded directory separators constant
2016-11-24 09:20:43 +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
Christopher Pitt
a4167e29fe
Replace hard-coded directory separators constant
...
This removes warnings when building the manifest cache in Windows environments.
2016-11-24 08:00:34 +13:00
Daniel Hensby
03b4e6ea32
FIX Tests shouldnt set date or time format to null
2016-11-23 12:36:53 +00: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
Damian Mooyman
c2287c14ff
Merge pull request #6216 from jonom/fix-version-sql
...
FIX Versioned sort by ID
2016-11-17 15:47:44 +13:00
Jonathon Menz
bec5adf09b
FIX Versioned sort by ID
...
Prevent SQL error from a Versioned DataObject with e.g. $default_sort = 'ID DESC'
2016-11-16 12:16:33 -08:00
Damian Mooyman
8a0383e5a9
Merge pull request #6312 from dhensby/pulls/3.4/httpresponse-phpdoc
...
DOCS Update PHPDoc for SS_HTTPResponse
2016-11-15 13:36:13 +13:00
Daniel Hensby
6136cf8502
DOCS Update PHPDoc for SS_HTTPResponse
2016-11-14 19:02:56 +00:00
Damian Mooyman
ef00f430af
Increment 3 alias to 3.6
2016-11-14 10:07:34 +13:00
Dan Hensby
fcd3d2478c
Added 3.5.0-rc2 changelog
2016-11-10 14:30:07 +00:00
Daniel Hensby
17108ff50c
Merge branch '3.4' into 3.5.0
2016-11-10 14:23:38 +00:00
Daniel Hensby
f311ef4ca5
Merge pull request #6309 from Zauberfisch/modeladmin-showImportForm-2
...
Added $showSearchForm to ModelAdmin
2016-11-10 14:22:49 +00:00
zauberfisch
6697327a98
Added $showSearchForm to ModelAdmin
2016-11-10 13:50:44 +00:00
Daniel Hensby
bcc21c2403
Merge branch '3'
2016-11-10 01:09:35 +00:00
Daniel Hensby
d15d80ea2c
Merge pull request #6307 from open-sausages/pulls/3.4/fix-aggregrate-error
...
BUG Fix regression in aggregate column lookup from #6199
2016-11-09 22:44:23 +00:00
Damian Mooyman
ebae480c66
BUG Fix regression in aggregate column lookup from #6199
2016-11-10 11:13:02 +13:00
Daniel Hensby
5a7cde0e10
Merge branch '3.4' into 3.5.0
2016-11-09 16:14:40 +00:00
Daniel Hensby
d2f6ff4873
Merge pull request #6304 from kinglozzer/member-currentuser
...
FIX: Correct return type for Member::currentUser()
2016-11-09 15:59:44 +00:00
Loz Calver
6bf36fbd30
FIX: Correct return type for Member::currentUser()
2016-11-09 14:20:44 +00:00
Dan Hensby
e1c092e73a
Added 3.5.0-rc1 changelog
2016-11-09 11:45:29 +00:00
Dan Hensby
662bc688e5
Update translations
2016-11-09 11:32:20 +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
