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
10,905 Commits 31 Branches 527 Tags 162 MiB
b282c9f8f3
Commit Graph

10905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
3931945e62 Merge pull request #1158 from halkyon/deleteaction 
Trigger delete confirmation popup when deleting a GridFieldDetailForm re...
 2013-02-05 00:10:21 -08:00
Sean Harvey
d320247627 Trigger delete confirmation popup when deleting a GridFieldDetailForm record 2013-02-05 13:14:03 +13:00
Sean Harvey
ba825cec28 Remove whitespace from LeftAndMain_Menu 2013-02-05 12:30:14 +13:00
Sean Harvey
632e0e898d Simplify sentence on shortcodes 2013-02-05 10:43:01 +13:00
Ingo Schommer
fe740515b4 Loading "OR" in admin/assets for Chrome (fixes #8245) 2013-02-04 22:00:12 +01:00
Ingo Schommer
56d8eb96f0 Merge pull request #1157 from mateusz/shortcode-docs 
Move the shortcode docs to documentation, add examples.
 2013-02-04 12:43:58 -08:00
Mateusz Uzdowski
d741aa9b95 Move the shortcode docs to documentation, add examples. 2013-02-05 09:27:22 +13:00
Ingo Schommer
accbd7f1e2 Revert "FIX: Strict error warnings on DataExtension" 
This reverts commit 1960df8bc3.

Revert "FIX: validate doesn't take var by reference"
This reverts commit 866bb0713b.

@ajshort has changed the method signatures in 1f6f7f08. While it wasn't explicitly noted in the commit message, I think its a good change - objects like a FieldList are always passed by reference in PHP, no need to declare that behaviour.
 2013-02-04 17:23:11 +01:00
Ingo Schommer
857d8bb8df FIX Don't escape values on TreeDropdownField readonly views 
They typically output TreeTitle() which is assumed to be HTML.
 2013-02-04 17:15:32 +01:00
Ingo Schommer
e742a1113e Merge pull request #1155 from silverstripe-rebelalliance/open8085 
BUGFIX:fixed pagination for "upload from CMS" grid field pagination open...
 2013-02-04 04:50:10 -08:00
Ingo Schommer
5205a4403b Merge pull request #1156 from mandrew/patch-1 
FIX: Strict error warnings on DataExtension
 2013-02-04 04:49:44 -08:00
Ingo Schommer
0e6912c8cd Re-added 'auto' sizing for CMS preview 
Regression from making sizes configurable via JS
 2013-02-04 13:43:04 +01:00
Ingo Schommer
1c045b5509 Smaller styling for minor actions in CMS 2013-02-04 13:43:03 +01:00
Kirk Mayo
0cb6b4630f NEW Storing page preview states (fixes #8092) 2013-02-04 13:43:01 +01:00
Michael Andrewartha
866bb0713b FIX: validate doesn't take var by reference 
Got a bit carried away, validate doesn't take the var by reference
 2013-02-04 12:42:39 +00:00
Michael Andrewartha
1960df8bc3 FIX: Strict error warnings on DataExtension 
PHP is throwing strict error warnings when overriding the
updateCMSFields and other functions in custom DataExtensions due to
the fact that the abstract class doesn't declare the variables should
be passed by reference
 2013-02-04 12:37:53 +00:00
Jeremy Bridson
82099f65a5 BUGFIX:fixed pagination for "upload from CMS" grid field pagination open/8085 2013-02-04 17:30:39 +13:00
Jeremy Bridson
aa81333b7e MINOR:adjusted position of "OR" on the asset upload field and removed right margin from "choose files to upload…" button on the insert media dialog - open/8231 2013-02-04 14:48:26 +13:00
Jeremy Bridson
0fade6c9d3 BUGFIX:fixed styling of asset upload page and dialog in the asset admin and media insert via WYSIWYG editor open/8231. 2013-02-04 14:15:27 +13:00
Ingo Schommer
b381e9933d Include "media" attr for module customCSS() (fixes #8219) 2013-02-01 10:23:16 +01:00
Sean Harvey
6a1fe05191 Merge pull request #1151 from silverstripe-rebelalliance/bug/image_reedit_attr 
FIX Assiging width to caption instead of container
 2013-01-31 13:23:36 -08:00
Hamish Friedlander
aa3eb98de2 FIX Assiging width to caption instead of container 2013-02-01 10:17:56 +13:00
Ingo Schommer
d77e06d585 Merge pull request #1123 from chillu/pulls/revert-content-length 
API Remove Content-Length setting from HTTPResponse (fixes #8010)
 2013-01-31 10:19:17 -08:00
Ingo Schommer
1bb109041f FIX Node updates in IE without non-object error 
Bug was most prominent after page publication,
which triggers a node reload. It iterated through
all node attributes to assign them to the existing node,
which apparently includes some non-scalar attributes
that can't simply be copied in IE.
 2013-01-31 18:59:20 +01:00
Ingo Schommer
dc75d9a5b4 Merge pull request #1149 from silverstripe-rebelalliance/bug/image_reedit_attr 
FIX A couple of bugs integrating the SilverStripe media panel with TinyMCE
 2013-01-31 15:24:51 +01:00
ajshort
fd71a3d55e Consistently exposed ManyManyList information through getters. 2013-01-31 15:21:46 +01:00
Hamish Friedlander
4681673896 FIX TinyMCE context menu displaying default dialogs instead of our one 2013-01-31 16:39:00 +13:00
Hamish Friedlander
6f937745b0 FIX Not being able to remove, add or edit the caption on an image properly 2013-01-31 16:35:48 +13:00
Ingo Schommer
f633a72921 Merge pull request #1147 from dhensby/patch-1 
Change to how environment file is found
 2013-01-30 07:24:49 -08:00
Daniel Hensby
77476de917 Change to how environment file is found 
The _ss_environment.php file can now be in any parent folder of the framework (according to realpath())

Removing the description of '3 levels deep' and replaced with explanation of infinite depth.
 2013-01-30 15:19:53 +00:00
Ingo Schommer
0b44d8fbfb Merge pull request #1145 from silverstripe-rebelalliance/bug/image_reedit_attr 
FIX Not calling updateFromNode on re-opening an image
 2013-01-30 14:52:50 +01:00
Ingo Schommer
013f4cfe88 Merge pull request #1052 from kinglozzer/leftandmain-preview-click-bug 
BUG: Right click on LeftAndMain menu caused CMS preview pane to open
 2013-01-30 05:50:39 -08:00
uniun
ebe41cdadf CSS fixes for Batchactions. 
On some browsers Batchactions block looked OK, but on others (e.t. Opera on Linux) every element in Batchactions block had different height.
The height of these elements was related to font size which is a little bit different on every OS'es and browsers.

See https://github.com/silverstripe/sapphire/pull/1132
 2013-01-30 14:46:25 +01:00
Ingo Schommer
b76f18e808 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 13:09:20 +01:00
Ingo Schommer
3dab996c90 Excluded Postgres from Travis (breaks build due to internal errors) 
We'll need to fix the "no space left on device" issue,
most likely caused by Postgres keeping too much of a query log,
or somehow creating a history of past data.
For now, having a Postgres build breaking the whole
build process (incl. MySQL builds) does more harm than good.
 2013-01-30 13:01:37 +01:00
Ingo Schommer
7f4c173369 Fixed indentation in Mailer 
No functional changes
 2013-01-30 12:52:18 +01:00
Ingo Schommer
7327f120aa Re-added wrapImagesInline and wrapImagesInline_rewriter to Mailer class 
Deprecated in fb076c03, but can't be removed just yet.
Also included some fixes which have since been applied in 3.0 to this.
 2013-01-30 12:48:54 +01:00
Ingo Schommer
634c91c6ff Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	email/Mailer.php
 2013-01-30 12:46:24 +01:00
Ingo Schommer
eb7fed9ab5 FIX Prevent defocus on first change in CMS HTMLEditorField (fixes #8217) 
Regression caused by https://github.com/silverstripe/silverstripe-cms/commit/26cc14a9
 2013-01-30 12:40:52 +01:00
Ingo Schommer
c72ba4ecfb Merge pull request #1144 from silverstripe-droptables/os8222 
BUG Flush editors on form submission (os#8222)
 2013-01-30 11:41:56 +01:00
Ingo Schommer
38e930dfe6 FIX Blocking of preview screen (regression) 
Blocked when it should be editable, due to entwine's
onunmatch not firing when it was expected to.
 2013-01-30 11:32:55 +01:00
Hamish Friedlander
9f822d1e3c FIX Not calling updateFromNode on re-opening an image 
Inside mediaform updateFromEditor we called $(this).updateFromNode, but this wasnt
pointing to anything useful after a refactor, which resulted in the fields not
being filled in with current data when editing an already-inserted image
 2013-01-30 17:15:01 +13:00
Sean Harvey
0ab76e8e11 Merge pull request #1146 from silverstripe-droptables/os8218 
BUG Remove extraneous </div> breaking IE8 image embedding (os#8218)
 2013-01-29 20:07:29 -08:00
Mateusz Uzdowski
3111ad12fa BUG Remove extraneous </div> breaking IE8 image embedding (os#8218) 
Editor was not able to add images to TinyMCE - both newly uploaded and
old ones from the local assets.
 2013-01-30 16:22:05 +13:00
Mateusz Uzdowski
6c78bf9be9 BUG Flush editors on form submission (os#8222) 
Otherwise some non-textual changes such as moving images and resizing
them could be missed when saving.

This is because TinyMCE does not treat the image move/resize as an
undolevel and does not register this via regular "onChange" event.
 2013-01-30 11:54:29 +13:00
Simon Welsh
c9f728fefb FIX Only check the remember token if a user exists 2013-01-30 09:17:47 +13:00
jean
c048a019f6 BUGFIX Avoid infinite redirection when logging out and when showing a custom login page after displaying the draft version of a page. 2013-01-29 19:24:37 +01:00
Sam Minnee
5f9348b016 FIX: Ensure that Security views respect redirections triggered by Page_Controller::init() 
Sometimes Page_Controller::init() will trigger a redirection.  For example, it may redirect to a
canonical URL.  In this case, the Security views, which co-opt Page_Controller, need to respect
this.
 2013-01-29 18:19:15 +01:00
Sam Minnee
f54697930e API CHANGE: Add a PermissionFailureException that can be thrown to trigger a log-in. 2013-01-29 18:10:42 +01:00
Ingo Schommer
6cb1570282 Merge pull request #1078 2013-01-29 18:04:15 +01:00