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 |
|
Loz Calver
|
dc331347a0
|
Merge pull request #5506 from dhensby/pulls/3.1/fix-manymanylisttest
Allow ManyManyListTest to run standalone
|
2016-05-10 16:21:04 +01:00 |
|
Daniel Hensby
|
971d561633
|
Allow ManyManyListTest to run standalone
|
2016-05-10 15:24:07 +01:00 |
|
Daniel Hensby
|
c97d3961e5
|
Merge pull request #4869 from kinglozzer/2617-include-scopes
FIX: Parameters passed to includes overwrite all scopes (fixes #2617)
|
2016-05-10 15:21:45 +01:00 |
|
g4b0
|
b506e09ab2
|
Added italian localization to jqueryui datepicker
|
2016-05-10 15:04:28 +02:00 |
|
Daniel Hensby
|
d5ff8ff5f3
|
Merge pull request #5499 from kinglozzer/sqlselect-count-int
FIX: SQLSelect count methods now cast to int (fixes #5498)
|
2016-05-10 13:44:30 +01:00 |
|
Daniel Hensby
|
63e363b55c
|
Merge pull request #5461 from Firesphere/master
RFC #5347 remove RestfulService from SS4.
|
2016-05-10 12:51:01 +01:00 |
|
Loz Calver
|
d1df67d308
|
FIX: SQLSelect count methods now cast to int (fixes #5498)
|
2016-05-10 12:31:45 +01:00 |
|
Paul Clarke
|
1f4bdb2d8f
|
Remove the small space above menu to align with content area
|
2016-05-10 22:22:49 +12:00 |
|
Paul Clarke
|
79d1a0542d
|
Spacing above forms and of labels and middle column within forms
|
2016-05-10 22:20:00 +12:00 |
|
Paul Clarke
|
f64de9b667
|
Move accordion item up slightly
|
2016-05-10 22:20:00 +12:00 |
|
Paul Clarke
|
25f118657e
|
Slight adjustment to make sure icons don't effect text
|
2016-05-10 22:20:00 +12:00 |
|
Paul Clarke
|
f0d6f6b04e
|
Remove verdana (ui-widget) overrides
|
2016-05-10 22:19:31 +12:00 |
|
Paul Clarke
|
e0a7c4fb47
|
Move the back arrow back slightly for visual alignment
|
2016-05-10 22:19:31 +12:00 |
|
Ingo Schommer
|
f843c88e48
|
Merge pull request #5494 from soyarsauce/update-environment-types-docs
Update typo in environment types documentation
|
2016-05-10 20:35:25 +12:00 |
|
Loz Calver
|
6430c66303
|
Merge pull request #5426 from tractorcow/pulls/3.3/fix-gridfield-autocomplete
BUG Fix GridFieldAddExistingAutocompleter
|
2016-05-10 09:34:59 +01:00 |
|
Loz Calver
|
196c211984
|
Merge pull request #5425 from tractorcow/pulls/4.0/error-invalid-relationships
API Filtering on invalid relation is no longer a silent error
|
2016-05-10 09:27:31 +01:00 |
|
Loz Calver
|
a596bd4d6a
|
Merge pull request #5447 from tractorcow/pull/3183-lazy-loading-stage
Fixes #3182 Fixes lazy loading of fields when query was created in default stage
|
2016-05-10 09:02:37 +01:00 |
|
Hamish Friedlander
|
1e703005cd
|
Merge pull request #5491 from open-sausages/pulls/4.0/empty-campaign-layout
API Add empty campaign layout
|
2016-05-10 19:00:58 +12:00 |
|
Simon Erkelens
|
c0de5dd11e
|
RFC #5347 remove RestfulService from SS4. Rebuild OEmbed on using curl
|
2016-05-10 18:55:08 +12:00 |
|
Damian Mooyman
|
7f03b88e5e
|
API Add empty campaign layout
|
2016-05-10 17:34:32 +12:00 |
|
Wing Ho
|
1e408a13b5
|
Update typo in environment types documentation
|
2016-05-10 14:52:49 +10:00 |
|
Ingo Schommer
|
f8e609eed6
|
Merge pull request #5492 from open-sausages/pulls/4.0/minor-styles-adjustments
Minor styles and layout adjustments
|
2016-05-10 16:48:18 +12:00 |
|
Paul Clarke
|
0321d0868e
|
Added btn--icon-xl for use within assetAdmin
|
2016-05-10 16:34:13 +12:00 |
|