Daniel Hensby
d0e4bda80d
Merge pull request #5480 from mikenz/subsites-breaks-tests
...
Disable subsite filters when running unit tests
2016-05-09 09:26:38 +01:00
Cochrane, Mike
faffdf4981
Explictly set the FileNameFilter replacements before relying on them
2016-05-09 20:12:29 +12:00
Cochrane, Mike
e2d180a754
Explictly set the FileNameFilter replacements before testing them
2016-05-09 20:03:58 +12:00
Cochrane, Mike
3afff81bdf
Disable subsite filters so it doesn't break framework unit tests
2016-05-09 19:53:20 +12:00
Damian Mooyman
aea73cab52
Merge pull request #5479 from silverstripe/simplify-branch-code
...
Simplified branching code
2016-05-09 17:50:22 +12:00
Damian Mooyman
8b94dd83df
API Add CSRF to Campaign delete
2016-05-09 17:33:10 +12:00
Christopher Pitt
aedc01bf18
Simplified branching code
2016-05-09 16:45:46 +12:00
Damian Mooyman
79a76c52c5
Merge pull request #5476 from open-sausages/pulls/4.0/5355-checkboxes-bootstrap-conflict
...
Checkbox layout, including settings tab bugs. Fixes #5355
2016-05-09 16:31:15 +12:00
Ingo Schommer
88a2a35758
Merge pull request #5475 from open-sausages/pulls/4.0/fix-add-i18n-javascript-locations
...
FIX add_i18n_javascript calls not being updated after JS move
2016-05-09 15:55:54 +12:00
Hamish Friedlander
b2786c228b
FIX add_i18n_javascript calls not being updated after JS move
...
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
2016-05-09 15:41:24 +12:00
Paul Clarke
142fcb2a27
Checkbox layout, including settings tab bugs. Fixes #5355
2016-05-09 15:09:23 +12:00
Ingo Schommer
b61ca609f4
Merge pull request #5468 from open-sausages/pulls/4.0/generic-fixes
...
Add page steps styles, btn style enhancement, campaign thumb alignment
2016-05-09 12:53:19 +12:00
Paul Clarke
c5d0d0bb99
Build
2016-05-09 12:53:02 +12:00
Paul Clarke
f1ea820ab1
Steps styles fix
2016-05-09 12:52:02 +12:00
Paul Clarke
83d70c4414
Fixes font used for add page steps and alignment
2016-05-09 12:51:35 +12:00
Paul Clarke
261ca9378e
Fixes campaign thumbnail left alignment issue
2016-05-09 12:51:35 +12:00
Ingo Schommer
122d2d6eab
Merge pull request #5439 from open-sausages/pulls/4.0/5424-update-buttons
...
Swapped a few btn classes for updated ones
2016-05-09 12:36:43 +12:00
Paul Clarke
2681b81d29
Swapped a few btn classes for updated ones
2016-05-09 12:36:14 +12:00
Daniel Hensby
459fb4ec80
Merge pull request #5465 from frankmullenger/4917-renaming
...
MINOR: Renaming classes with 'Html' camel cased.
2016-05-07 10:30:57 +01:00
Ingo Schommer
0b295137c2
Fix unguarded JS check in LeftAndMain.Preview.js
2016-05-06 14:42:20 +12:00
Frank Mullenger
b4cd617ee3
FIX: Renaming to HTMLEditorConfig.
...
FIX: Renaming to HTMLEditorField*.
FIX: Renaming to HTMLEditorSanitiser*.
2016-05-06 14:16:34 +12:00
Damian Mooyman
bccd08211f
Merge pull request #5458 from open-sausages/pulls/4.0/add-scsslint
...
Add SCSSLint
2016-05-06 09:11:06 +12:00
Ingo Schommer
a1dccaa8ff
Add linting note in coding conventions
2016-05-06 08:02:41 +12:00
Ingo Schommer
c251fab9af
Fixed more SCSSLint errors, disabled some files
...
The mixins and compasscompat will probably be replaced in time,
and install.scss is quite low priority to fix (same treatment as legacy/* styles)
2016-05-06 08:02:38 +12:00
Daniel Hensby
5eafdce963
Added 3.3.2-rc1 changelog
2016-05-05 13:38:46 +01:00
Daniel Hensby
840cd4f877
Update translations
2016-05-05 12:46:38 +01:00
Daniel Hensby
d1751e3310
Merge remote-tracking branch '3.2.4' into 3.3.2
2016-05-05 12:33:21 +01:00
Daniel Hensby
73b922d43b
Added 3.2.4-rc1 changelog
2016-05-05 11:48:07 +01:00
Daniel Hensby
2edef65d7a
Update translations
2016-05-05 11:18:02 +01:00
Daniel Hensby
cf29b2c146
Merge remote-tracking branch '3.1.19' into 3.2.4
2016-05-05 11:17:45 +01:00
Ingo Schommer
347999e900
Enable SCSSLint
...
See https://github.com/silverstripe/silverstripe-asset-admin/pull/129
and https://github.com/silverstripe/silverstripe-asset-admin/pull/130 for context
2016-05-05 20:41:41 +12:00
Daniel Hensby
ee5133f355
Added 3.1.19-rc1 changelog
2016-05-05 09:33:57 +01:00
Ingo Schommer
9011aaefa7
Merge pull request #5455 from open-sausages/pulls/4.0/OSS-1691-update-docs
...
Update front-end build tooling docs
2016-05-05 20:25:57 +12:00
Hamish Friedlander
114beaca35
Merge pull request #5457 from open-sausages/pulls/4.0/PREP-assetAdmin-linting
...
Moved AssetAdmin variables into framework for reuse
2016-05-05 19:28:27 +12:00
Paul Clarke
e81e99fb0d
improved variable comments
2016-05-05 18:52:42 +12:00
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
