Commit Graph

3346 Commits

Author SHA1 Message Date
Ingo Schommer
8dc2770ce1 Merge pull request #156 from silverstripe-big-o/staticPublishingFix
BUGFIX: fixing an edge-case bug where a 404-page would get statically pu...
2012-07-09 01:09:49 -07:00
Julian Seidenberg
63ad68a7d3 BUGFIX: fixing an edge-case bug where a 404-page would get statically published and overwrite the homepage of the site (this would sometimes happen when a RedirectorPage was set to an external URL and still referenced an internal page ID) 2012-07-09 13:20:58 +12:00
Ingo Schommer
c1aad0d0c0 Merge branch 'master' into 3.0 (one-off)
This is a one-off merge in the direction master->3.0,
to ensure all bugfixes since we branched off find
their way into the next micro/minor release.
From now on, we'll commit to the latest release branch,
and merge back to master. API changes should go into
the master branch (not merged into a release branch).
2012-07-05 18:13:40 +02:00
Ingo Schommer
d1bc7219a8 Merge branch '3.0' 2012-07-05 17:53:35 +02:00
Ingo Schommer
89079c4ca0 Checking for existence of 'Locale' data in CMS controllers
Only applies for Translatable extension installed
2012-06-29 14:22:24 +02:00
Ingo Schommer
db47dcff47 Fixed url concat in SiteTreURLSegmentField.js
Needed to handle existing GET params, e.g. added from
the translatable module
2012-06-29 14:21:44 +02:00
Sam Minnee
040f780a15 BUG: Allow children on RedirectorPage (Trac #7587) 2012-06-29 16:24:20 +12:00
Naomi Guyer
ef651d9d93 ENHANCEMENT: Add GridfieldLevelup component to files area 2012-06-26 13:35:38 +02:00
Ingo Schommer
bb5e3e5fbd MINOR Remove DB dependency from SiteTree->provideEntities()
Use class manifest instead, which provides same level of info,
and means we can run the text collector on bare checkouts
without a database set.
2012-06-25 14:01:19 +02:00
Ingo Schommer
25ee305f32 MINOR Updated translations 2012-06-25 09:20:25 +02:00
Ingo Schommer
1a3728ccf6 MINOR Updated translations 2012-06-25 09:17:36 +02:00
Ingo Schommer
9f7ec965a2 MINOR Updated translations 2012-06-25 00:51:11 +02:00
Ingo Schommer
acb0e94910 MINOR Updated translations master 2012-06-25 00:51:07 +02:00
Ingo Schommer
ea8cf75514 MINOR Updated translations 2012-06-25 00:42:51 +02:00
Ingo Schommer
6cb3686a81 MINOR Updated translations master 2012-06-22 11:36:23 +02:00
Sam Minnee
2d63729cfe Merge branch '3.0' 2012-06-22 17:21:05 +12:00
Hamish Friedlander
34ee111ff7 Merge pull request #152 from sminnee/trac-7174
REMOVE: Remove action handler for widgets. (Trac #7174)
2012-06-21 19:40:03 -07:00
Sam Minnée
549a9b5739 Merge pull request #153 from silverstripe-rebelalliance/trac/7427-add-responses
BUGFIX: Add batch handler status messages (fixes #7427)
2012-06-21 19:29:39 -07:00
Hamish Friedlander
8c05f3554f BUGFIX: Add batch handler status messages (fixes #7427)
7427 was mostly fixed by Ingos previous patch. But two batch actions, delete from draft site and delete from published site werent returning
status messages. Abstracted out the status preperation code that the batch actions that were returning status messages were using, and
used that to add status messages to the problem two
2012-06-22 14:09:52 +12:00
Sam Minnee
3fbf57245c REMOVE: Remove action handler for widgets. (Trac #7174)
The widget functionality has been moved into a module, and this URL handler was the last of the code still in the core app related to widgets.  As well as this commit, there is a related change to the silverstripe-widgets module to add this feature there: 025ee424c4
2012-06-22 14:05:27 +12:00
Hamish Friedlander
3cb77d8853 Merge pull request #151 from sminnee/trac-7507
BUG: Update MenuTitle whenever Title is changed and the value of Title used to be.  Bubble the change to update LHS tree. (Trac #7507)
2012-06-21 18:38:15 -07:00
Sam Minnee
6be8602295 BUG: Update MenuTitle whenever Title is changed and the value of Title used to be. Bubble the change to update LHS tree. (Trac #7507)
We had to use .data() to track OrigVal manually, but this means that the MenuTitle can be updated much more reliably.  In addition, we trigger the change-handler for MenuTitle that updates the LHS tree.  Unfortunately, we couldn't simply use .trigger('change') because it broken in IE8 due to an entwine bug.
2012-06-22 13:04:40 +12:00
Ingo Schommer
813ed75869 MINOR Test MenuTitle null'ing (see #7505) 2012-06-20 18:26:55 +02:00
Will Rossiter
211ce61ba7 MINOR: move route to cms module 2012-06-20 16:27:50 +02:00
Will Rossiter
facc8ba653 MINOR: restore backlinkcount into cms module. (removed from framework in 266a61221c) 2012-06-20 16:27:47 +02:00
Will Rossiter
c394605507 MINOR: move route to cms module 2012-06-20 16:20:18 +02:00
Will Rossiter
3b7af0e945 MINOR: restore backlinkcount into cms module. (removed from framework in 266a61221c) 2012-06-20 16:20:04 +02:00
Ingo Schommer
78163f9403 MINOR Updated translations master 2012-06-20 12:10:01 +02:00
Sean Harvey
d55eb13ecc BUGFIX Ensure that we only select the first item when updating tree
nodes, otherwise we change the title for all nested node's text as well.
2012-06-20 22:01:36 +12:00
Sean Harvey
f3912f32d8 BUGFIX Ensure that we only select the first item when updating tree
nodes, otherwise we change the title for all nested node's text as well.
2012-06-20 21:57:27 +12:00
Sam Minnee
447ef16294 BUGFIX: Update the tree w/ javascript when MenuTitle is updated, not Title (Trac #7496) 2012-06-18 17:34:35 +12:00
Ingo Schommer
4986355e3f MINOR Simplified page type dropdown labels, removed redundant info (fixes #7474) 2012-06-15 16:22:27 +02:00
Ingo Schommer
c8052da5b8 BUGFIX Corrected page history pane loading (fixes #7477) 2012-06-15 12:50:54 +02:00
Sam Minnee
e7ecdf4b35 BUGFIX: Fixed page tree view 2012-06-15 16:38:55 +12:00
Sam Minnee
bfe354de5e BUGFIX: Disable javascript not used right now because assets don't have batch actions. (Trac #7367) 2012-06-15 15:50:11 +12:00
Sam Minnee
792c9058fa BUGFIX: Fixed DataList operations to respect the fact that they're idempotent. 2012-06-15 15:30:08 +12:00
Ingo Schommer
c051b80b73 MINOR Using links for fake remote tabs in CMSMain_Content.ss to avoid 'missing fragment identifier' errors from jQuery UI. 2012-06-15 00:35:58 +02:00
Ingo Schommer
7f27474159 BUGFIX Show AssetAdmin tree by not invoking $EditForm twice in template
Both for performance reasons, and for weird behaviour on the second invocation (doesn't retain the same record context)
2012-06-14 20:36:36 +02:00
Ingo Schommer
3c81958345 MINOR Only set folder field state in AssetAdmin if a folder is shown 2012-06-14 20:21:28 +02:00
Ingo Schommer
a64cf8c27b BUGFIX AssetAdmin->delete() is now allowed, and redirects to parent folder automatically 2012-06-14 20:21:04 +02:00
Ingo Schommer
eaf05a6a7c BUGFIX AssetAdmin root navigation (fixes #7448)
Return a new object instance rather than relying on singleton(),
which might've been modified elsewhere, and have a non-zero ID/ParentID.
2012-06-14 09:42:55 +02:00
Ingo Schommer
f94f03defe MINOR Removed unused jQuery.dialog creation in CMSMain.AddForm.js, which causes mem leaks (now uses dedicated pages/add UI) 2012-06-13 23:36:46 +02:00
Ingo Schommer
6581831396 MINOR Disable parent node search in CMSPageAddController
The search <input> field can't handle HTML returned by SiteTree.TreeTitle, see #7455 for proposed fix
2012-06-13 16:11:35 +02:00
Ingo Schommer
eccfc1a664 Merge branch 'stylingfixes' of https://github.com/ajshort/silverstripe-cms into ajshort-stylingfixes 2012-06-13 13:24:12 +02:00
Ingo Schommer
01201f04bb MINOR Resetting margin on URLSegment help text (changed due to new .help default styling in core) 2012-06-13 13:16:15 +02:00
Andrew Short
acc6115154 MINOR: Removed extra margin from tools add page button. 2012-06-13 17:49:04 +10:00
Andrew Short
a6cee248e0 BUGFIX: Consistently style custom defined page icons.
* Renamed generateTreeStylingCSS() to generatePageIconsCSS().
* Removed legacy icon definitions.
2012-06-13 17:46:43 +10:00
Ingo Schommer
bda7272761 ENHANCEMENT Show node badges in tree sidebar view on hover (fixes #7410) 2012-06-12 19:35:17 +02:00
Ingo Schommer
e50936fe9f MINOR Added caching to SiteTree->getStatusFlags(), as its called twice for every node now in LeftAndMain->SiteTreeAsUL() (see #7410) 2012-06-12 19:35:15 +02:00
Ingo Schommer
bc2fb3c900 Merge pull request #147 from ajshort/silverstripe-cms
---
2012-06-12 00:35:21 +02:00