g4b0
238f2908e5
BUG: fixed "regression" inserted with 9281ebc647
adding a new class to SiteTree elem (edit-disabled)
2013-06-03 13:46:10 +02:00
Ingo Schommer
5175352ed1
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-06-03 00:22:22 +02:00
Ingo Schommer
46d62efd81
Updated translations
2013-06-03 00:14:09 +02:00
Ingo Schommer
bd86ff848c
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
javascript/CMSMain.Tree.js
2013-05-31 17:53:05 +02:00
Sean Harvey
206f09ab65
Merge pull request #757 from mparkhill/651-assets-broken-redirection
...
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 15:04:22 -07:00
Sean Harvey
fbf6faf947
Merge pull request #756 from halkyon/status_flag_class_fix
...
BUG Fixing regression from silverstripe/sapphire/67d1327
2013-05-27 01:28:23 -07:00
Mike Parkhill
85f5a45951
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 17:21:07 +12:00
Sean Harvey
20f044cef0
BUG Fixing regression from silverstripe/sapphire/67d1327
...
Status flag classes didn't pick up styling because the flag was
changed to prefix "status-".
2013-05-26 12:31:15 +12:00
Will Rossiter
2809b009a1
Merge pull request #186 from silverstripe-rebelalliance/api/translation_priority
...
Add config fragment for new i18n ordering system
2013-05-25 00:59:08 -07:00
Simon Welsh
e8f6b416d7
Revert call to setCheckModelPermissions()
2013-05-25 13:56:02 +12:00
Sean Harvey
9c1a69ae08
Merge pull request #755 from patbolo/restored-page-correct-title
...
FIX Correct page title shown when restoring a page, instead of html of t...
2013-05-24 18:45:38 -07:00
jean
698a75d903
FIX Correct page title shown when restoring a page, instead of html of tree node
2013-05-25 11:37:26 +12:00
Will Rossiter
ae494b01bc
Merge pull request #259 from chillu/pulls/perms-opt-in
...
FIX: Respect model permissions in AssetAdmin
2013-05-24 15:44:55 -07:00
Sean Harvey
7f174f0a8d
Merge pull request #754 from phptek/bug/073
...
BUGFIX: Content authors with SiteTree#canView() but not SiteTree#canEdit...
2013-05-22 20:10:25 -07:00
Russell Michell
9281ebc647
BUGFIX: Content authors with SiteTree#canView() but not SiteTree#canEdit() were unable to click on SiteTree items in the CMS.
...
- The 'disabled' attribute in <li> will now only render if the author _really_ can't do _anything_
2013-05-23 14:48:24 +12:00
Ingo Schommer
417bef9948
Merge pull request #700 from oddnoc/successfullyinstalled-fix
...
Return 410 for successfullyinstalled after install files are gone
2013-05-22 12:40:56 -07:00
Ingo Schommer
f64488b0d8
Merge pull request #751 from madmatt/fix_for_cms_issue_750
...
Fix Issue #750
2013-05-22 12:21:09 -07:00
Fred Condo
cd81d327ac
Return 410 for successfullyinstalled after install files are gone
...
It was possible to append '/successfullyinstalled' to any SilverStripe
URL (with the cms module present), and the code would run, including
republishing the 404 page.
Now, if the install.php file is gone, this controller method throws the
410 (Gone) status code. The 410 status is chosen rather than 404 to
mitigate the likelihood that crawlers such as the Googlebot will follow
stray links to this URI.
2013-05-21 15:11:57 -07:00
Matt Peel
3cc6485c14
Add default params to _t() calls to ensure if a translation isn't found, it falls back to a useful English string
2013-05-21 14:57:29 +12:00
Ingo Schommer
b2e9353755
Merge pull request #701 from tractorcow/3.1-api-updaterelativelink
...
API Added SiteTreeExtension::updateRelativeLink
2013-05-17 05:05:03 -07:00
Ingo Schommer
041a8bd5a7
Update github path
2013-05-17 13:30:33 +02:00
Ingo Schommer
cf81c32dd8
Merge pull request #740 from kinglozzer/3.1
...
FIX 'Add new' page button missing ParentID
2013-05-17 04:17:03 -07:00
Sean Harvey
180defd2ca
Merge pull request #745 from mateusz/alternate-preview-link
...
API Add a missing hook so we can override the SiteTree preview link.
2013-05-16 20:18:49 -07:00
Mateusz Uzdowski
bccd2f8e51
API Add a missing alternatePreviewLink hook for SiteTree extensions.
2013-05-17 15:00:08 +12:00
Ingo Schommer
d7c937710a
Merge remote-tracking branch 'origin/2.4' into 3.0
...
Conflicts:
.travis.yml
composer.json
2013-05-17 00:38:26 +02:00
Will Rossiter
2567cda0b4
Use $MenuTitle for Breadcrumbs ( Fixes #743 )
2013-05-16 20:11:22 +12:00
Sean Harvey
38c025f8ba
Merge pull request #741 from mateusz/rollback-messages
...
Update doRollback messages to work well with the new reverts.
2013-05-15 16:11:58 -07:00
Mateusz Uzdowski
6117057c59
Update doRollback messages to work well with the new reverts.
...
Currently reverts are not creating the new versions anymore - they are
simply copying the Version over. Remove incorrect message about new
version creation and remove the "cancel draft changes" message that's
not correct.
2013-05-16 08:43:12 +12:00
Loz Calver
f51448ced4
FIX 'Add new' page button missing ParentID
...
Slight typo causing this. Also slightly amended how extra URL
parameters are tagged on to prevent &undefined being appended to URL
2013-05-14 15:38:07 +01:00
Sean Harvey
89bf063880
Merge pull request #705 from halkyon/showunpublished_event
...
BUG ShowUnpublished checkbox with initial state not working
2013-05-13 15:55:08 -07:00
Sean Harvey
46166408bf
Merge pull request #739 from halkyon/x-cms-edit-errorpage
...
BUG Don't redirect to ErrorPage in CMS with x-cms-edit-link
2013-05-13 15:54:01 -07:00
Sean Harvey
a681b8e4ab
BUG Don't redirect to ErrorPage in CMS with x-cms-edit-link
2013-05-14 00:06:09 +12:00
Sean Harvey
4f88dcbbfc
BUG ShowUnpublished checkbox with initial state not working
...
If ShowUnpublished checkbox initial state is checked, the history
doesn't show the unpublished versions up front. The user would need to
uncheck the box then check again, as only the change event would handle
the toggling of showing unpublished versions.
Moved the ShowUnpublished handler into a separate entwine class, and
run the same toggle code onmatch, as well as onchange.
2013-05-13 16:24:00 +12:00
Ingo Schommer
f0e7990ca3
Merge pull request #703 from Zauberfisch/lc_XX
...
Re added the lc_XX locale
2013-05-12 14:09:10 -07:00
Zauberfisch
b88f56dfd8
Reverted 04bb85a78d
2013-05-11 18:57:53 +00:00
Will Rossiter
7c68414fe7
FIX: Rename search locale variable to avoid conflicts with locale switcher.
...
Fixes http://open.silverstripe.org/ticket/6204
2013-05-11 19:31:02 +12:00
Will Rossiter
d766af542d
Merge pull request #702 from simonwelsh/escape-html-shortcode
...
FIX Escape the sitetree_link shortcode return value
2013-05-09 23:37:49 -07:00
Simon Welsh
be25c302ac
FIX Escape the sitetree_link shortcode return value
2013-05-10 14:05:06 +12:00
Damian Mooyman
61312a5d7f
API Added SiteTreeExtension::updateRelativeLink
...
Updated SiteTreeExtension PHPDoc
Refactored out Translatable extension in RelativeLink
2013-05-10 12:22:22 +12:00
Ingo Schommer
7ecf56490a
FIX URL concat in tree actions (broke with 'translatable' module)
2013-05-08 09:38:25 +02:00
Ingo Schommer
a196933e05
Merge pull request #697 from halkyon/cms_showing_latest_version_message
...
Page history panel: show appropriate message when viewing latest version
2013-05-07 15:02:17 -07:00
Sean Harvey
c7ebf76757
Page history panel: show appropriate message when viewing latest version
2013-05-07 17:14:28 +12:00
Ingo Schommer
f8cfb5afd6
composer/installers dep workaround
...
Moved to end of requirements, to work around a bug in composer - see https://github.com/composer/composer/issues/1147 . This caused the dependencies to be installed in the wrong folder because the custom 'silverstripe-module' instructions hadn't been loaded at the time the core modules were installed via composer.
2013-04-30 19:09:16 +03:00
Sean Harvey
b4f2e35b32
Updating text for permission description to be accurate for 3.x
2013-04-30 17:58:47 +12:00
Ingo Schommer
c922d08fb7
Merge pull request #683 from chillu/pulls/virtualpage-1594
...
Better UI feedback on VirtualPage states (fixes #1594 )
2013-04-18 09:31:31 -07:00
Ingo Schommer
878cf541b9
Better UI feedback on VirtualPage states ( fixes #1594 )
2013-04-16 11:56:33 +02:00
Ingo Schommer
c6d6e2435e
Merge pull request #682 from patbolo/bugfix-673-2
...
FIX #673 Do not prevent default browser behaviour when selecting page ty...
2013-04-16 02:31:26 -07:00
jean
685b82a985
FIX #673 Do not prevent default browser behaviour when selecting page type on new page creation
2013-04-12 19:39:54 +12:00
Simon Welsh
a15081fbcc
Merge pull request #679 from ARNHOE/3.1
...
MINOR: added translation for children list and added tree translations
2013-04-10 00:55:32 -07:00
ARNHOE
7305aca95b
MINOR: added translation for children list and added tree translations
2013-04-10 10:54:09 +03:00