Paul Clarke
b87d0a3e3c
removed path to framework in framework variables, added to assetAdmin
2016-05-05 18:26:27 +12:00
Paul Clarke
22f26d10a8
moved assetadmin variables into framework
2016-05-05 17:19:05 +12:00
Damian Mooyman
652e16ce8c
Merge pull request #5428 from open-sausages/pulls/4.0/add-npm-tests
...
Added NPM tests
2016-05-05 15:20:37 +12:00
Daniel Hensby
686db04a0a
Update translations
2016-05-05 02:05:54 +01:00
Daniel Hensby
92599727b9
Merge remote-tracking branch 'security/patch/3.1/ss-2016-006' into 3.1.19
2016-05-05 01:01:49 +01:00
Daniel Hensby
7af7f8dd65
Merge remote-tracking branch 'security/patch/3.1/ss-2016-005' into 3.1.19
2016-05-05 01:01:44 +01:00
Daniel Hensby
e8cfe1cc72
Merge remote-tracking branch 'security/patch/3.1/ss-2016-004' into 3.1.19
2016-05-05 01:01:37 +01:00
Daniel Hensby
09370290dc
Merge remote-tracking branch 'security/patch/3.1/ss-2016-001' into 3.1.19
2016-05-05 01:01:27 +01:00
Daniel Hensby
47c3165aa3
Merge remote-tracking branch 'security/patch/3.1/ss-2015-029' into 3.1.19
2016-05-05 01:01:15 +01:00
David Craig
7ceae58e8a
Mark legacy JavaScript docs as deprecated
2016-05-05 11:29:13 +12:00
Hamish Friedlander
a214ea3f55
Merge pull request #5432 from open-sausages/pulls/4.0/campaign-edit-button
...
API Implement campaign item edit button
2016-05-05 11:24:46 +12:00
Daniel Hensby
b11bbffb7d
Merge branch '3'
2016-05-04 23:36:10 +01:00
Daniel Hensby
457931d664
Merge branch '3.3' into 3
2016-05-04 23:32:10 +01:00
Damian Mooyman
8b1146be9a
API Implement campaign item edit button
2016-05-05 10:24:08 +12:00
Daniel Hensby
32f0a637b4
Merge branch '3.2' into 3.3
2016-05-04 23:17:36 +01:00
Daniel Hensby
0884683c6b
Merge branch '3.1' into 3.2
2016-05-04 23:15:43 +01:00
Loz Calver
f6f3c89dc8
Add SSViewer_Scope constants to make it easier to work with item stacks
2016-05-04 16:50:33 +01:00
Loz Calver
24660afabd
FIX: Parameters passed to includes overwrite all scopes ( fixes #2617 )
2016-05-04 16:49:12 +01:00
Daniel Hensby
9fc4160425
Merge pull request #5348 from tractorcow/pulls/3/filterable-unsavedrelation
2016-05-04 10:50:46 +01:00
Loz Calver
4bd9a04896
Merge pull request #5440 from tractorcow/pulls/4.0/api-explicit-injector-inheritance
...
API Injector dependencies no longer inherit from parent classes
2016-05-04 09:31:51 +01:00
Ingo Schommer
87f2933654
Update tinymce dep, fix "npm run sanity"
...
ae99a273e
updated TinyMCE from 4.3.4 to 4.3.8 directly, instead of through NPM.
This failed "npm run sanity". Updated to the latest (4.3.11) through NPM now.
2016-05-04 20:29:21 +12:00
Ingo Schommer
6aa9dbdb0e
Added NPM tests
...
Also simplified logic branching by introducing $PHPUNIT_TEST.
2016-05-04 20:29:18 +12:00
Paul
e04fb5b986
Fixes missing actions on responsive gridfield, cleanup indentation ( #5446 )
2016-05-04 20:21:11 +12:00
Paul
4b8e98b351
fix for scss linting issues in new scss ( #5448 )
2016-05-04 20:14:56 +12:00
Loz Calver
36e64168a5
Merge pull request #5444 from tractorcow/pulls/3/fix-upload-size
...
BUG fix Upload_Validator getAllowedMaxFilesize
2016-05-04 09:13:00 +01:00
Ingo Schommer
2ecd73d303
Added CodeClimate integration ( #5443 )
2016-05-04 19:48:11 +12:00
Hamish Friedlander
11a9be6cf3
Merge pull request #5449 from open-sausages/pulls/4.0/isset-regression
...
Excuse php7 errors due to regressions in 7.0.6
2016-05-04 17:08:31 +12:00
Damian Mooyman
4bc04e795a
Excuse php7 errors due to regressions in 7.0.6
2016-05-04 16:33:40 +12:00
David Craig
32bfc3853a
Update client-side build tooling docs
2016-05-04 16:02:49 +12:00
Hamish Friedlander
ab3aebf2d4
Merge pull request #5437 from open-sausages/pulls/4.0/fix-gridfield-autocomplete
...
BUG Fix GridFieldAddExistingAutocompleter and GridFieldExportButton
2016-05-04 13:59:32 +12:00
Christopher Darling
220290d61c
test to prove #5222
2016-05-04 12:05:02 +12:00
Tim Kung
d1c7554c1e
Upload_Validator fixing getAllowedMaxFileSize to correctly return * value
2016-05-04 12:05:02 +12:00
Damian Mooyman
5925b65547
Merge pull request #5395 from dhensby/pulls/3.3/empty-manifest-fix
...
MINOR Empty YAML config causes invalid argument error
2016-05-04 10:48:28 +12:00
Damian Mooyman
0bc5fb31c1
Merge branch 'pull/5388' into 3
2016-05-04 10:33:45 +12:00
Damian Mooyman
8ce3d90e18
API Injector dependencies no longer inherit from parent classes automatically
...
API Allow classes to inherit service definitions explicitly
2016-05-03 18:39:31 +12:00
Damian Mooyman
0d4c71f393
API Filtering on invalid relation is no longer a silent error
...
Fixes #5331
2016-05-03 17:51:16 +12:00
Damian Mooyman
f88d708ee9
BUG Fix GridFieldAddExistingAutocompleter and GridFieldExportButton
...
Based on https://github.com/silverstripe/silverstripe-framework/pull/5426
Fixes #5267
2016-05-03 17:45:46 +12:00
Damian Mooyman
ca1716b9f3
Merge pull request #5393 from open-sausages/pulls/4.0/BEM-enhancements
...
Style enhancements
2016-05-03 17:27:02 +12:00
Hamish Friedlander
db6af3300c
Merge pull request #5434 from open-sausages/pulls/4.0/fix-htmleditorfield-whitelist
...
[ss-2015-027] FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
2016-05-03 16:21:20 +12:00
Ingo Schommer
3abd2f7119
Updated dist files
2016-05-03 16:17:36 +12:00
Paul Clarke
cd9a5dbbe9
created placeholder ListGroup.js, not currently used
2016-05-03 16:17:36 +12:00
Paul Clarke
7895e21d51
hide campaign links for alpha1
2016-05-03 16:17:36 +12:00
Paul Clarke
c7eca59a8a
Refactored class names, split out campaign specific elements, hide campaign links
2016-05-03 16:17:28 +12:00
Paul Clarke
6d1a14de9c
delete unused file, swap class for bootstrap list-group-item-heading class
2016-05-03 16:04:48 +12:00
Paul Clarke
4e67a913d6
Move label style out of component, remove legacy overrides
2016-05-03 16:04:48 +12:00
Paul Clarke
22617cd9b2
Improves readability slightly
2016-05-03 16:04:48 +12:00
Paul Clarke
bcbb0fcc5c
rename class for better reusability and refactor
2016-05-03 16:04:47 +12:00
Paul Clarke
5b2d910aeb
Form action styles update
...
Doesn’t conform to BEM.
Need to update places btn-success is being used and replace with
btn-primary, but the differences shouldn’t be too noticeable.
2016-05-03 16:04:47 +12:00
Paul Clarke
3be4e80711
Restructure accordion so list items are in their own component
...
Accordion styles to get more BEM
2016-05-03 16:04:42 +12:00
Paul
a7f5ef7b95
Removed More Options action and popover from template ( #5435 )
2016-05-03 15:30:41 +12:00