Commit Graph

3832 Commits

Author SHA1 Message Date
Ingo Schommer
1e117d22a0 Simplified travis builds (external setup scripts) 2013-03-28 22:36:05 +01:00
Ingo Schommer
18201c05af Fixed Config usage in ErrorPage 2013-03-27 12:00:55 +01:00
Ingo Schommer
f73a5c68f3 FIX VirtualPageTest memory errors due to Config API quirks 2013-03-27 10:59:17 +01:00
Ingo Schommer
51c8e8639e API Marked statics private, use Config API instead (#8317)
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:21:04 +01:00
Ingo Schommer
1f14654649 CMSMain->LinkWithSearch() visibility
Required for tree links retaining search state
2013-03-19 22:13:10 +01:00
Ingo Schommer
c3b4d68664 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	code/controllers/SilverStripeNavigator.php
2013-03-19 14:04:24 +01:00
Ingo Schommer
0aeace2aec Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	code/CommentAdmin.php
2013-03-19 13:51:22 +01:00
Ingo Schommer
75c77c4361 Merge pull request #304 from g4b0/8300-allowed-children-contextual-menu
Re-indexed disallowed array because of json_encode issue
2013-03-19 01:24:28 -07:00
Ingo Schommer
79c9d31099 Merge pull request #303 from uniun/patch-1
BUG SilverStripeNavigator shows wrong message.
2013-03-19 01:23:21 -07:00
g4b0
9037aa8645 Re-indexed disallowed array because of json_encode issue with non-sequential array 2013-03-18 17:18:58 +01:00
uniun
e8f7f3db7f Make message always visible at the top of the page
Make message always visible at the top of the page like the message in CMS preview iframe.
2013-03-18 16:29:10 +02:00
uniun
db853f2c3c Make message always visible at the top of the page
Make message always visible at the top of the page like the message in CMS preview iframe.
2013-03-18 16:28:28 +02:00
uniun
5c933b40e5 BUG SilverStripeNavigator shows wrong message.
The message was always 'Published Site'.
Also there were no 'active' class on links.
2013-03-18 15:57:20 +02:00
Ingo Schommer
9bce266639 Merge pull request #295 from silverstripe-rebelalliance/feature/config
FIX CMSMainTest to access batch_action config property properly
2013-03-18 04:22:43 -07:00
Ingo Schommer
1bad0742fb Merge pull request #300 from chillu/pulls/show-children-as-list
NEW "Show children as list" tree context action
2013-03-18 04:13:09 -07:00
Ingo Schommer
7e43afe39e Merge pull request #302 from patbolo/ticket/8318
FIX Ticket #8318 Append the HTML used for expanding/collapsing the site ...
2013-03-17 13:24:14 -07:00
jean
59e66f39b7 FIX Ticket #8318 Append the HTML used for expanding/collapsing the site tree column in template instead of creating it on the fly with js 2013-03-18 08:57:13 +13:00
Andrew Short
b5725c7ace Merge branch '3.0' into 3.1 2013-03-15 19:36:31 +11:00
Ingo Schommer
ec93643f49 NEW Set correct ParentID when creating page from list view 2013-03-14 19:00:56 +01:00
Ingo Schommer
1e1049b5c8 NEW "Show children as list" tree context action
Allows for easier navigation between tree and list,
particularly if a node has many children nodes
(since it doesn't require expanding that node).

Uses a new 'ss-tabs-force-active' class on the tabset
to enforce the correct view state. This also fixes an issue
where you couldn't link to a list view directly via URL.
2013-03-14 17:31:36 +01:00
jean
2dd0e3f02e NEW Restored duplicate and duplicated with children functionality, as in 2.4 See ticket #7602
Conflicts:
	javascript/CMSMain.Tree.js
	templates/Includes/CMSMain_TreeView.ss
2013-03-13 10:04:09 +01:00
Ingo Schommer
37bb86a927 Merge pull request #299 from patbolo/ticket/8316
FIX 8316 Prevents browser default behaviour when changing the pagetypes ...
2013-03-13 02:02:39 -07:00
jean
2ba26ba701 FIX 8316 Prevents browser default behaviour when changing the pagetypes if creating a new page 2013-03-13 11:05:47 +13:00
Ingo Schommer
a5e84c0a06 Merge pull request #294 from dhensby/request-patch
BUG Request object now has URL changed
2013-03-07 11:32:40 -08:00
Ingo Schommer
0f8d7a0aa4 Removed CMSMain->CMSVersion(), using LeftAndMain instead
Implementation got more complex (see https://github.com/silverstripe/silverstripe-cms/pull/289),
including composer.lock file support. So trying to to duplicate too much.
2013-02-28 13:39:13 +01:00
Daniel Hensby
eb2e0d7877 BUG Request object now has URL changed
Instead of cloning the Request object and losing all the custom
attributes that don't come through the construct (eg: headers) we can
now set the URL alone.
2013-02-28 08:51:25 +00:00
Hamish Friedlander
68ebc5d221 FIX CMSMainTest to access batch_action config property properly 2013-02-27 15:00:41 +13:00
Ingo Schommer
1e3473db0d Merge remote-tracking branch 'origin/3.0' into 3.1 2013-02-26 13:29:08 +01:00
Ingo Schommer
306b0d77e4 Updated translations 2013-02-26 13:27:07 +01:00
Sam Minnee
85dcceb6df Updated translations 2013-02-26 13:58:52 +13:00
Sam Minnee
b7b62e5aea FIX: Fixed create-folder function: 2013-02-26 13:39:48 +13:00
Ingo Schommer
91b602c768 Merge pull request #292 from dhensby/patch-1
BUG Metadata heading removed from RediretorPage
2013-02-20 06:17:25 -08:00
Daniel Hensby
e131a041d4 BUG Metadata heading removed from RediretorPage
Currently the empty metadata accordion stays on the RedirectorPage. This is now removed.
2013-02-20 13:32:55 +00:00
Ingo Schommer
b74af926ce Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	tests/travis/before_script
2013-02-18 14:16:12 +01:00
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