tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity
3,950 Commits 29 Branches 403 Tags 28 MiB
920da0d120
Commit Graph

3950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
92db313ce7 Hardcode travis branch on dependencies, otherwise breaks pull request builds 
Pull requests are always on a branch, and this branch
typically is not present on the installer.

This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
 2013-02-18 14:14:42 +01:00
Ingo Schommer
1ef155fc18 Hardcode travis branch on dependencies, otherwise breaks pull request builds 
Pull requests are always on a branch, and this branch
typically is not present on the installer.

This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
 2013-02-18 14:13:24 +01:00
Ingo Schommer
b984f296f7 Merge pull request #288 from ARNHOE/patch-2 
Translation: nl_NL.js
 2013-02-18 03:11:27 -08:00
ARNHOE
b36ab5acaa Create nl_NL.js 2013-02-18 03:02:45 -08:00
Ingo Schommer
537b0c6117 Define $allowed_actions consistently 
Required due to stricter $allowed_actions checks in 3.1
 2013-02-18 15:12:46 +13:00
Hamish Friedlander
fba7c9640b Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-18 15:09:10 +13:00
Ingo Schommer
e809e0775e Updated translations 2013-02-18 01:20:00 +01:00
Ingo Schommer
c7b0666390 BUG Escape page titles in CommentAdmin table listing 2013-02-17 23:22:02 +01:00
Ingo Schommer
2402a8fbd4 Merge remote-tracking branch 'origin/2.4' into 3.0 2013-02-17 22:44:34 +01:00
Ingo Schommer
53c2059a01 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	code/controllers/SilverStripeNavigator.php
 2013-02-07 21:44:41 +01:00
Ingo Schommer
a0e965b7b4 Revert "FIX: updateCMSFields not accepting var by reference" 
This reverts commit e56a78b160.
 2013-02-06 18:59:51 +01:00
Ingo Schommer
8c3f87bb8a Results returned from FSP->publishPages() 
Aids further processing and verbose display,
e.g. when the publication is triggered by a queuing mechanism.
 2013-02-06 10:47:41 +01:00
Ingo Schommer
8dae8a3076 BUGFIX Fixed limiting of URLs on RebuildStaticCacheTask 2013-02-06 10:43:48 +01:00
Ingo Schommer
23eeb99075 FIX Clear Requirements before in-memory HTTP request for ErrorPage 
For example, avoids issues where separate controllers (calling and called) operate on the same
set of files through Requirements::combine_files().
 2013-02-06 10:43:42 +01:00
Ingo Schommer
b19a82b693 SiteTree on*() callbacks now consistently invoke on subclasses as well 
Before this was only possible for some specific ones, like onBeforeWrite.
This excludes any callbacks with augment*() or update*() naming,
since these are assumed to be on extension only, with a corresponding
base method available on the class itself (e.g. "updateCMSFields()"
vs "getCMSFields()").
 2013-02-06 10:43:31 +01:00
Ingo Schommer
fbfc939fc4 Merge pull request #285 from ryanwachtl/bug-8032-multiple-urlsegment-fields 
Prevent conflict when using more than one SiteTreeURLSegmentField in a CMS edit form
 2013-02-04 14:54:41 -08:00
Ryan Wachtl
b4c9c18b33 BUG: Prevent conflict when using multiple SiteTreeURLSegmentField's in CMS edit form 2013-02-04 15:04:52 -06:00
Ingo Schommer
97fbfd3f12 FIX Respect escaping rules on readonly fields in CMS history view 
Avoids showing unescaped HTML on fields which didn't allow it otherwise,
e.g. TextField. This also fixes problems with SiteTree->ExtraMeta
which got evaluated within the CMS. If this section contains any
JavaScript it gets executed and can disrupt CMS operation.
 2013-02-04 17:16:15 +01:00
Ingo Schommer
1525684e68 Merge pull request #284 from mandrew/patch-1 
FIX: updateCMSFields not accepting var by reference
 2013-02-04 04:58:28 -08:00
Michael Andrewartha
e56a78b160 FIX: updateCMSFields not accepting var by reference 
updateCMSFields should be taking the fields var by reference.
@see https://github.com/silverstripe/sapphire/pull/1156
 2013-02-04 12:55:29 +00:00
Ingo Schommer
00097a5d5d NEW Clickable URL preview in CMS 
- Refactored SiteTreeURLSegmentField to render controls in template
rather than JS for better clientside performance, and cleaner behaviour.
- Added dynamic ellipsis to start of URL, to retain most relevant
part of the URL (the last bits)
- Added "suffix" setting to field, which defaults to ?stage=Stage
- Removed prefix from edit view to leave more room for URL

Thanks to @sunnysideup for getting this started in
https://github.com/silverstripe/silverstripe-cms/pull/269
 2013-02-04 12:12:28 +01:00
Ingo Schommer
4269f94126 Merge pull request #283 from UndefinedOffset/3.0 
ENHANCEMENT: Hide SilverStripeNavigator_CMSLink when in a LeftAndMain extension not just CMSMain extensions
 2013-02-02 03:34:38 -08:00
UndefinedOffset
119d8aa892 ENHANCEMENT: Do not display SilverStripeNavigator_CMSLink when in a LeftAndMain extension not just CMSMain extensions 2013-02-01 14:16:19 -04:00
Ingo Schommer
931b726589 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 13:09:14 +01:00
Ingo Schommer
74a44933b2 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:07:38 +01:00
Ingo Schommer
b25063b09c Extracted ErrorPage default data to getter 
Allows for less verbose overloading, while still keeping i18n capabilities
in place, which isn't possible with DataObject::$default_records
 2013-01-30 13:07:11 +01:00
Ingo Schommer
eba4d205c3 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-30 12:44:40 +01:00
Ingo Schommer
416178b668 Reduced code duplication in ErrorPage (no functional changes) 2013-01-29 19:34:05 +01:00
Ingo Schommer
b15b98345f Using new "Security.login_url" configuration value 2013-01-29 18:06:49 +01:00
Ingo Schommer
649de6e1bc BUG Reinstated CMS "History" Preview (fixes ##8089) 2013-01-25 11:35:48 +01:00
Ingo Schommer
6a4387b970 Merge pull request #277 from silverstripe-rebelalliance/open/8183 
BUG: Replaced extendedSQL with DataList as per ticket 8183
 2013-01-23 12:58:51 -08:00
Kirk Mayo
81cd0e6e04 BUG: Replaced extendedSQL with DataList as per ticket 8183 2013-01-24 08:45:30 +13:00
Ingo Schommer
317977a227 More useful default cols on "Pages" list (fixes #8199) 2013-01-22 15:37:20 +01:00
Ingo Schommer
d0585e484a Updated translations 2013-01-21 11:57:12 +01:00
Ingo Schommer
61f2ab7519 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-01-21 10:03:30 +01:00
Kirk Mayo
1571d3542d BUG Only use $.button in onunmatch if init'ed (fixes #8181) 2013-01-21 08:43:29 +01:00
Sean Harvey
4999e5d886 Merge pull request #274 from unclecheese/patch-2 
MINOR: Grammar error
 2013-01-17 11:57:48 -08:00
unclecheese
cfc976bff8 MINOR: Grammar error 2013-01-17 14:31:35 -05:00
Ingo Schommer
8a9acaa5ba Fixed "add page" type icons (fixes #8190) 2013-01-17 19:59:54 +01:00
Ingo Schommer
0dd6dedab2 Moving "edit tree" button next to "add new" (fixes #8119) 2013-01-16 00:19:56 +01:00
Ingo Schommer
93bee9422a Don't duplicate SS_Report title in GridField 2013-01-14 17:12:27 +01:00
Ingo Schommer
76aeec70e7 NEW SiteTree->PreviewLink() for fine grained URL control 2013-01-14 17:12:23 +01:00
Andrew O'Neil
f9504ee983 ENHANCEMENT Writing caching metadata as HTML comments in FilesystemPublisher (through StaticPublisher::$include_caching_metadata) (ischommer) 2013-01-14 17:08:12 +01:00
Normann Lou
f674af0c73 BUG: dependentPages grid field not showing necessary columns and their values. 2013-01-09 22:35:54 +01:00
Ingo Schommer
ffc6d6ffad BUGFIX Disable CMS preview for RedirectorPage (fixes #7127) 
If the redirect is to an internal page, the preview iframe
will automatically load this new URL, causing the CMS edit
form to switch as well - effectively making it impossible
to edit a redirector page in the CMS as soon as it is saved
with an internal redirection target.
 2013-01-09 21:44:52 +01:00
Ingo Schommer
caca15034b Merge pull request #266 from silverstripe-rebelalliance/8151 
BUG SiteTree_Information.ss was not making use if i18n translations
 2013-01-07 09:45:36 -08:00
Kirk Mayo
383ae8f8b5 BUG SiteTree_Information.ss was not making use if i18n translations 2013-01-07 15:37:04 +13:00
Ingo Schommer
fa78370ac4 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-21 11:48:48 +01:00
Ingo Schommer
cb96255e80 Removed direct sprintf() usage from _t() calls 
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
 2012-12-21 11:18:18 +01:00
Ingo Schommer
e53257b01a Relaxing composer dependencies 
You currently can't install 3.1.0-beta1 through modifying your composer.json, because dependency checks will fail.
 2012-12-18 14:01:30 +01:00