Commit Graph

17618 Commits

Author SHA1 Message Date
Paul Clarke
ed4270155b Remove layout.js 2016-10-11 13:45:17 +13:00
Paul Clarke
8dd56efe2e Add flex classes, remove layout classes 2016-10-11 13:45:08 +13:00
Paul Clarke
1b0839a8e8 Remove Layout 2016-10-11 13:45:08 +13:00
Daniel Hensby
5580100ade Merge pull request #6157 from madmatt/patch-2
Make __call() clearer that a method may be non-public
2016-10-07 12:40:48 +01:00
Damian Mooyman
89c88f0f60 Merge pull request #6119 from open-sausages/pulls/4.0/assets-custom-actions
API Update form schema to be more responsive to dynamic form changes
2016-10-07 17:08:58 +13:00
Damian Mooyman
27d35403e8 API Force formschema to be reloaded on form submission
BUG Fix missing action state
2016-10-07 13:26:57 +13:00
Damian Mooyman
dd7d1d26af BUG Prevent missing records crashing ChangeSetItem 2016-10-07 13:25:56 +13:00
Damian Mooyman
92e34b7434 API controller::join_links supports array values 2016-10-07 13:25:56 +13:00
Damian Mooyman
f130ebf9de Restore tab indentation to LeftAndMain.php 2016-10-07 13:24:48 +13:00
Stevie Mayhew
0d173f231c Merge pull request #6160 from SteveAzz/update-documentation
Update yml formating for extra javascript & css
2016-10-07 12:26:29 +13:00
Damian Mooyman
cb24d199b6 API Convert fieldSpec options to bitwise operators (#6161)
Fixes #6159
2016-10-06 23:23:22 +01:00
Damian Mooyman
ef03408a31 Merge pull request #6158 from open-sausages/pulls/4.0/missing-leftmain-icons
Fixed classes that weren't matching icon
2016-10-07 10:52:17 +13:00
Steve Azzopardi
d7530ed22b Update css doc to spaces instead of tabs 2016-10-06 22:01:44 +02:00
Steve Azzopardi
2ec14cefcb Update yml formating for extra javascript & css 2016-10-06 20:03:00 +02:00
Sam Minnée
8a2dddb01d Merge pull request #6114 from open-sausages/pulls/4.0/many-many-through
API Implement many_many through
2016-10-06 11:04:23 +01:00
Christopher Joe
21dc238685 Fixed classes that weren't matching icon 2016-10-06 20:46:30 +13:00
Christopher Joe
8fbfe6b5c5 move admin JS src folder to resolve as root, rather than as modules 2016-10-06 20:43:59 +13:00
Damian Mooyman
11bbed4f76
API Move many methods from DataObject to DataObjectSchema 2016-10-06 19:57:24 +13:00
Damian Mooyman
f0dd9af699 API Support named join alias for many_many through list
Add tests for sorting on joined alias
2016-10-06 17:39:48 +13:00
Damian Mooyman
e7303170c2 API Implement many_many through
API Remove DataObject::validateModelDefinitions, and move to DataObjectSchema
API Remove deprecated 3.0 syntax for addSelect()
API made DataList::createDataObject public
API Move component parsing logic to DataObjectSchema
API Remove support for triangular has_many / belongs_many relationships
2016-10-06 17:39:48 +13:00
Matt Peel
5a2591ec7d Make __call() clearer that a method may be non-public
Resolves #6151
2016-10-06 14:01:38 +13:00
Ingo Schommer
406ff5b183 Merge pull request #6136 from open-sausages/pulls/4.0/add-status-flag
Add status flag to File and Image Edit Form
2016-10-06 11:25:07 +13:00
Damian Mooyman
380d6523c5
API Cleaned up versioned status checks 2016-10-06 10:31:09 +13:00
Christopher Joe
d7ded0fb4a Add status flag to File and Image Edit Form
API extension hook "getIsModifiedOnStage" renamed to "updateIsModifiedOnStage", also moved "getIsDeletedFromStage", "getIsModifiedOnStage" and "getIsAddedToStage" from SiteTree class to Versioned data extension class
2016-10-06 10:30:52 +13:00
Ingo Schommer
60247a9fbd Setting default branch in codecov.yml (#6097)
Was defaulting to 3, presumably because we've added codecov
a while ago without actually using the integration.
2016-10-06 09:02:20 +13:00
Ingo Schommer
70aca0dd47 Merge pull request #6120 from open-sausages/pulls/4.0/field-components
Refactored react FormFields to use react-bootstrap FormControl components
2016-10-05 16:27:28 +13:00
Christopher Joe
e5b86457b4 Added react LookupField component
API MultiSelectField readonly transformation casts to LookupField instead of ReadonlyField
FIX removed jQuery dependency from i18n
2016-10-05 15:32:05 +13:00
Daniel Hensby
420cbadaac Merge pull request #6149 from jonom/sort-fix-2
FIX Revert natural sort
2016-10-04 23:43:10 +01:00
Damian Mooyman
17c6580d3a Merge pull request #6138 from dhensby/pulls/3.4/fix-sessions-on-alternate-base-urls
FIX Absolute alternate_base_url no longer breaks session cookies
2016-10-05 11:26:27 +13:00
Damian Mooyman
82e72d062f BUG prevent form data / validation persisting in state when using form schema 2016-10-05 10:26:32 +13:00
Christopher Joe
30d161625f Fix unmock qs module, Backend-test refactored to not time out on error 2016-10-05 10:25:22 +13:00
Christopher Joe
287809ec3b Refactored react FormFields to use react-bootstrap FormControl components
Addded Checkbox, CheckboxSet and Optionset (radio) fields
Refactored documentation
2016-10-05 10:25:21 +13:00
Jonathon Menz
797be6ac82 FIX Revert natural sort
More backwards compatible and more consistent with ORM sorting (fixes #6124)
2016-10-04 13:56:12 -07:00
Daniel Hensby
6dde5ce571
FIX Absolute alternate_base_url no longer breaks session cookies 2016-10-04 14:21:32 +01:00
Daniel Hensby
111ab5f0af Merge pull request #6137 from lekoala/patch-4
Have a clear error message
2016-10-04 14:13:00 +01:00
Thomas Portelange
3d8db488d4 Have a clear error message
Because it's really annoying not knowing which field causes the error
2016-10-04 12:24:29 +02:00
Loz Calver
f1894b9712 Merge pull request #6132 from jonom/docs-template-global-provider
DOCS Introduce TemplateGlobalProvider
2016-10-04 09:03:52 +01:00
Jonathon Menz
24f8f2715c DOCS Introduce TemplateGlobalProvider 2016-10-03 09:36:47 -07:00
Daniel Hensby
f2ac6e30aa Merge pull request #6131 from kinglozzer/ssviewer-caching-tests
Tests to cover caching repeated template lookups
2016-10-03 17:09:59 +01:00
Loz Calver
cc68d336b1 Tests to cover caching repeated template lookups 2016-10-03 16:01:02 +01:00
Daniel Hensby
45736ef2db
Merge branch '3' 2016-10-03 12:00:20 +01:00
Daniel Hensby
5e9d16646d
Merge branch '3.4' into 3 2016-10-03 10:24:32 +01:00
Damian Mooyman
c72d81222b Merge pull request #6118 from open-sausages/pulls/4.0/add-to-campaign-UI
Add to campaign styles UI enhancements
2016-10-03 12:27:32 +13:00
Damian Mooyman
ebbb0258dd Fix linting issue 2016-10-03 10:58:58 +13:00
Daniel Hensby
f2d3026e93
Merge pull request #3628 from JeremyRoundill/3.1 2016-09-30 17:16:47 +01:00
Stephan van Diepen
95b66d19b2
Added MySQL support for Bigint.
Conflicts:
	model/MySQLDatabase.php
2016-09-30 16:38:25 +01:00
Paul Clarke
3ac0eaaf62 Remove legacy styles 2016-09-30 15:45:12 +13:00
Paul Clarke
b794a40864 Group button icon styles 2016-09-30 15:44:17 +13:00
Paul Clarke
374ef6e0c3 Modal styles 2016-09-30 15:44:17 +13:00
Paul Clarke
5f92e12911 If description field is empty hide it as it has margin 2016-09-30 15:44:17 +13:00