Commit Graph

17148 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Paul Clarke
d6a24f4133 Use bootstrap modal variables 2016-09-30 15:44:17 +13:00
Paul Clarke
3f5d241be4 Add modal specific stylesheet 2016-09-30 15:44:17 +13:00
Paul Clarke
3fdeaea162 Increase the size of select dropdown so they match the size of other fields 2016-09-30 15:44:17 +13:00
Paul Clarke
32383114ce Remove custom add to campaign styles and make them more reusable 2016-09-30 15:44:17 +13:00
Damian Mooyman
7663102ef1 Merge pull request #6122 from open-sausages/pulls/4.0/panel-link-fix
FIX tab link on top panel changes
2016-09-30 15:36:00 +13:00
Christopher Joe
963445e743 FIX tab link on top panel changes even when "cancel to browse" was selected 2016-09-30 14:57:15 +13:00
Anton Smith
ae4108bf00 BUG Content-Disposition header breaks in Firefox (#4087) 2016-09-29 13:25:14 +13:00
jeffreyguo
801574b9b0 Update index.md (#4020)
MINOR: wording correction
2016-09-29 13:21:17 +13:00
Daniel Hensby
a08a854c9c Merge pull request #6100 from thezenmonkey/patch-3
Update jquery.js reference
2016-09-28 14:22:26 +01:00
Richard Rudy
c94eb8adf2 Get jQuery from Google CDN
jquery is no longer included at the original location. Pulling from the CDN to avoid any other issues if another version gets (re)moved
2016-09-28 08:20:15 -04:00
Richard Rudy
b2d07a1fd7 Update jquery.js reference
jquery is no longer included at the path specified. Shoudl be in the admin directory
2016-09-27 09:54:03 -04:00
Damian Mooyman
5a2e2b7ed5 Merge pull request #6089 from open-sausages/pulls/codecoverage
Code coverage via CodeCov.io
2016-09-27 10:23:30 +13:00
Ingo Schommer
0c06c4d389 Fast-finish Travis builds
The PHP7 build includes code coverage, which makes it run a bit longer now.
In general, we shouldn't wait for allowed_failures with build feedback.
Travis seems to run builds (roughly) in order, so allowed_failures
tend to prolong build times, since it only runs a few builds concurrently.

We'll move the PHP7 build out of allowed_failures eventually,
but I think the general concept still applies:
There's little value in waiting around for allowed_failures builds.

See https://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
2016-09-27 09:19:41 +13:00
Ingo Schommer
48e98c3d4f Add uncovered files to code coverage
If the files are never included through the PHP test run,
they won't count as uncovered otherwise.

See https://phpunit.de/manual/current/en/code-coverage-analysis.html#code-coverage-analysis.whitelisting-files
2016-09-27 08:47:01 +13:00
Ingo Schommer
9cb33ea5bf Fixed @covers namespaces 2016-09-27 07:46:17 +13:00
Daniel Hensby
ad79b5c88c
fixing bad folder caseing 2016-09-26 18:06:40 +01:00
Loz Calver
189ac2eed0 Merge pull request #6088 from webbuilders-group/fix-windows-regression
BUGIX: Fix regression causing the admin to crash on windows due to FRAMEWORK_DIR being prefixed by a backslash
2016-09-26 16:00:16 +01:00