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,782 Commits 29 Branches 403 Tags 28 MiB
53c2059a01
Commit Graph

3782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
a8478d2e46 Merge remote-tracking branch 'origin/3.0' into 3.1 2012-12-14 10:55:51 +01:00
Sam Minnée
a0d04e8843 Merge pull request #258 from creamarketing/assetadmin-root-pagination 
BUG: Fixed pagination functionality on root assets folder
 2012-12-13 18:07:49 -08:00
Sam Minnée
c600257e64 Merge pull request #256 from silverstripe-rebelalliance/open/7673 
FIX use of DataList#innerJoin expecting it to be mutable
 2012-12-13 16:39:36 -08:00
Ingo Schommer
74d63791b7 Fixed regression in SiteTree->getCMSActions() 
Caused by toolbar recent changes
 2012-12-14 01:21:54 +01:00
Ingo Schommer
1d470fe718 Removed duplciate success status feedback on CMS save/publish 
We now have the CMS actions with two states for communicating
that they've saved correctly.
 2012-12-13 23:29:17 +01:00
Hamish Friedlander
546762ec5c FIX use of DataList#innerJoin expecting it to be mutable 2012-12-14 08:58:07 +13:00
Mateusz Uzdowski
26cc14a930 API Rework the CMS actions to use alternating buttons and drop-ups. 
Utilise the new features provided by the framework to get richer
interface:
* save buttons that highlight the current state of the page
* minor actions in a drop-up
* embed last publishing and saving information
 2012-12-13 19:10:39 +01:00
Niklas Forsdahl
d42c0041d2 BUG: Fixed pagination functionality on root assets folder 
Moving to another page in the GridField for the root assets folder in AssetAdmin
caused all files to be displayed. This was caused by the functionality that tries
to fix some edge cases for detail view kicked in and didn't filter the list properly.

Fixed by making the edge case detection a little more specific (i.e. checking if
a numeric ID was sent as a request variable).
 2012-12-13 16:31:19 +02:00
Ingo Schommer
2e164eae51 API Report::get_reports() returns native array (fixes #8096) 
Used to return ArrayList, but since 9d74c99e08 its no
longer using keys, which they functionality using these return
values rely on. Hence the breakage of ReportAdmin,
since no report was being detected as "current" by looking
through the array keys.
 2012-12-13 00:46:17 +01:00
Ingo Schommer
f4128a0839 Revert "BUG removed class cms-panel-link as it was calling loadPanel to be called twice trac 8041" 
This reverts commit a63a9f0e74.
Broken by merging in 0be51a93213, which works on 3.0,
but failed once we put those two patches together in 3.1.
They fix the same problem on different ends, and assume
the respective other behaviour still exists.
 2012-12-13 00:28:39 +01:00
Ingo Schommer
611c3f1b2e Added travis environment info output 2012-12-12 15:14:11 +01:00
Ingo Schommer
4cd166a111 Updated composer.json 2012-12-11 17:59:19 +01:00
Ingo Schommer
df41fcdce4 Skip SearchFormTest if DB driver doesn't support fulltext 
For now, the only case are specific SQL Server setups.
 2012-12-11 15:18:58 +01:00
Ingo Schommer
8cd29b627c Merge branch 'pulls/selectiongroup' 2012-12-11 11:08:30 +01:00
Ingo Schommer
084acc0fbd Fixed Behat tests for preview feature 2012-12-10 18:09:55 +01:00
Mateusz Uzdowski
a9004b9978 Restore numbering to navigator items so we can use iterator. 
Otherwise the numbering is by priority which is not traversable
(1000, 2000, 3000...).
 2012-12-10 18:09:55 +01:00
Naomi Guyer
35cbe28188 Re-add preview button for IE<=7. Side-by-side disabled for these. 
Preview will open in new window.
 2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
230182fc77 Remove preview button from history section. 
No longer works. Needs to be rewritten to work with side-by-side.
 2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
47f41d80c6 API Machine-friendly name for CMS states navigator (stages). 
Used programmatically by the side-by-side state switcher.
 2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
aaae8c97e6 Explicitly mark the section as previewable. 
Picked up by the forntend side-by-side preview JS.
 2012-12-10 18:09:54 +01:00
Mateusz Uzdowski
772961cb5e Add a secondary side-by-side state selector to the edit form 
For situations when preview is not visible (and options with it).
 2012-12-10 18:09:54 +01:00
Naomi Guyer
0711c321c5 Add side-by-side translation context. 2012-12-10 18:09:54 +01:00
Naomi Guyer
639f6e4d95 NEW Side by side editing functionality - first cut (os#7412) 
Introduces a preview window that appears when the screen is wide enough,
removes old preview button, adds a draft-public switch, adds variety of
preview options which are not hooked up yet.

Relies on sapphire's f95fadc84416835302fe6c8448054960b5e7ec65
 2012-12-10 18:09:54 +01:00
Ingo Schommer
1bf67fd942 Merge remote-tracking branch 'origin/3.0' 2012-12-10 18:09:34 +01:00
Ingo Schommer
4fa4ae726b Adjusted Behat steps to new definition format 2012-12-10 15:38:32 +01:00
Ingo Schommer
5922c1ea35 Merge pull request #252 from silverstripe-droptables/dependent-pages-fix 
BUG Remove handwritten SQL and use the ORM.
 2012-12-06 05:53:49 -08:00
Mateusz Uzdowski
c0751df54e BUG Remove handwritten SQL and use the ORM. 
The custom SQL does not take subsites into account and breaks the CMS
on certain pages - under some circumstances the custom count will return
1 or more, while the set will be in fact empty because of augmentation.
 2012-12-05 10:27:12 +13:00
Andrew O'Neil
6b6571cd28 BUGFIX: Only rely on request var ParentID, instead of using both $this->currentPage() and the request var. This will hopefully fix issues around the parent ID getting lost. 2012-12-04 11:16:40 +01:00
Ingo Schommer
98e824bced Avoid duplicating ReportAdmin search params (fixes #8046) 2012-12-04 10:22:29 +01:00
Ingo Schommer
f9a5601fa3 BUG Enforce "add page" restrictions, improve UI (fixes #7879) 
- Fix support for $allowed_children
- Added note when type selection is restricted
- Removed overly complex specs for "allowed children",
the data should be inferred from "disallowed children"
- Added support for SiteTree::$can_be_root
- Return raw JSON (not entity-encoded) from CMSMain->SiteTreeHints()
- Added tests for CMSMain->SiteTreeHints()
 2012-12-03 16:52:17 +01:00
Ingo Schommer
98cd09a852 Merge pull request #251 from silverstripe-rebelalliance/8041 
BUG removed class cms-panel-link as it was calling loadPanel to be calle...
 2012-12-03 01:25:06 -08:00
Kirk Mayo
a63a9f0e74 BUG removed class cms-panel-link as it was calling loadPanel to be called twice trac 8041 2012-12-03 12:11:31 +13:00
Ingo Schommer
2cd46ff0ed Use new SelectionGroup_Item API in "add page" UI 2012-11-30 15:34:10 +01:00
Ingo Schommer
027a41aec7 Consistent naming for root breadcrumb on page controllers (fixes #8057) 2012-11-29 14:43:37 +01:00
Ingo Schommer
3512ee82f4 Merge remote-tracking branch 'origin/3.0' 2012-11-28 16:36:30 +01:00
Ingo Schommer
e5f206065e Using $TRAVIS_BRANCH again, since its now available on travis-ci.org 2012-11-28 16:33:50 +01:00
Ingo Schommer
7bd200f2db Re-adding usage of $TRAVIS_BRANCH, fixing wrong 3.0 dependency 
Probably caused by a merge from 3.0
 2012-11-28 16:14:01 +01:00
Ingo Schommer
09f382d40d Composer require framework at 'dev-master' 2012-11-27 12:02:06 +01:00
Sean Harvey
e5b2643a11 Merge branch '3.0' 2012-11-26 17:19:14 +13:00
Kirk Mayo
40a1a35618 BUG Namespaces for CmsFormsContext and CmsUiContext are wrong 2012-11-26 01:16:02 +01:00
Ingo Schommer
bf6a00c01b Merge pull request #247 from silverstripe-rebelalliance/8045 
BUG Namespaces for CmsFormsContext and CmsUiContext are wrong
 2012-11-25 16:15:42 -08:00
Kirk Mayo
670c579153 BUG Namespaces for CmsFormsContext and CmsUiContext are wrong 2012-11-26 11:49:51 +13:00
Hamish Friedlander
5a5770db5c Merge changes for 3.0.3 release into 3.0 2012-11-26 11:38:12 +13:00
Hamish Friedlander
d9e1bec289 FIX CMS reference to Framework should avoid using self.version 2012-11-26 11:06:22 +13:00
Ingo Schommer
8d5cea550c TRAVIS_BRANCH doesn't seem to be set in before_script, hardcoding 2012-11-23 16:31:51 +01:00
Ingo Schommer
e67474293f More verbose travis build process 2012-11-23 16:20:14 +01:00
Ingo Schommer
b42cb5c308 Passing through $TRAVIS_BRANCH to before_script 2012-11-23 16:10:07 +01:00
Ingo Schommer
47e14f5e56 Fixed $TRAVIS_BRANCH env var usage in before_script 
Fixes "class TableListField not found" errors in travis.
Before that, we've been testing the 3.0 cms with
master framework, which of course is a bad idea ;)
 2012-11-23 15:59:01 +01:00
Ingo Schommer
76b99e4006 Fixed tests without assertions 2012-11-23 15:52:00 +01:00
Ingo Schommer
26bdee4f08 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	tests/model/SiteTreeTest.php
 2012-11-23 15:31:03 +01:00