micmania1
47582b3e3c
getViewer will now locate and use the correct templates for pages which don't have their own controller
2013-12-20 20:52:11 +00:00
Andrew Short
e17fb17520
Merge branch '3.1'
...
Conflicts:
lang/es.yml
2013-11-11 18:24:03 +11:00
Ingo Schommer
e2fa3b7f2c
Updated translations
2013-11-08 00:59:07 +01:00
Damian Mooyman
f9c3f4d1cc
Merge pull request #889 from chillu/pulls/2638-uploadfield
...
Disable UploadField change detection in assets/admin/add
2013-11-06 17:16:17 -08:00
Ingo Schommer
77ef09e857
Merge pull request #801 from ss23/refactor-old-page-redirector
...
Refactor old page redirector into an extension
2013-11-06 02:14:38 -08:00
Stephen Shkardoon
f972466880
Refactor old page redirector into an extension
2013-11-06 23:00:50 +13:00
Ingo Schommer
2d0ee2ca91
Disable UploadField change detection in assets/admin/add
...
See https://github.com/silverstripe/silverstripe-framework/issues/2638
2013-11-06 10:08:15 +01:00
Ingo Schommer
35a84e4eae
Merge pull request #884 from chillu/pulls/js-i18n-3.1
...
API JS i18n files with short locale names, generated by build task
2013-11-01 04:24:34 -07:00
Will Rossiter
5101db9472
Merge pull request #888 from kinglozzer/patch-1
...
Set default encoding for compass
2013-10-29 22:37:26 -07:00
Loz Calver
634ee2e8b6
Set default encoding for compass
...
See https://github.com/silverstripe/silverstripe-framework/pull/2620
2013-10-29 10:51:01 +00:00
Will Rossiter
a24d84a6df
Merge pull request #887 from trev/patch-1
...
Fix comment typo
2013-10-27 22:24:36 -07:00
Trevor
e3724e9207
Fix comment typo
2013-10-28 13:48:31 +11:00
Ingo Schommer
b726180ab8
API JS i18n files with short locale names, generated by build task
...
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.
See https://github.com/silverstripe/silverstripe-buildtools/commit/b59f3858afd5c46219a42b04b2742c7d24
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
2013-10-25 01:26:57 +02:00
Ingo Schommer
79c0b6cf28
Merge pull request #881 from kinglozzer/framework-1905-controller-inheritance
...
NEW: Page types no longer require their own controller (fixes silverstripe/silverstripe-framework#1905 )
2013-10-23 11:01:42 -07:00
Loz Calver
b6589ba9a9
NEW: Page types no longer require a controller, they can inherit the parent page type's
...
Use ClassInfo::ancestry() instead of get_parent_class()
Fall back to ContentController by default
2013-10-23 16:44:59 +01:00
Ingo Schommer
ef0f633f46
Merge remote-tracking branch 'origin/3.1'
2013-10-23 14:53:33 +02:00
Ingo Schommer
3d9fc2cc4c
Default CMSMain to Versioned::reading_stage("Stage")
...
Regression caused by https://github.com/silverstripe/silverstripe-framework/pull/2585
2013-10-23 14:29:24 +02:00
Mateusz U
27c8122123
Merge pull request #880 from halkyon/fulltextsearch_text
...
ContentControllerSearchExtensionTest doesn't clean up after itself.
2013-10-21 21:14:34 -07:00
Sean Harvey
ed8ee4e9b8
ContentControllerSearchExtensionTest doesn't clean up after itself.
...
The problem is FulltextSearchable::enable() does two things:
It enables the extension, as well as sets the MySQL create table option
to MyISAM. Later tests run with the extension enabled, because it doesn't
get removed at the end of the test, but the table type is set back to
InnoDB when the test is reset and schema recreated.
This produces side-effects where later tests in a suite tries to run
ALTER TABLE on File and add fulltext indexes when the table type
is set to InnoDB, causing an error.
2013-10-22 15:26:40 +13:00
Ingo Schommer
da1a875c4f
Revert "Moved Behat reports tests to module"
...
This reverts commit 50a48aa25d
.
The test in question relies on SiteTree data *as well* as the
reports module, so needs to be placed here.
2013-10-21 09:33:45 +02:00
Ingo Schommer
c645d76b1f
Merge pull request #879 from sheadawson/833-currentPageID
...
Add hook for extensions to update current page id, before falling ...
2013-10-21 00:24:06 -07:00
sheadawson
1b5465809d
MINOR add hook for extensions to update current page id, before falling back to default
2013-10-21 17:42:45 +11:00
Ingo Schommer
50a48aa25d
Moved Behat reports tests to module
2013-10-21 01:00:29 +02:00
Ingo Schommer
0a1ffd3e1a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2013-10-20 13:51:19 +02:00
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
Ingo Schommer
42a55be91a
Updated translations
2013-10-10 12:34:15 +02:00
Ingo Schommer
dd29936fee
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:10:20 +02: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
16d8505bbb
Merge remote-tracking branch 'origin/3.1'
2013-10-08 11:22:00 +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
f6c7bbb1ff
Merge remote-tracking branch 'origin/3.1'
2013-10-08 11:17:14 +02:00
Ingo Schommer
c0cc517635
Migrated behat features from framework
2013-10-08 00:23:44 +02:00
Ingo Schommer
0eb56f9650
Merge remote-tracking branch 'origin/3.1'
2013-10-07 16:19:55 +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