Commit Graph

4415 Commits

Author SHA1 Message Date
Sean Harvey
b4f2e35b32 Updating text for permission description to be accurate for 3.x 2013-04-30 17:58:47 +12:00
Ingo Schommer
c0302bc24d Merge remote-tracking branch 'origin/3.1' 2013-04-29 08:59:11 +02: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
Ingo Schommer
2227ed3629 Merge remote-tracking branch 'origin/3.1' 2013-04-11 11:26:24 +02: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
e1e941013c Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
2013-03-29 17:38:00 +01:00
Ingo Schommer
8ae58398fe Simplified travis builds (using external script) 2013-03-28 23:48:37 +01: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
Ingo Schommer
b23c9bba82 Simplified travis builds (external setup scripts) 2013-03-28 21:15:11 +01:00
Ingo Schommer
f212ebe0f0 Simplified travis builds (external setup scripts) 2013-03-28 21:11:38 +01:00
Ingo Schommer
51c00e33e6 Merge remote-tracking branch 'origin/3.1' 2013-03-27 12:12:21 +01:00
Ingo Schommer
18201c05af Fixed Config usage in ErrorPage 2013-03-27 12:00:55 +01:00
Ingo Schommer
f73a5c68f3 FIX VirtualPageTest memory errors due to Config API quirks 2013-03-27 10:59:17 +01:00
Ingo Schommer
8eb3840325 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	code/controllers/ReportAdmin.php
	code/reports/Report.php
	tests/reports/CmsReportsTest.php
2013-03-26 10:58:07 +01:00
Ingo Schommer
0ebd52516b FIX Unset "underneath page" title when switching to "top" in "add page" 2013-03-25 23:41:21 +01:00
Ingo Schommer
51c8e8639e API Marked statics private, use Config API instead (#8317)
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:21:04 +01:00
Ingo Schommer
1f14654649 CMSMain->LinkWithSearch() visibility
Required for tree links retaining search state
2013-03-19 22:13:10 +01:00
Ingo Schommer
c3b4d68664 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	code/controllers/SilverStripeNavigator.php
2013-03-19 14:04:24 +01:00
Ingo Schommer
0aeace2aec Merge remote-tracking branch 'origin/2.4' into 3.0
Conflicts:
	code/CommentAdmin.php
2013-03-19 13:51:22 +01:00
Ingo Schommer
75c77c4361 Merge pull request #304 from g4b0/8300-allowed-children-contextual-menu
Re-indexed disallowed array because of json_encode issue
2013-03-19 01:24:28 -07:00
Ingo Schommer
79c9d31099 Merge pull request #303 from uniun/patch-1
BUG SilverStripeNavigator shows wrong message.
2013-03-19 01:23:21 -07:00
g4b0
9037aa8645 Re-indexed disallowed array because of json_encode issue with non-sequential array 2013-03-18 17:18:58 +01:00
uniun
e8f7f3db7f Make message always visible at the top of the page
Make message always visible at the top of the page like the message in CMS preview iframe.
2013-03-18 16:29:10 +02:00
uniun
db853f2c3c Make message always visible at the top of the page
Make message always visible at the top of the page like the message in CMS preview iframe.
2013-03-18 16:28:28 +02:00
uniun
5c933b40e5 BUG SilverStripeNavigator shows wrong message.
The message was always 'Published Site'.
Also there were no 'active' class on links.
2013-03-18 15:57:20 +02:00