16046 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Craig	25f1f992a9	Made FormBuilder.mergeFieldData do deep merge	2016-04-26 15:32:09 +12:00
David Craig	7e7946e50a	Fixed case sensitive naming regressions	2016-04-26 15:32:09 +12:00
Ingo Schommer	c94802ea15	i18n for campaigns section	2016-04-26 15:32:09 +12:00
Ingo Schommer	a615dae3ac	Enforce permissions in campaigns section	2016-04-26 15:32:09 +12:00
David Craig	312bab8a6f	Add back button to Campaign creation view	2016-04-26 15:32:09 +12:00
David Craig	35ad44b8c8	Refactor GridFieldComponent render method ... - Splits render out into logical methods - Fixes missing key props issue for table header palceholder	2016-04-26 15:32:09 +12:00
David Craig	2f7a7c3a5c	Fix GridFieldComponent not rendering all records	2016-04-26 15:32:09 +12:00
Damian Mooyman	b2e8fd96ec	BUG Fix form schema to use correct ID values ... API Implement creation of new changesets endpoint	2016-04-26 15:32:08 +12:00
David Craig	2b8ef99d5e	Add 'Cancel' button to Campaign creation form	2016-04-26 15:32:08 +12:00
David Craig	5cc6171f77	Apply default action props in FormBuilder ... Perviously consumers had to props to FormBuilder for styling common actions like 'save'. The props are now automatically passed to FormActions by the FormBuilder. Consumers can override these defaults via the 'createFn' prop.	2016-04-26 15:32:08 +12:00
David Craig	ae285f3286	Adds route for creating new Campaigns	2016-04-26 15:32:08 +12:00
Ingo Schommer	48d01343c3	Adapt to new naming convention	2016-04-26 15:32:08 +12:00
David Craig	a15a392bd3	Styling updates for the Campaign edit form	2016-04-26 15:32:08 +12:00
David Craig	1ad6730b9e	Add form component styling	2016-04-26 15:32:08 +12:00
David Craig	58036cd156	Add back button to NorthHeader component	2016-04-26 15:32:08 +12:00
David Craig	a8056aedff	Add response handling when editing a Campaign	2016-04-26 15:32:08 +12:00
Damian Mooyman	e2afcd0acb	API Implement back end for saving forms via react	2016-04-26 15:32:08 +12:00
David Craig	ddfe660f0a	Fix variable references when debugging	2016-04-26 15:32:07 +12:00
David Craig	7fcdf35438	Add DetailEditForm to Campaign admin ... - Add edit form to campaigns section - Handle form submissions with FormBuilder - Handle form state via Redux - Garbage collect form state - Removes $itemID as a required param for schema requests. Developers should be able to scaffold forms without populating values from an existing record. For example when building a form for creating new records.	2016-04-26 15:32:07 +12:00
Damian Mooyman	e01846d418	Merge pull request #5368 from open-sausages/pulls/4.0/add-to-campaign ... Add AddToCampaign dialog box functionality	2016-04-26 15:30:05 +12:00
Paul	3ce1f48202	Updated CSS coding conventions (#5389) ... Co-authored by @chillu	2016-04-26 14:21:08 +12:00
Ingo Schommer	e3e503fda1	Merge pull request #5390 from open-sausages/pulls/4.0/update-routing-docs ... Update docs to include new client-side routing	2016-04-26 14:19:06 +12:00
David Craig	95565d91ab	Update docs to include new client-side routing	2016-04-26 13:46:30 +12:00
scott1702	97e672721d	Add AddToCampaign dialog box functionality	2016-04-26 13:33:06 +12:00
Damian Mooyman	9a0b4b5653	Merge pull request #5386 from open-sausages/pulls/4.0/js-conventions ... Documented JS coding conventions	2016-04-26 13:13:29 +12:00
Daniel Hensby	b67b2638a1	Merge pull request #5387 from open-sausages/pulls/4.0/fix-root-folder-404 ... API Change in behaviour to flysystem reporting for root folders	2016-04-26 00:10:36 +01:00
Damian Mooyman	daf5385833	API Change in behaviour to flysystem reporting for root folders ... See 847841974f	2016-04-26 09:36:08 +12:00
Ingo Schommer	525e3d058d	Remove src/ from .gitattributes, it's needed for the build ... We're running "composer install --prefer-dist" in travis, and the ES6 classes in src/ are relied upon by other modules.	2016-04-26 08:51:48 +12:00
Ingo Schommer	c75a8d35e0	Merge pull request #5379 from open-sausages/pulls/4.0/fix-ie-routing ... BUG Fix baseurl in IE missing leading /	2016-04-25 22:33:06 +12:00
Damian Mooyman	9a4b93a058	BUG Fix baseurl in IE missing leading / ... Reformat LeftAndMain.js to new indentation standard	2016-04-25 22:31:11 +12:00
Ingo Schommer	2d1f948a36	Documented JS coding conventions ... See https://github.com/silverstripe/silverstripe-framework/pull/5108	2016-04-25 21:55:33 +12:00
Ingo Schommer	47e2ac9885	Merge pull request #5372 from open-sausages/pulls/4.0/OSS-1750-js-file-rename ... Rename JS files to comply with AirBnB conventions	2016-04-25 15:56:58 +12:00
Ingo Schommer	21db18e7ef	Correct naming for JS and CSS files in client/ ... Removed some dist/js/*.js files since they're no longer built as individual files. This was a side effect of them living in the toplevel folder of admin/client/src/, which used to have all the legacy/*.js files in there (they do need to be built). Following AirBnB convention: https://github.com/airbnb/javascript#naming--filename-matches-export While it technically allows index.js files, we found them to be bad for dev and debugging in practice: Depending on the used IDE, editor tabs all look the same. Other views like Chrome Dev Tools with sourcemaps rely on path context, and are harder to auto-complete. There's no direct rules for CSS files, but same principles apply here. Also renamed the sections/ folder to containers/, which more clearly communicates the distinction between components/ (shouldn't contain state-dependant, smart components). Renamed state/ files to follow AirBnB naming conventions https://github.com/airbnb/javascript#naming--filename-matches-export https://github.com/airbnb/javascript#naming--camelCase-default-export https://github.com/airbnb/javascript#naming--PascalCase-singleton Leaving the folder name in state/<state-key> lowercase since that's also the key to reducers in the actual state object. References: http://engineering.kapost.com/2016/01/organizing-large-react-applications/ https://github.com/erikras/react-redux-universal-hot-example/tree/master/src https://github.com/RickWong/react-isomorphic-starterkit/tree/master/src https://github.com/react-toolbox/react-toolbox/issues/98 https://github.com/react-bootstrap/react-bootstrap/tree/master/src	2016-04-25 15:43:19 +12:00
Ingo Schommer	c66a45c8b8	Fixed GridField JS test warnings	2016-04-25 14:58:26 +12:00
Hamish Friedlander	84193b00fd	Merge pull request #5377 from open-sausages/pulls/4.0/api-exempt-validation ... API Allow actions to declare they are exempt from validation themselves	2016-04-22 15:50:33 +12:00
Damian Mooyman	098f199d67	Merge pull request #5366 from open-sausages/pulls/4.0/fix-asset-admin-icon ... Fix AssetAdmin icon reference	2016-04-22 15:50:14 +12:00
Damian Mooyman	8b239a5011	Docs and tests for exempt validation actions	2016-04-22 14:52:38 +12:00
Hamish Friedlander	241cdfed1b	API Allow actions to declare they are exempt from validation themselves	2016-04-22 14:22:11 +12:00
Damian Mooyman	0ed353a3df	Reformat code	2016-04-22 14:05:55 +12:00
Ingo Schommer	8c63ae3d68	Fix AssetAdmin icon reference ... Needs to use namespaced class name (see LeftAndMain->Menu()). Not replacing the old .icon-assetadmin rule since we want the old and new UI to co-exist for a short while. Ideally we'd move these styles to the asset-admin module, but the whole way of referencing image sprites is outdated anyway - so I'd prefer to merge this quick fix and think about SVG icons for menu entries instead.	2016-04-22 13:57:10 +12:00
Ingo Schommer	dba0247544	Merge pull request #5358 from open-sausages/pulls/4.0/debug-logging ... API redux-logger respects ss environment	2016-04-22 13:21:55 +12:00
Damian Mooyman	e463fcce6e	API redux-logger respects ss environment	2016-04-22 13:20:24 +12:00
Ingo Schommer	9331b4095a	Merge pull request #5373 from open-sausages/pulls/4.0/fix-routing-reredux ... BUG Fix routing tests	2016-04-22 13:15:48 +12:00
Ingo Schommer	12383c16e4	Merge pull request #5371 from open-sausages/pulls/4.0/fix-icon-styles ... Fix regression with font-icon styles	2016-04-22 13:03:46 +12:00
Damian Mooyman	fa8075367d	BUG Fix routing tests ... BUG Fix issue with top level routes without trailing slashes	2016-04-22 11:16:48 +12:00
David Craig	d376944d48	Fix regression with font-icon styles	2016-04-22 10:43:06 +12:00
Ingo Schommer	3ef35778cb	Merge pull request #5362 from open-sausages/pulls/update-font-icons ... Updated icon set with new icons and license, removed two unused stylesheets	2016-04-21 20:46:44 +12:00
Paul Clarke	3a778f23bf	Build and compile	2016-04-21 15:41:30 +12:00
Paul Clarke	01145301fa	Delete unwanted stylesheets and move remainder styles to better location	2016-04-21 15:39:58 +12:00
Paul Clarke	35e062d9f3	Update SilverStripe font icons ... Added new icons Updated license moved location of font styles	2016-04-21 15:39:06 +12:00