Daniel Hensby
b68f5acd46
Merge pull request #5541 from silverstripe/revert-5480-subsites-breaks-tests
...
Revert "Disable subsite filters when running unit tests"
2016-05-16 09:44:29 +01:00
Damian Mooyman
b6e73689a5
Revert "Disable subsite filters when running unit tests"
2016-05-16 17:07:09 +12:00
Daniel Hensby
ca4341f480
Merge pull request #5460 from scott1702/btn-loading-icon
...
Fix loading icon bug on IE
2016-05-14 11:10:36 +01:00
Scott Hutchinson
9ba362065e
Fix loading icon bug on IE
2016-05-14 14:09:50 +12:00
Daniel Hensby
0594542e7f
Merge branch '3'
2016-05-12 16:42:48 +01:00
Daniel Hensby
19a4a40d8b
Merge branch '3.3' into 3
2016-05-12 16:25:22 +01:00
Daniel Hensby
264d7e8ffe
Merge branch '3.2' into 3.3
2016-05-12 16:23:57 +01:00
Daniel Hensby
e8962b95d0
Merge branch '3.1' into 3.2
2016-05-12 16:05:54 +01:00
Loz Calver
be496c4e54
Merge pull request #5530 from dhensby/pulls/empty-from-clause
...
FIX Empty from clause when joining to same base table
2016-05-12 15:56:57 +01:00
Daniel Hensby
3738d888e0
FIX Empty FROM clause
2016-05-12 12:38:05 +01:00
Loz Calver
5b275376d3
Many many bug
2016-05-12 12:38:04 +01:00
Daniel Hensby
dd554d883f
Proving bug with Deep nested many_many relations
...
When adding a filter to a many_many with a shared inheritance, the FROM table is removed and added as a LEFT JOIN which causes a syntax error.
This means `$dataList->filter('ManyManyRel.ID', array(1,2))` doesn't work.
2016-05-12 12:38:02 +01:00
Daniel Hensby
5301e73c86
Merge pull request #5525 from tractorcow/pulls/3/enable-requirements-flush-disable
...
API Enable combined requirements to persist between flushes
2016-05-12 12:28:47 +01:00
Damian Mooyman
2d07f9b24c
Add current 4.0.0 changelog to alpha 1 release notes.
2016-05-12 16:07:35 +12:00
Damian Mooyman
b9a32386c9
Added 4.0.0-alpha1 changelog
2016-05-12 16:00:20 +12:00
Damian Mooyman
19daf8f974
Update translations
2016-05-12 15:37:09 +12:00
Damian Mooyman
b620ac21ba
Merge pull request #5526 from open-sausages/pulls/4.0/fix-loading-indication-in-campaign-admin
...
FIX Persistant Loading... indicator when no campaigns yet in admin
2016-05-12 13:56:15 +12:00
Hamish Friedlander
a61d0a2f0b
FIX Persistant Loading... indicator when no campaigns yet in admin
2016-05-12 13:32:38 +12:00
Damian Mooyman
7041c5945c
API Enable requirements to persist between flushes
2016-05-12 12:46:30 +12:00
Ingo Schommer
0838770798
Consistent React event method naming
...
Use "on<event>" for props, same as React's own event naming: https://facebook.github.io/react/docs/forms.html#interactive-props
Use "handle<event>" to delineate internal handlers
2016-05-11 18:08:23 +12:00
Damian Mooyman
8c3b416b78
Merge pull request #5512 from open-sausages/pulls/4.0/minor-styles-adjustments-4
...
Reorder Campaigns, vert centre only child breadcrumb
2016-05-11 18:04:07 +12:00
Paul Clarke
c1204bc614
build js/css
2016-05-11 16:33:11 +12:00
Paul Clarke
746c4f7548
Vertically centre title only in breadcrumb
...
Fixes #5508
2016-05-11 16:32:49 +12:00
Paul Clarke
25fead8afc
Reorder Campaigns in lefthand menu
2016-05-11 16:31:02 +12:00
Ingo Schommer
a736d9e08b
Merge pull request #5510 from open-sausages/pulls/4.0/5495-security-header-fix
...
Markup and styles for back button outside of new toolbar
2016-05-11 16:07:17 +12:00
Ingo Schommer
c3a121a64d
Merge pull request #5507 from open-sausages/pulls/4.0/gridfield-search-fix
...
Changed search text to white, linked missing image
2016-05-11 16:05:04 +12:00
Damian Mooyman
664ebdde05
Merge remote-tracking branch 'origin/3'
2016-05-11 15:39:38 +12:00
Damian Mooyman
06f0f558d4
Merge remote-tracking branch 'origin/3.3' into 3
2016-05-11 15:38:40 +12:00
Damian Mooyman
5f82e40fd4
Remove stale commits from release notes
2016-05-11 15:37:31 +12:00
Damian Mooyman
d3f5c85403
Merge remote-tracking branch 'origin/3.2' into 3.3
2016-05-11 15:36:40 +12:00
Damian Mooyman
79602dc44d
Remove stale commits from release notes
2016-05-11 15:34:32 +12:00
Damian Mooyman
f13e44a265
Merge 3 into master
...
# Conflicts:
# admin/javascript/LeftAndMain.Tree.js
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/en.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/en.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# css/GridField.css
# forms/gridfield/GridFieldExportButton.php
# javascript/GridField.js
# javascript/lang/ar.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/en.js
# javascript/lang/en_GB.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/id.js
# javascript/lang/id_ID.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr@latin.js
# javascript/lang/sr_RS.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fi.js
# javascript/lang/src/fr.js
# javascript/lang/src/id.js
# javascript/lang/src/id_ID.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr@latin.js
# javascript/lang/src/sr_RS.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# scss/GridField.scss
# tests/model/ManyManyListTest.php
# tests/model/SQLQueryTest.php
2016-05-11 15:19:35 +12:00
Paul Clarke
7093224db3
Markup and styles for back button outside of new toolbar
...
Adjust height of north bar to match rest of CMS plus minor positioning
fixes.
2016-05-11 14:39:47 +12:00
Damian Mooyman
4f06a43986
Merge 3.3 into 3
...
# Conflicts:
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/en.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# javascript/lang/fr.js
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fi.js
# javascript/lang/src/fr.js
# javascript/lang/src/id.js
# javascript/lang/src/id_ID.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr@latin.js
# javascript/lang/src/sr_RS.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
# lang/it.yml
2016-05-11 14:06:23 +12:00
Damian Mooyman
b165d52f30
Merge 3.2 into 3.3
2016-05-11 14:00:10 +12:00
Damian Mooyman
9da594b326
Merge 3.1 into 3.2
...
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/ar.js
# javascript/lang/bg.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fa_IR.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/id.js
# javascript/lang/id_ID.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr@latin.js
# javascript/lang/sr_RS.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# lang/nl.yml
# lang/sk.yml
2016-05-11 13:48:22 +12:00
Damian Mooyman
7693fc9504
Merge upgrading notes from 3.1.19
2016-05-11 13:42:41 +12:00
Damian Mooyman
18fcd68acf
Merge up changes from 3.1.19 changelog
2016-05-11 13:41:02 +12:00
Damian Mooyman
01eaf9ed64
Merge 3.3.2 into 3.3
2016-05-11 13:33:45 +12:00
Damian Mooyman
0fa9ba5d64
Merge 3.2.4 into 3.2
2016-05-11 13:29:51 +12:00
Damian Mooyman
b612c0549d
Merge 3.1.19 into 3.1
2016-05-11 13:15:10 +12:00
Paul Clarke
8bdaa97b47
Changed search text to white, linked missing image
2016-05-11 11:29:59 +12:00
Damian Mooyman
de5949b3dd
Added 3.3.2 changelog
2016-05-11 11:25:17 +12:00
Damian Mooyman
cfb3d96a03
Added 3.2.4 changelog
2016-05-11 11:24:49 +12:00
Damian Mooyman
68dca6f6c0
Added 3.1.19 changelog
2016-05-11 11:09:20 +12:00
Hamish Friedlander
0cb6f84958
Merge pull request #5502 from open-sausages/pulls/4.0/minor-styles-adjustments-3
...
Minor styles adjustments 3
2016-05-11 11:06:54 +12:00
Damian Mooyman
f4c2a89d5a
Update translations
2016-05-11 11:05:57 +12:00
Damian Mooyman
c27cb2dae7
Update translations
2016-05-11 11:05:37 +12:00
Damian Mooyman
60644a5be8
Update translations
2016-05-11 10:58:25 +12:00
Ingo Schommer
99e2ecc89d
Merge pull request #5505 from g4b0/italian-datepicker
...
Added italian localization to jqueryui datepicker
2016-05-11 08:52:39 +12:00
