James Cocker
df6d1564a1
Merge branch '3.1' of https://github.com/purplespider/sapphire into 3.1
2013-03-12 23:08:48 +00:00
James Cocker
50336ffa62
CMS CSS Minor Polishing Tweaks
...
Fixed what I believe to be a few very minor CSS regressions, that appeared after the CSS restructure for the side-by-side preview.
- Reverted background of the right panel (and tab active state) to the slightly darker shade (as per 3.0) to keep each of the 3 panels visually separate.
- Slightly increased padding on ui-tabs-panel as felt a but too close for comfort. Had decreased since 3.0.
- Decreased padding for logged in user name in menu, felt too excessive. (3.0 was neater)
- Evened out padding above buttons in site tree sidebar
Screenshots showing changes:
3.0: http://spdr.me/xauh
3.1 before commit: http://spdr.me/jkIe
3.1 after commit: http://spdr.me/IxtB
2013-03-12 23:00:48 +00:00
Hamish Friedlander
53595dc930
FIX Parsing docblock comments in ConfigStaticManifest
2013-03-13 11:59:49 +13:00
Ingo Schommer
e486574b31
Merge pull request #1203 from dhensby/restfulservice-improvements
...
BUG Fixing a couple of bugs in RestfulService
2013-03-12 15:54:52 -07:00
Hamish Friedlander
60b72edfba
FIX Parsing heredoc, nowdoc & comments in ConfigStaticManifest
2013-03-13 11:26:49 +13:00
Sam Minnée
09377f0ba4
Added upgrade note for config static immutability
...
Config statics are now immutable for performance, this requires an upgrade change.
2013-03-13 11:22:41 +13:00
Ingo Schommer
1b489eaba6
Merge pull request #1278 from TheFrozenFire/bug-Mailer-BC-Break
...
Fixed BC break (ancestry) in Mailer
2013-03-12 14:03:51 -07:00
Sam Minnée
362ca9b4d5
Merge pull request #1244 from silverstripe-rebelalliance/feature/config
...
Feature/config
2013-03-12 13:19:59 -07:00
Justin Martin
22e7313d93
Bug: Fixed BC break (ancestry) in Mailer
2013-03-12 10:56:39 -07:00
Ingo Schommer
c56f70ba3b
Merge pull request #1277 from g4b0/contentnegotiator-xhtml-addition-rc2
...
Added some more XHTML replacement and relative unit test
2013-03-12 08:14:41 -07:00
g4b0
d32cd5be16
Added some more XHTML replacement and relative unit test. Content_type comfigurable.
2013-03-12 16:06:59 +01:00
Ingo Schommer
83b24285fa
Merge pull request #1270 from oddnoc/gd-crop-preserve-alpha
...
BUG: Preserve alpha channel when cropping
2013-03-12 03:25:23 -07:00
Ingo Schommer
53e988bb09
Merge remote-tracking branch 'origin/3.1.0-beta2' into 3.1
2013-03-12 10:45:44 +01:00
Hamish Friedlander
e6352dffbb
FIX Static polution with informational fields
2013-03-12 17:14:12 +13:00
Hamish Friedlander
7f58730904
FIX Avoid get_parent_class in ConfigStaticManifest (was loading all classes)
2013-03-12 16:52:11 +13:00
Hamish Friedlander
943b5cf3a4
Remove debug message, any still unexpected token is an error
2013-03-12 15:40:12 +13:00
Hamish Friedlander
c52baae3c8
Add some tests for the static parser
2013-03-12 15:32:46 +13:00
Fred Condo
bb30c1e590
BUG: Preserve alpha channel when cropping
...
This keeps the alpha channel from turning black.
2013-03-11 15:19:09 -07:00
Ingo Schommer
31bb60199e
Merge pull request #1267 from g4b0/8309-ampersand-escaping
...
BUG: ampersand escaping
2013-03-11 02:32:54 -07:00
g4b0
2f16951634
BUG: ampersand escaping
2013-03-11 09:58:14 +01:00
Ingo Schommer
30c0f82221
Merge pull request #1265 from danrye/patch-2
...
Fixed link and added branch direction
2013-03-09 02:40:31 -08:00
Will Rossiter
f021a0ce86
Merge pull request #1261 from chillu/pulls/validationexception-routing-3.0
...
API Handle uncaught ValidationException on CMS controller execution
2013-03-08 13:12:37 -08:00
Will Rossiter
3168b2c522
Merge pull request #1263 from danrye/patch-1
...
Update module-development.md docs
2013-03-08 13:09:51 -08:00
Dan
7d35d899fb
Fixed link and added branch direction
...
Broken link to edit docs, perhaps should link to repo instead of directory to avoid having a branch in the URL. Also added blurb to clarify what branch doc edits should occur in.
2013-03-08 10:24:49 -05:00
Dan
4a12d6db3c
Minor: Two modules are listed as three.
...
...for example "framework" and "cms". These three modules... Should be two modules, or perhaps there is a third missing from the list.
2013-03-08 10:10:04 -05:00
Ingo Schommer
07886c3e61
Merge pull request #1262 from ajshort/grid-field-null-list
...
BUG: Fix grid field rendering when the list is null
2013-03-08 06:12:20 -08:00
ajshort
a965d3b374
BUG: Fix grid field rendering when the list is null
2013-03-09 01:04:51 +11:00
Ingo Schommer
b81f39aee5
API Handle uncaught ValidationException on CMS controller execution
...
This removes the need for a lot of boilerplate code
around DataObject->write() logic, and avoids generic 500 errors
on user-level failures. This should really be a per-project choice,
but at the moment request handling doesn't allow to configure
custom exception handling.
2013-03-08 12:55:30 +01:00
Tom Densham
ed4057f573
Avoid mid-sentence periods in combined field validation messages
...
See https://github.com/silverstripe/sapphire/pull/1241
2013-03-08 12:16:03 +01:00
Ingo Schommer
add6531316
Merge pull request #1258 from robert-h-curry/unsavedrelationlist-getidlist
...
Define getIDList on UnsavedRelationList
2013-03-08 03:14:29 -08:00
Ingo Schommer
2419d1aa46
XHTML formatting <hr> ( fixes #8297 )
2013-03-08 10:42:32 +01:00
Robert Curry
b9dc2dc650
Define getIDList on UnsavedRelationList
...
This is to fix a bug that caused CheckboxSetFields to throw an error
when trying to call this function when editing a new DataObject. This
occurred when using the advancedworkflow module.
Thanks to simonwelsh for the majority of the work on this fix.
2013-03-08 12:34:52 +13:00
Wernervanrun
fade5cce51
Update javascript/HtmlEditorField.js
...
we only want this .ss-uploadfield-files - else we get all ss-uploadfield-files wich include the ones not related to #tinymce insertmedia
2013-03-07 20:33:02 +01:00
Ingo Schommer
b8e5ebb9e3
Merge pull request #1242 from dhensby/request-patch
...
API Adding setURL to HTTPRequest object
2013-03-07 11:18:04 -08:00
Ingo Schommer
709f0f5d19
Merge pull request #1248 from kinglozzer/leftandmain_menu_preview_fix
...
FIX: Prevent opening preview when clicking the link for current page again
2013-03-07 09:46:48 -08:00
Ingo Schommer
634ba76353
Merge pull request #1249 from ryanwachtl/patch-1
...
Update rich-text-editing.md
2013-03-07 09:45:39 -08:00
miiihi
5af35a89ce
ENHANCEMENT Allow multiline comments in SS3 templates
2013-03-07 18:45:07 +01:00
Ingo Schommer
d83950bc2b
Merge pull request #1256 from g4b0/xhtml-xml-schema-not-required-31
...
BUGFIX: Removed XHTML XML declaration requirement
2013-03-07 09:43:20 -08:00
Ingo Schommer
58d0126538
Merge pull request #1257 from Zauberfisch/3.1.0-beta2
...
BUGFIX: fixed file icon for uppercase file extensions
2013-03-07 08:16:13 -08:00
Zauberfisch
00d01aa6e3
BUGFIX: fixed file icon for uppercase file extensions
2013-03-07 16:13:21 +00:00
g4b0
13b7386a2f
BUGFIX: Removed XHTML XML declaration requirement
2013-03-07 11:35:24 +01:00
Will Rossiter
693a92f9c9
Merge pull request #1254 from ryanwachtl/patch-2
...
Update execution-pipeline.md
2013-03-05 23:12:14 -08:00
Ryan Wachtl
957f4e75e8
Update execution-pipeline.md
...
Corrected naming of SS_HTTPResponse variable. Improved readability of PHP code samples.
2013-03-05 22:06:52 -06:00
Will Rossiter
1853fc864a
FIX: Do not blindly pass input values to GridField_FormAction URL's
...
The length of input fields can very quickly exceed the max URI length resulting in 414 errors when printing or exporting results.
To access the input values for a specific GridField action, encapsulate this in your own Entwine instance.
2013-03-05 10:30:39 +13:00
Will Rossiter
1ddd1ddc47
Docblock and coding conventions for GridField related classes.
2013-03-05 10:29:27 +13:00
Will Rossiter
36d3303e1b
FIX GridField export and print actions should preserve state.
2013-03-05 10:27:15 +13:00
Will Rossiter
dda6fa6600
Add no results warning to GridField print view.
2013-03-05 10:25:19 +13:00
Will Rossiter
2e36e450ca
Fix alignment of selects within GridField filters
2013-03-05 10:23:30 +13:00
Ingo Schommer
d57caa6477
Merge pull request #1247 from ajshort/mml-remove-filtered
...
BUG: Fix ManyManyList->removeAll() when filters are applied to the query
2013-03-04 00:55:45 -08:00
Ingo Schommer
64888c07b7
Partially revert docs commit 7710cf59
...
i18n.js doesn't support named parameters (yet)
2013-03-04 08:48:16 +01:00