Commit Graph

16714 Commits

Author SHA1 Message Date
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
Paul Clarke
100deada75 Updated markup on Campaign edit and add screen to use newer patterns.
Moved role=group up a level as it broke layout.
2016-05-10 16:33:21 +12:00
Paul Clarke
75faa0de9f Reduce spacing between buttons, fix for large icons 2016-05-10 16:27:26 +12:00
Paul Clarke
d8a13233e6 Removed menu line-height overrides
Now that bootstrap is in line-height isn’t needed here
2016-05-10 16:27:26 +12:00
Paul Clarke
e16d3ec963 Added space to top of assetAdmin sort 2016-05-10 16:27:26 +12:00
Paul Clarke
26b84ab488 Update spacing to be consistent throughout
Uses bootstrap $gutters rather than $spacer even though they are based
of the same value.
Improves alignment of a few things but mostly unnoticeable.
2016-05-10 16:27:26 +12:00
Ingo Schommer
2b1c01bbc0 Merge pull request #5474 from open-sausages/pulls/4.0/campaigns-breadcrumbs
API Implement breadcrumbs via controllable state
2016-05-10 16:03:39 +12:00
Craig Weber
e732aee6eb Fixes #3182 Fixes lazy loading of fields when query was created in default stage
When a DataObject query is created in the default stage (stage.Stage), then the
stage is changed to something else (stage.Live), the query itself runs
correctly against stage.Stage. However, lazy loaded fields incorrectly run
against stage.Live. This is due to DataQuery parameters not being saved when
the default stage is active.

This commit fixes this bug by always saving query params, even when the default
stage was active at the time of query creation.
2016-05-10 15:44:22 +12:00
Damian Mooyman
9588f0c999 Remove redux from breadcrumbs and fix breadcrumbs lazy loading 2016-05-10 15:34:54 +12:00
Ingo Schommer
c9e7d4fb81 Unnest breadcrumbs 2016-05-10 13:34:45 +12:00
Damian Mooyman
3edbfd944e API Implement breadcrumbs via controllable state 2016-05-10 13:34:34 +12:00
Damian Mooyman
3074dd7d00 Merge pull request #5489 from open-sausages/pulls/4.0/extra-classes-on-holder
Use props.extraClass on TextField holder
2016-05-10 11:32:32 +12:00
Ingo Schommer
d9f0914e4f Use props.extraClass on TextField holder
This should be separated out to a common FormField class,
but for now we're only using TextField. Can be solved
properly at the same time as switching form fields to
react-bootstrap.

Required for readonly field value alignment in the "campaigns" edit form.
2016-05-10 10:45:12 +12:00
Daniel Hensby
1fcf3a1315 Merge pull request #5485 from open-sausages/pulls/4.0/grid-field-tmp-loading-indicator
Simple GridField ReactJS loading indication
2016-05-09 16:21:44 +01:00
Daniel Hensby
a02374df02 Merge pull request #5486 from open-sausages/pulls/4.0/5484-prevent-double-save
Load form data back into obj after save() (fixes #5484)
2016-05-09 16:21:01 +01:00