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
4,086 Commits 29 Branches 403 Tags 28 MiB
78b9ef2df3
Commit Graph

4086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ingo Schommer
a43fac3ecf Merge remote-tracking branch 'origin/3.0' into 3.1 2013-04-09 14:03:04 +02:00
Ingo Schommer
4087c14d1b Fixed behat tests 2013-04-09 09:38:46 +02:00
Ingo Schommer
d7435cde71 Merge pull request #676 from kinglozzer/urlsegmentfield-error-fix 
Better error message when attempting to enter a blank URL Segment (fixes silverstripe/sapphire#1570)
 2013-04-08 07:58:49 -07:00
Simon Welsh
6482eeb137 Update pl_PL.js 2013-04-08 21:32:05 +12:00
Ingo Schommer
da515b8f65 FIX Use SSViewer.theme_enabled in CMS logic 2013-04-08 19:29:09 +12:00
Ingo Schommer
915582a54c Merge pull request #678 from patbolo/bugfix-673 
BUGFIX Use onadd instead of onmatch on cms-add-form when creating new pa...
 2013-04-07 16:24:50 -07:00
jean
c18f3fe446 BUGFIX Use onadd instead of onmatch on cms-add-form when creating new page #673 2013-04-08 11:03:12 +12:00
wkulesza
125edeb12e Update pl_PL.js 2013-04-06 22:00:05 +13:00
Will Rossiter
cc09cce104 API: remove static related classes, now staticpublisher module 2013-04-06 18:23:19 +13:00
Will Rossiter
6e2906d01e API: remove static related classes, now staticpublisher module 2013-04-06 17:26:15 +13:00
Loz Calver
ea446f2ade Better error message when attempting to enter a blank URL Segment (fixes silverstripe/silverstripe-cms#1570) 2013-04-05 14:06:32 +01:00
Ingo Schommer
04bb85a78d Removed LOLCAT locale - sadly not supported by our translation infrastructure 
It breaks the CMS when selected. If there's interest in maintaining it,
we can re-add. Fixes https://github.com/silverstripe/sapphire/issues/1457
 2013-04-04 10:58:11 +02:00
Ingo Schommer
6457ab2433 Regression in URL generation (dots now filtered out) 
Caused by framework/5ec85d06f68d09ab30b124312c54f1d84ce7d6f4
 2013-04-02 11:39:46 +02:00
Ingo Schommer
4d3e19958e Merge pull request #309 from a2nt/multibyte_url_convertion 
IMPROVEMENT Convert multibyte URLs preview to human readable format
 2013-04-02 02:31:07 -07:00
a2nt
73e97e7c42 IMPROVEMENT Convert multibyte URLs preview to human redable format 2013-04-03 06:35:42 +07:00
Ingo Schommer
32af5336c3 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	.travis.yml
 2013-04-02 02:01:48 +02:00
Ingo Schommer
b872714082 Added installer link to readme 2013-04-02 01:52:17 +02:00
Ingo Schommer
babdcc9eea Updated bugtracker links 2013-04-02 01:19:03 +02:00
Ingo Schommer
88b6d60353 More straightfoward travis include/exclude 2013-03-28 23:07:49 +01:00
Ingo Schommer
c62eb05518 More straightfoward travis include/exclude 2013-03-28 22:54:32 +01:00
Ingo Schommer
1e117d22a0 Simplified travis builds (external setup scripts) 2013-03-28 22:36:05 +01:00
Ingo Schommer
36352fdc68 Fixed missing cmd in travis setup 2013-03-28 21:31:27 +01:00