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,625 Commits 31 Branches 527 Tags 162 MiB
54bc18b205
Commit Graph

10625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bridson
54bc18b205 BUGFIX: fix for broken layout in insert media dialog - Trac #8232 2013-02-07 11:58:55 +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
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
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
Jeremy Bridson
82099f65a5 BUGFIX:fixed pagination for "upload from CMS" grid field pagination open/8085 2013-02-04 17:30:39 +13: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
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
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
Sam Minnee
c4dde9022d NEW: Allow hashes to be passed as ArrayList items; the will be turned into ArrayData objects. 2013-01-29 18:03:49 +01:00
Sam Minnee
9a2ba483df BUGFIX: Made CSRF-error wording friendlier. 2013-01-29 18:03:49 +01:00
Sam Minnee
b6fd27663a MINOR: Don't throw redirection warning if redirection to the same place. 2013-01-29 18:03:49 +01:00
Sam Minnee
b43bf68f9c MINOR: Minor fixes to FunctionalTest 2013-01-29 18:03:48 +01:00
Sam Minnee
6fcbad1a31 BUGFIX: Updated SilverStripe error handler so that log_errors still works. 2013-01-29 18:03:48 +01:00
Sam Minnee
82988d421b BUGFIX: Better error message when 401 response is corrupted. 2013-01-29 18:03:48 +01:00
Sam Minnee
f8206d15c8 BUGFIX: Prevent notice-level error in Session code when non-array is turned into an array. 2013-01-29 18:03:48 +01:00
Sam Minnee
f72c77e984 MINOR: Fixed a glitch that causes warnings in cli-script execution. 2013-01-29 18:03:48 +01:00
Jean-Fabien
55f3ec1371 FIX: Added error message fields to default search form 2013-01-29 18:03:47 +01:00
Sam Minnee
47e037e74c FIX: Removed notice-level error after forms w/ required fields are made readonly. 2013-01-29 18:03:47 +01:00
Sam Minnee
1e1df8c43e BUGFIX: Improved detection of empty HTMLText fields. 2013-01-29 18:03:47 +01:00
Sam Minnee
d8bfc0bb48 API CHANGE: Added Security::set_login_url() so that you can define an alternative log-in page if you have made one yourself. 2013-01-29 18:03:47 +01:00
Carlos Barberis
33a1fc7b3a FIX: Fixed operation of inlined images in Mailer, when no inlined images actually attached. 2013-01-29 18:03:47 +01:00