Commit Graph

16023 Commits

Author SHA1 Message Date
Hamish Friedlander
1b8b869754 Merge pull request #5350 from open-sausages/pulls/4.0/fix-chosen-behat-use
Fix Chosen.js selector for Behat feature
2016-04-20 14:22:22 +12:00
Ingo Schommer
8cf38720b5 Fix Chosen.js selector for Behat feature
The recent upgrade to Chosen.js 1.5 changes the generated markup:
It still renders an <a> tag, but without the "href" attribute.
This attribute isn't actually required to uniquely identify
the link in this structure.
2016-04-20 13:52:51 +12:00
Ingo Schommer
8215a9421e Merge pull request #5343 from IgorNadj/patch-4
minor: fix docs broken link
2016-04-19 23:24:17 +12:00
Igor
ec5464a6dc minor docs broken link 2016-04-19 22:21:26 +12:00
Ingo Schommer
ac88bf57b1 Merge pull request #5339 from IgorNadj/patch-3
Update CONTRIBUTING.md
2016-04-19 21:58:56 +12:00
Igor
654c133913 Update CONTRIBUTING.md
minor grammar
2016-04-19 21:29:18 +12:00
Devlin
93da45f699 Prevent Upload from showing default controller template (fixes #4613) (#4615) 2016-04-19 19:10:57 +12:00
Daniel Hensby
4240785fc7 Check whether run from cli or from web request within cli-script.php (#3984)
* ENHANCEMENT - Improved access determination
* ENHANCEMENT - Added an additional check for the existence of the mod_rewrite module
2016-04-19 18:54:11 +12:00
Ingo Schommer
2d119f021d Merge pull request #5338 from open-sausages/pulls/4.0/bug-btn-toolbar
Fixes a spacing issue for grouped buttons within btn-toolbar
2016-04-19 18:39:02 +12:00
Damian Mooyman
0bd62735bc BUG Fix issue with Requirements mangling custom scripts (#5337)
API Remove deprecated $template parameter from Requirements::includeInHTML
2016-04-19 17:20:30 +12:00
Paul Clarke
d9519983f8 build js 2016-04-19 15:07:06 +12:00
Paul Clarke
4d9e38c62b toolbar improvements 2016-04-19 15:01:38 +12:00
Paul Clarke
47ca889567 bugfix for Add campaign button spacing 2016-04-19 14:22:50 +12:00
Ingo Schommer
6ccfbb7c52 Fixed breadcrumbs test 2016-04-19 13:40:57 +12:00
Ingo Schommer
7c126a80b6 Whitespaces fixes in _variables.scss
No point aligning the values when they're all over the show
from commenting and mixed indentation
2016-04-19 13:40:57 +12:00
Ingo Schommer
fb46e65681 Merge pull request #5321 from open-sausages/features/OSS-1749-grid-field
Converted grid-field to table markup and SCSS to BEM
2016-04-19 13:19:38 +12:00
Ingo Schommer
e939452129 Update build artifacts 2016-04-19 12:15:14 +12:00
Paul Clarke
7f59a7e6f7 Converted grid-field to table markup and SCSS to BEM
Also added tab index
2016-04-19 12:15:09 +12:00
Ingo Schommer
ccb4041326 Merge pull request #5292 from open-sausages/features/cms-panel-and-layout
Panel and layout adjustments, swapped cms typography styles for bootstrap typography
2016-04-19 11:16:18 +12:00
Ingo Schommer
ca77dd2657 Updated build artifacts 2016-04-19 11:13:57 +12:00
Paul Clarke
cc897d0f85 fix for add page steps and 1px out in southbar 2016-04-19 11:13:56 +12:00
Paul Clarke
82207f82be Added panel close btn 2016-04-19 11:13:56 +12:00
Paul Clarke
e0fe90b3c8 General CMS typography swap to bootstrap
Start of using bootstrap variables and typography styles, remove old
cms reset in favour of bootstrap reboot
2016-04-19 11:13:53 +12:00
Paul Clarke
74454a7557 CMS layout changes
Panel adjustments to south and site tree collapsed so that everything
aligns.

Start of bootstrap tab styles

Fix for pages batch action alignment issue
2016-04-19 11:13:53 +12:00
Paul Clarke
6a53fe0fb7 small improvement to success button 2016-04-19 11:13:53 +12:00
Ingo Schommer
4a100fdc3c Editorconfig for CSS (#5336) 2016-04-19 11:00:53 +12:00
Ingo Schommer
bf37899045 Removed IE CSS files
Leftover from https://github.com/silverstripe/silverstripe-framework/pull/5293
2016-04-19 09:16:21 +12:00
Ingo Schommer
e83a7c7de5 Merge pull request #5317 from open-sausages/pulls/4.0/campaign-admin-css-updates
CSS updates to Campaign Admin
2016-04-18 23:49:47 +12:00
Ingo Schommer
b2516ae7d0 Updated build artifacts 2016-04-18 23:45:24 +12:00
Ingo Schommer
75b2c7c360 BEM notation corrections, use Bootstrap vars
See comments on https://github.com/silverstripe/silverstripe-framework/pull/5317
2016-04-18 23:45:14 +12:00
Ingo Schommer
3c8960d88b Simplified breadcrumb component
The "multiline" variation was the only one actually used at the moment.
If we need a "singleline" one, we could make a "condensed" variation instead
2016-04-18 23:35:55 +12:00
Paul Clarke
40c98c6047 CSS updates to Campaign Admin
refactored breadcrumbs to use bootstrap
fix border lines on table
Layout variables updated for spacing, added toolbar heights
Added as part of campaigns as this area needs to use these variables.
Added action toolbar for content, swapped values to variables
toolbar action spacing
Adjustments of breadcrumb variable
Move accordion styles to its own component
Campaign items, styles for linked items and state badges
Small update to class name
Class name updates, convert values into variables
2016-04-18 23:35:31 +12:00
Damian Mooyman
2e90035771 API Campaign publish button 2016-04-18 14:47:04 +12:00
Damian Mooyman
68ffa40c69 Use configured SecurityToken 2016-04-18 14:03:53 +12:00
Ingo Schommer
c967e62e97 Updated build artifacts 2016-04-18 14:03:53 +12:00
Ingo Schommer
90e352ca7d Fix "urlencoded" HTTP header notation
Misspelling caused data to be sent as binary (browser default?)
rather than urlencoded, meaning it doesn't show up in $_POST.
2016-04-18 13:59:18 +12:00
Ingo Schommer
28e81db545 Require silverstripe-backend to avoid double include 2016-04-18 13:59:18 +12:00
Ingo Schommer
e840ba805e Use SecurityID in destructive campaign actions
Using POST rather than PUT because SecurityToken->checkRequest()
doesn't accept PUT data (it's only in the request body, not
in $_POST and HTTPRequest->requestVars()).
2016-04-18 13:59:18 +12:00
Ingo Schommer
572d8427e0 Implement defaultData on silverstripe-backend 2016-04-18 13:59:18 +12:00
David Craig
ef6a1f33ee Minor updates and fixes for campaign admin front-end
- Updated FormActionComponent prop from 'style' to 'bootstrapButtonStyle because 'style' is a built in React prop.

- Linted and added missing propTypes to campaign admin List component.

- Added missing initial state key to campaign reducer.

- Forced REST verb to lowercase in silverstripe-backend to make comparisions more robust.
2016-04-18 13:59:18 +12:00
Paul Clarke
d51e94c035 Added icons to publish and revert buttons 2016-04-18 13:59:18 +12:00
Ingo Schommer
8554b43ccc Correct campaign badges, "revert" placeholder button 2016-04-18 13:59:18 +12:00
Ingo Schommer
37d3d22fbd Publish loading indicator 2016-04-18 13:59:18 +12:00
Ingo Schommer
aefc1a5c01 Use keyed redux record store
It's the recommended approach in Redux docs, and more performant (key-based).
It'll also simplify a move to Immutable.js later on.

The PHP APIs still return unkeyed data, which is standard REST API behaviour,
but for Redux state we transform it to be keyed.
2016-04-18 13:59:18 +12:00
Ingo Schommer
f7237a9936 Fix <FormAction> external and prop definition
click handler shouldn't be required
2016-04-18 13:59:18 +12:00
Ingo Schommer
107e38b7a7 Campaign publish feature 2016-04-18 13:59:18 +12:00
Hamish Friedlander
3820314a11 Merge pull request #5330 from open-sausages/pulls/4.0/add-babel-polyfill
Add babel-polyfill for better ES6 support
2016-04-18 13:57:04 +12:00
Ingo Schommer
067c64e07c Add babel-polyfill for better ES6 support
See http://babeljs.io/docs/usage/polyfill/
2016-04-18 12:08:35 +12:00
Sam Minnée
e266037720 Merge pull request #5327 from tdf/pull_lang_korean
no one writes as "한국어(韓國語)"  when referring to korean language
2016-04-18 11:37:29 +12:00
Christian Lohmaier
1370c0788b no one writes as "한국어(韓國語)" when referring to korean language
so remove the chinese characters – "한국어(韓國語)" looks like
"English(anglicus)". Korean youth probably don't even know the meaning
of the chinese.
2016-04-17 14:42:27 +02:00