tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
16,285 Commits 31 Branches 527 Tags 162 MiB
eab90bc82e
Commit Graph

16285 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
eab90bc82e Simple GridField ReactJS loading indication 
Better than no feedback at all while campaigns are loading.
Not using spinner.gif because a loading animation is already presented when the section is loaded (via PJAX).
Not translating the "Loading..." text because its temporary.
 2016-05-09 22:35:51 +12:00
Daniel Hensby
cc0417923f Merge pull request #5483 from open-sausages/pulls/4.0/5473-ie-object-freeze 
Don't use Object.freeze on functions (fixes #5473)
 2016-05-09 11:22:25 +01:00
Ingo Schommer
984d7c1cf6 Don't use Object.freeze on functions (fixes #5473) 
We're not using it for any other props passed to ReactJS components,
so there's no reason to do it here. Props are immutable by convention.
While it would be nice to enforce this, its too common to pass through
function objects which aren't supported by IE's Object.freeze().

IE isn't following the spec on how to handle Object.freeze(function() {}).
See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/freeze#Notes
> In ES6, a non-object argument will be treated as if it was a  frozen ordinary object, simply return it.

MS docs on https://msdn.microsoft.com/en-us/subscriptions/downloads/ff806186(v=vs.94).aspx
> If the object argument is not an object, a TypeError exception is thrown.
 2016-05-09 21:19:43 +12:00
Daniel Hensby
63dfdbef65 Merge pull request #5477 from open-sausages/pulls/4.0/delete-csrf 
API Add CSRF to Campaign delete
 2016-05-09 09:30:43 +01:00
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
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
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
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
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
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