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,304 Commits 29 Branches 403 Tags 28 MiB
61d37fc084
Commit Graph

4304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ingo Schommer
b884671bfb Behat travis tests 2013-10-16 16:11:21 +02:00
Ingo Schommer
611772c5ec Merge pull request #876 from cieszak/3.1 
FIX Remove invalid single quote
 2013-10-15 16:13:40 -07:00
Dawid Cieszyński
69ae8a8fed FIX Remove invalid single quote 2013-10-16 00:06:41 +02:00
Ingo Schommer
aae6b2b296 Avoid encoded HTML breadcrumbs 2013-10-11 00:27:21 +02:00
Ingo Schommer
c8dc9a9377 Merge pull request #873 from ajshort/pull-2 
Add an extension hook for customising site tree hints.
 2013-10-10 09:23:03 -07:00
Andrew Short
68d254c3c4 Add an extension hook for customising site tree hints. 2013-10-11 01:31:07 +11:00
Ingo Schommer
b08c70748f Merge pull request #871 from simonwelsh/3.1-scroll 
Calculate where to scroll to based off the position in the div
 2013-10-10 03:48:24 -07:00
Simon Welsh
0c2514d13e Calculate where to scroll to based off the position in the div 
Also, only scroll if not currently visible.
 2013-10-10 15:42:49 +13:00
Simon Welsh
095c78426b Merge pull request #870 from ajshort/pull-1 
BUG: Fix add new button not passing the correct parent ID.
 2013-10-09 19:26:51 -07:00
Andrew Short
b7476f2a46 BUG: Fix add new button not passing the correct parent ID. 
The `%s` parent ID placeholder was being URL encoded, so it was not being
replaced properly when adding a new page. This fix separately adds
placeholder parameters to the URL to avoid this issue.

The fix is not ideal, but there is no easy way to indicate that some
URL parameters should be URL encoded and others should not while still
correctly constructing the URL.
 2013-10-10 13:09:24 +11:00
Ingo Schommer
c3e25e9e07 Merge pull request #863 from kinglozzer/2449-getcmsvalidator-restore-pages-fix 
FIX Don't validate pages when restoring or reverting (fixes silverstripe/silverstripe-framework#2449)
 2013-10-09 01:53:47 -07:00
Ingo Schommer
34a0fe3bf1 Chinese translation encoding 2013-10-08 12:20:21 +02:00
Ingo Schommer
6a8de3090c Updated Te Reo translations 2013-10-08 11:37:43 +02:00
Ingo Schommer
d532d05fc2 Moved manage-files.feature from framework 
It relies on AssetAdmin which is placed in the 'cms' module
 2013-10-08 11:20:50 +02:00
Ingo Schommer
c0cc517635 Migrated behat features from framework 2013-10-08 00:23:44 +02:00
Ingo Schommer
107e4b2713 Merge remote-tracking branch 'origin/tmp-3.1.0' into 3.1 2013-10-07 15:19:18 +02:00
Ingo Schommer
aa44e710d0 Updated translations 2013-10-07 14:28:12 +02:00
Ingo Schommer
413e45881b Updated translations 2013-10-07 01:18:15 +02:00
Ingo Schommer
6098457467 Updated master translation file 2013-10-06 23:25:58 +02:00
Ingo Schommer
d2ba127e41 Merge branch 'refs/heads/3.1.0' into 3.1 
Conflicts:
	lang/ar.yml
 2013-10-06 20:06:55 +02:00
Ingo Schommer
7bab37cde3 Updated translations 2013-10-06 19:40:16 +02:00
Ingo Schommer
2cb05428ff Merge branch 'refs/heads/3.1.0' into 3.1 2013-10-06 19:06:36 +02:00
Ingo Schommer
e836bbb907 Renamed "ja_JP" locale to "ja" 
Better compat with transifex with generic locale
 2013-10-06 19:06:21 +02:00
Ingo Schommer
648c2072e8 updated translations 2013-10-04 12:38:27 +02:00
Loz Calver
66bfff4d15 FIX Don't validate pages when restoring or reverting (fixes #2449) 
Use new method
 2013-10-03 16:54:38 +01:00
Ingo Schommer
0aae86b467 Merge pull request #862 from sheadawson/861-hiddenhints 
BUGFIX check if hints are defined for given pagetype before using.
 2013-10-03 01:36:05 -07:00
Shea Dawson
0d2d293c02 BUGFIX check if hints are defined for given pagetype before using. Fixes #861 2013-10-03 14:20:54 +13:00
Ingo Schommer
0437c0597d More resilient Behat checks for "page not found" 
Wrapping in a step to capture cases where the ErrorPage defaults
haven't been generated, and the default ModelAsController
message shows which is slightly different wording.
 2013-10-02 17:12:43 +02:00
Loz Calver
595a0375e7 Stop MenuTitle updating tree on change 
If the MenuTitle is changed and the tree updates, not saving the
changes to the page leaves the tree with the new title instead of the
old, correct one (until a refresh). This also seems counter-intuitive
anyway - suggesting to users that their updated MenuTitle has been
saved before it actually has.
 2013-10-02 12:53:03 +02:00
Ingo Schommer
26b086c3f7 Escape pl_PL.js (fixes #859) 2013-10-02 12:24:23 +02:00
Ingo Schommer
0c51d38841 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-10-02 12:21:55 +02:00
Ingo Schommer
2a4191d449 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-02 12:21:50 +02:00
Ingo Schommer
92e0c410b8 Fixed report link escaping 2013-10-02 12:19:23 +02:00
Ingo Schommer
52ab9e570a Fixed report link escaping 2013-10-02 12:01:34 +02:00
Ingo Schommer
fb9d7a595b FIX ReportAdmin report links regression 
Regression from 79996a76fe,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
 2013-10-02 11:50:00 +02:00
Ingo Schommer
64608ea622 Merge pull request #860 from ajshort/virtual-page-test-cache 
Fix test sometimes using cached relationship object.
 2013-10-02 02:44:28 -07:00
Andrew Short
1f4cdfced8 Fix test sometimes using cached relationship object. 
In some circumstances, the CopyContentFrom page will be cached, so when
it is accessed the incorrect value was returned, meaning the test
would fail.
 2013-10-02 15:03:50 +10:00
Ingo Schommer
956b6de05c Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-01 11:19:14 +02:00
Ingo Schommer
daf92e6ce0 FIX ReportAdmin report links regression 
Regression from 79996a76fe,
escaped quotes are no longer necessary because the string
doesn't get eval'ed.
 2013-10-01 11:17:36 +02:00
Ingo Schommer
e991b44994 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-10-01 01:45:33 +02:00
Ingo Schommer
c2a34ff4a7 Updated translations 2013-10-01 00:05:08 +02:00
Ingo Schommer
7ec9596b99 CMSMain assertion fail due to escaping 
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
 2013-09-30 22:44:44 +02:00
Ingo Schommer
1a48afd499 Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 19:39:23 +02:00
Ingo Schommer
30cf08b27e CMSMain assertion fail due to escaping 
Validation messages are now HTML entity escaped when output to the user,
the assertion needs to reflect that
 2013-09-27 19:38:12 +02:00
Ingo Schommer
0ee7a9ba38 Merge remote-tracking branch 'origin/3.1.0' into 3.1 2013-09-27 18:52:44 +02:00
Ingo Schommer
8a96bab70d Merge remote-tracking branch 'origin/3.0' into 3.1 2013-09-27 18:50:52 +02:00
Ingo Schommer
0b073d2d0f Merge tag '3.0.6' into 3.0 2013-09-27 00:20:35 +02:00
Ingo Schommer
fbb9a4449d Removed stale salad tests, got behat now 2013-09-26 10:53:19 +02:00
Ingo Schommer
dc1ae03fec Tagged 3.1.0-rc3 2013-09-26 01:42:31 +02:00
Ingo Schommer
9a4a5d909d Merge pull request #816 from kinglozzer/798-custom-page-icons 
Move CMSMain->generatePageIconsCss() into a LeftAndMain extension (fixes #798)
 2013-09-25 12:54:01 -07:00