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
11,619 Commits 31 Branches 527 Tags 162 MiB
dff5447cbc
Commit Graph

11619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kirk Mayo
dff5447cbc BUG: Fix for Cookie expiry timeout being passed as a large number on 64 bit machines 2013-06-20 12:30:48 +12:00
Ingo Schommer
a4189a6744 Merge pull request #2117 from ohararyan/3.1 
FIX make sure select dropdowns in add page dialog aren't cut off
 2013-06-19 05:30:54 -07:00
Ingo Schommer
8769da5622 CMS UI: Resize iframe alongside dialog 
Fixes regression from 9f600ada2c
 2013-06-19 14:28:34 +02:00
Ingo Schommer
2160fb8000 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.js
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
	tests/control/ControllerTest.php
 2013-06-19 14:03:43 +02:00
Ingo Schommer
c5a7193896 Environment Config: SS_DATABASE_MEMORY 2013-06-19 13:42:28 +02:00
Ingo Schommer
5c3809a165 Merge pull request #2121 from sminnee/allowed-actions-templates 
FIX: Ensure that actions inferred from templates with the "_action" suff...
 2013-06-19 02:16:37 -07:00
Simon Welsh
d774bab988 REGRESSION: fixed background color for PaddedImage 2013-06-19 20:35:24 +12:00
Ingo Schommer
b7a00eea78 Merge pull request #2122 from g4b0/1752-image-manipulation-parameter-regression 
REGRESSION: fixed background color for PaddedImage
 2013-06-19 01:25:44 -07:00
g4b0
c06a9095df REGRESSION: fixed background color for PaddedImage 2013-06-19 10:19:54 +02:00
Sam Minnee
526b40414a FIX: Ensure that actions inferred from templates with the "_action" suffix also respect allowed_actions. 
FIX: Ensure SSViewer::hasTemplate() is aware of themes.

To do this, RequestHandler::definingClassForAction() has been created, splitting out the code that looks up the class that defines a given action into its own method.  This is then overridden in Controller to look at templates.
 2013-06-19 20:11:50 +12:00
Sam Minnée
34287895ef Merge pull request #2099 from chillu/pulls/insert-media-tweaks 
Various "Insert Media" dialog tweaks
 2013-06-18 21:32:00 -07:00
Sam Minnée
31a138b636 Merge pull request #2093 from chillu/pulls/resize-infinite 
BUG Resize infinite loops in IE8 (fixes #575)
 2013-06-18 21:25:57 -07:00
Sam Minnée
211a3e4e77 Merge pull request #2116 from chillu/pulls/sapphiretest-env-type 
Enforce 'dev' environment for test runs
 2013-06-18 21:24:37 -07:00
Ryan O'Hara
36d9563da8 FIX make sure select dropdowns in add page dialog aren't cut off due to .parent-mode class having overflow:auto 2013-06-19 11:27:22 +12:00
Ingo Schommer
0da70dafa4 Enforce 'dev' environment for test runs 
Otherwise tests like ControllerTest will fail because Deprecation notices
 2013-06-19 00:13:02 +02:00
Sam Minnée
8bf4d417c6 Merge pull request #2094 from chillu/pulls/dialog-sizing 
Min/max constraints for CMS dialog
 2013-06-18 14:56:41 -07:00
Sean Harvey
726e4c313e Merge pull request #2084 from chillu/pulls/cmsform 
Handle ValidationException on CMS forms
 2013-06-18 14:41:51 -07:00
Ingo Schommer
1d402dd513 Unset test state in DirectorTest 
This broke RSSFeedTest when running through 'sake'
 2013-06-18 23:24:22 +02:00
Ingo Schommer
4ef83a2895 Using Cookie class in Session::destroy() 
It allows us to suppress "headers sent" errors, which is particularly
important in phpunit test runs.
 2013-06-18 23:06:22 +02:00
Ingo Schommer
690f1c1570 BUG Manually require SS_DAG in Core.php 
Avoids errors when manifest needs to be built,
e.g. after faulty test runs. SS_DAG is depended on by ConfigManifest.
 2013-06-18 23:00:32 +02:00
Simon Welsh
05b6fd3536 Merge pull request #2114 from jthomerson/fix_minor_typos 
MINOR: fix a couple minor typos
 2013-06-18 13:17:48 -07:00
Jeremy Thomerson
6f16034ac8 MINOR: fix a couple minor typos 2013-06-18 18:28:46 +00:00
Ingo Schommer
4acbfdc846 Merge pull request #2061 from jthomerson/enhancement_3.1_allow_overridable_minification 
ENHANCEMENT: allow overridable JS/CSS minification
 2013-06-18 11:04:07 -07:00
Ingo Schommer
19e8f8f249 Merge pull request #2111 from CheeseSucker/patch-4 
Consolidated command line examples
 2013-06-18 10:48:31 -07:00
CheeseSucker
671b7a0cc7 Consolidated command line examples 
Examples were broken into several <pre> blocks.
 2013-06-18 15:50:32 +03:00
Ingo Schommer
ff26491918 Merge pull request #2107 from vikas-srivastava/patch-1 
Update 3.1.0.md
 2013-06-17 02:49:02 -07:00
vikas srivastava
2f16d93d48 Update 3.1.0.md 
I was trying 
Member:
  extensions:
    MyMemberExtension

And it didn't work then someone on IRC pointed that I need to put a '-' before values. So this works.
Member:
  extensions:
    - MyMemberExtension
Hope will help someone else.
 2013-06-17 14:21:46 +05:30
Ingo Schommer
04c337dc82 Tab breadcrumbs floating (regression from #1778) 2013-06-17 01:26:04 +02:00
Will Rossiter
3fb80a1657 Merge pull request #2104 from CheeseSucker/patch-1 
A few minor improvements to the "Module development" documentation
 2013-06-16 03:30:10 -07:00
CheeseSucker
476df739a2 A few minor improvements to the "Module development" documentation 2013-06-16 12:55:39 +03:00
Ingo Schommer
939773643a Accessibility: Open main tabs by keyboard focus 
Regression caused by jQuery UI 1.9 upgrae
 2013-06-15 12:23:51 +02:00
Ingo Schommer
ad28a3adc2 Updated browser warning in CMS JS 2013-06-15 11:58:35 +02:00
Ingo Schommer
9e4a7c835f Accessibility: Visible focus rings 2013-06-15 11:52:02 +02:00
Ingo Schommer
1fd8a55012 Form.scss reformatting (no functional changes) 2013-06-15 11:24:22 +02:00
Ingo Schommer
7c3e1a43e3 Removed unused '.right form' styles (2.x CMS) 2013-06-15 11:22:16 +02:00
Ingo Schommer
5b651e4593 Only clear tab entries from window.sessionStorage 2013-06-15 11:16:11 +02:00
Ingo Schommer
e3e828d15f Center aligning GridField pagination input text 2013-06-15 10:13:46 +02:00
Ingo Schommer
be62c731f5 Compressed layout in "Insert Media" detail screen 
- Same font size as other CMS UI
 - Smaller thumbnail height
 - Less label width and padding for file info
 2013-06-15 10:13:45 +02:00
Ingo Schommer
6338b0b2d9 Reduced line height for form field help text 2013-06-15 10:13:45 +02:00
Ingo Schommer
080da1eefc Removed colons from field labels in "Insert Media" detail screen 
We don't use them in other field labels either
 2013-06-15 10:13:45 +02:00
Ingo Schommer
91f6255fed Full URL on hover in UploadField detail screen 
Works around possible truncation of the URL when it gets too long
 2013-06-15 10:13:45 +02:00
Ingo Schommer
4bc2f9bc0d Localization-resilient SCSS selector (fixes #1590) 2013-06-15 10:13:45 +02:00
Ingo Schommer
071f30ded7 Consistent dropdown styles between chosen.js and treedropdown 
Removed trigger background. Incidentally this also makes it less
obvious that the trigger has too much padding on the right
(which I can't figure out ...)
 2013-06-15 10:13:45 +02:00
Ingo Schommer
8865bae8e3 Hide titlebar in "Insert Media" when updating images 
It doesn't make sense to show it there, since the "delete"
action has no effect, the "edit" button only collapses (useless),
and the thumbnail duplicates.
 2013-06-15 10:13:44 +02:00
Ingo Schommer
ec684a2e5c Show edit form in "Update Media" by default 
Was showing collapsed UploadField row before which doesn't make a whole lot of sense.
 2013-06-15 10:13:44 +02:00
Ingo Schommer
23c0084193 Add new files in "Insert Media" at start of the list 
Makes the change more obvious without requiring to scroll
to action origin (upload button) out of view
 2013-06-15 10:13:44 +02:00
Ingo Schommer
ea4f8cec07 Tighten "Insert Media" dialog layout 
Reduce space usage to fit into typical dialog dimensions without scrolling
 2013-06-15 10:13:44 +02:00
Ingo Schommer
1bd31c84f2 Reduced URL field width in "Insert Media" to avoid wrap 
450px width are often not available to the dialog (with all margins/paddings subtracted from the window).
Ensure the URL doesn't cause an unnecessary wrap. Ideally we can size this to the dialog width
automatically of course.
 2013-06-15 10:13:44 +02:00
Ingo Schommer
10a558c882 Hide "delete" button in "Insert Media" dialog 2013-06-15 10:13:44 +02:00
Ingo Schommer
3f295adbdd .field.noborder style, use it in "Insert Media" dialog 2013-06-15 10:13:43 +02:00