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
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
Ingo Schommer
ff1df3696f
Limiting redirection-follow to specific tests in CMSMainTest
...
Fixes *some* quirks when running tests with
the 'translatable' module enabled (which redirects
to URLs with ?locale=<locale> in the CMS by default).
2012-11-23 15:30:11 +01:00
Ingo Schommer
8659c27487
Remove unused set_up_once() invocations from various tests
...
SapphireTest method name was changed to instance method
and setUpOnce() naming in mid 2010 already (093da759).
Since those methods were never invoked, they're obsolete.
Checked that the SiteTree-related tests pass with
Translatable enabled.
2012-11-23 13:58:54 +01:00
Ingo Schommer
d92f04dde2
Merge pull request #243 from silverstripe-droptables/incorrect-bc-nesting
...
BUG Incorrect html nesting of breadcrumbs
2012-11-22 15:28:57 -08:00
Ingo Schommer
e6e12fe00e
Merge branch '3.0'
...
Conflicts:
composer.json
2012-11-22 23:48:18 +01:00
Naomi Guyer
4fab9b8248
BUG Incorrect html nesting of breadcrumbs
...
Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div
Relies on sapphire commit 72b4fbf
2012-11-22 12:19:38 +13:00
Sean Harvey
1529cd1539
Merge pull request #241 from icecaster/patch-4
...
MINOR removed reference to non existent js
2012-11-18 20:00:02 -08:00
Tim Klein
59719a46cc
MINOR removed reference to non existent js
...
cms/javascript/SitetreeAccess.js is no longer with us :)
2012-11-19 16:15:57 +13:00
Ingo Schommer
65fe8e5ae3
Fixed line length
2012-11-19 01:18:01 +01:00
Kirk Mayo
d58b23d6fa
BUG AssetAdmin filter array indices ( fixes #8014 )
2012-11-19 00:51:12 +01:00
Sam Minnée
2227e7d152
Merge pull request #236 from chillu/pulls/behat
...
Behat Tests
2012-11-15 18:35:41 -08:00
Sean Harvey
4c73f23ddb
Removing deprecated FileList as it relies on TableListField
...
This has been moved to "legacytablefields" module
https://github.com/silverstripe-labs/legacytablefields
2012-11-16 12:42:04 +13:00
Will Rossiter
2e8d9ede93
Merge pull request #237 from drzax/urlsegmentfield
...
FIX fallback text for translations.
2012-11-14 23:16:03 -08:00
Stig Lindqvist
8b561b7604
Merge pull request #239 from halkyon/deprecation_cleanup
...
Deprecation cleanup
2012-11-14 18:57:47 -08:00
Sean Harvey
cef087f689
Removed deprecated SiteTree::TreeTitle(), use getTreeTitle() instead
2012-11-15 14:41:17 +13:00
Sean Harvey
d236bb58eb
Removed deprecated SiteTree::prepopuplate_permission_cache()
...
This function is misspelled, and was marked deprecated. This commit
removes that function. Please use prepopulate_permission_cache()
instead (note the removal of the extraneous "p" in "prepopuplate")
2012-11-15 14:39:48 +13:00
