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,489 Commits 31 Branches 527 Tags 162 MiB
5e8ae41d47
Commit Graph

16489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Hensby
fde6376996
FIX Admin bloacklisted messages using correct $.inArray check 2016-04-24 08:57:45 +01: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
Ingo Schommer
cfd6cd259d Merge pull request #5370 from tractorcow/pulls/3/fix-behat-modal-error 
BUG Fix error when modals are displayed
 2016-04-22 11:48:01 +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
Damian Mooyman
fa5b8b8fb1 BUG Fix error when modals are displayed 2016-04-22 10:31:49 +12:00
Ingo Schommer
0a3e39b96c Merge pull request #5364 from robbieaverill/feature/json-dbfield-formatting 
FIX #5363 Add .JSON option for templates
 2016-04-21 21:17:21 +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
JorisDebonnet
9eac541740 Enhance GD::greyscale to allow darker or lighter results, and change color weights for greyscale (#5332) 
Tweaking the first three parameters (R, G, B) allows you to get a different mix of colors into grey, but it does not allow you to make the result lighter or darker because their total is normalized. This is quite a common operation on greyscaled images though, so I added a fourth parameter: brightness. It defaults to 100% so that it does not have any effect when not used (making this backwards compatible). $brightness = 50 will make it darker, $brightness = 150 will overlight it.
 2016-04-21 19:26:46 +12:00
Robbie Averill
ae268ae4df FIX #5363 Add .JSON option for templates 2016-04-21 17:01:05 +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
Ingo Schommer
560ed0b3aa Merge pull request #5329 from open-sausages/features/OSS-1657-campaign-preview 
Added placeholder panel for items with no preview
 2016-04-21 11:21:48 +12:00
Ingo Schommer
3594fa79c7 Include components/label in build 2016-04-21 11:19:30 +12:00
Paul Clarke
95e4415288 Fix for IE, added ability to adjust panel height based on the amount of toolbars 2016-04-21 11:19:30 +12:00
Paul Clarke
35a2e13085 Added modifier for img --fits-space, will need to use js to detect so styles can be adapted 2016-04-21 11:19:30 +12:00
Paul Clarke
9b5430a80c Use bootstrap mixing text-truncate instead of custom styles 2016-04-21 11:19:29 +12:00
Paul Clarke
02bb158a27 Removed old typography, minor updates and rebase regressions 2016-04-21 11:19:20 +12:00
Paul Clarke
a7e5da8228 Fix for height 2016-04-21 11:03:45 +12:00
Paul Clarke
cc7170d424 improved consistency of toolbars included in preview and other areas of cms 2016-04-21 11:03:45 +12:00
Paul Clarke
6cd5bf2f3f Preview panel as its own component, file preview styles, no preview message. 
Improved layout reusability
Moved layout styles to its own stylesheet
Added scrollable panels
 2016-04-21 11:03:42 +12:00
Daniel Hensby
1ccd3926e3
[SS-2016-001] FIX Properly check backurl on CMSSecurity@success 2016-04-20 23:58:50 +01:00
Daniel Hensby
a6bd22ab2f
[SS-2016-006] FIX dont disable XSS for login forms 2016-04-20 23:57:59 +01:00
Daniel Hensby
a24c8260b1
[SS-2016-004] FIX Store current page IDs as ints 2016-04-20 23:55:59 +01:00
Ingo Schommer
4d43664057 Merge pull request #5318 from open-sausages/pulls/4.0/fix-page-routing 
BUG fix routing for react sections
 2016-04-21 09:11:20 +12:00
Damian Mooyman
dbd17bd49a API Remove routing from silverstripe-component 
BUG Fix page routing in subdirectory
BUG Fix top level admin sections not causing ajax load
 2016-04-21 08:43:03 +12:00
Ingo Schommer
869f438253 Merge pull request #5351 from open-sausages/pulls/minor-css-fixes 
Minor fixes to CMS panels to use the newer variables and sizes
 2016-04-21 08:28:41 +12:00
Paul Clarke
978369bd63 Update old cms toolbars and menu to use new variables and heights so everything lines up 
Includes fixes for menu borders and preview border
 2016-04-21 08:28:12 +12:00
Paul Clarke
0d1d8c5888 Remove text-decoration on focus for campaign items 2016-04-21 08:24:41 +12:00
Jeffrey Guo
4f14175022 setup CMS Settings in one test step 2016-04-20 22:40:04 +12:00
Ingo Schommer
43040d5b05 Merge pull request #5346 from open-sausages/pulls/4.0/static-file-restructure 
Static file restructure
 2016-04-20 21:15:32 +12:00
Ingo Schommer
19de22f427 API Moved frontend assets into admin/client/ 
admin/javascript => admin/client
admin/javascript/src => admin/client/src/legacy (mostly)
admin/scss/_variables.scss => admin/client/styles/_variables.scss
admin/scss => admin/client/styles/legacy/
admin/css/editor.css => admin/client/dist/css/editor.css
admin/css/screen.css => admin/client/dist/css/bundle.css
admin/images => admin/client/dist/images
admin/images/sprites/src => admin/client/src/sprites
admin/images/sprites/dist => admin/client/dist/sprites
admin/font => admin/client/dist/font
 2016-04-20 21:13:10 +12:00
Ingo Schommer
cb7b2b09a8 Don't generate separate bootstrap.css files 
We only need them in the main.css build file.
The bootstrap.scss already includes reboot and grid.
We're not using flex (yet), and can be built alongside main.css as well.

Reordered includes to ensure they bootstrap reboot gets included early.
 2016-04-20 21:13:09 +12:00
Ingo Schommer
32dbd1d2b5 Consolidated style locations 2016-04-20 21:13:08 +12:00
Ingo Schommer
c5a20ab5fc Restructure main SCSS includes 
Makes more sense to go from generic to specific
 2016-04-20 21:13:08 +12:00
Ingo Schommer
4c734abac9 Removed unused GridFieldPaginator.scss 
Refactored a while ago through 3c516b7b97
 2016-04-20 21:13:08 +12:00
Ingo Schommer
55d7e78875 Removed unused "grayscale" theme 
Was never in active use, and has outdated variables
 2016-04-20 21:13:08 +12:00
Ingo Schommer
dbf90b5e64 Removed _ieShared.scss 
Already removed usage in 429682e, but forgot to remove the underlying file.
Did a sanity check in IE10 on the areas addressed in this stylesheet,
and they look fine.
 2016-04-20 21:13:08 +12:00
Ingo Schommer
5b96decb5c Removed unused CSS files 
UnitTesting.css was referring to web-based dev/tests runs which is no longer supported
SubmittedFormReportField.css was a user-forms specific sheet!
 2016-04-20 21:13:07 +12:00
assertchris
ec247cefd8 Changed comments in forms\ToggleField.php 2016-04-20 18:31:17 +12:00