Ingo Schommer
306b0d77e4
Updated translations
2013-02-26 13:27:07 +01:00
Ingo Schommer
1ef155fc18
Hardcode travis branch on dependencies, otherwise breaks pull request builds
...
Pull requests are always on a branch, and this branch
typically is not present on the installer.
This changes means we need to be careful when merging into 3.1
and master, but that's a necessary evil.
2013-02-18 14:13:24 +01:00
Ingo Schommer
b984f296f7
Merge pull request #288 from ARNHOE/patch-2
...
Translation: nl_NL.js
2013-02-18 03:11:27 -08:00
ARNHOE
b36ab5acaa
Create nl_NL.js
2013-02-18 03:02:45 -08:00
Ingo Schommer
e809e0775e
Updated translations
2013-02-18 01:20:00 +01:00
Ingo Schommer
2402a8fbd4
Merge remote-tracking branch 'origin/2.4' into 3.0
2013-02-17 22:44:34 +01:00
Ingo Schommer
a0e965b7b4
Revert "FIX: updateCMSFields not accepting var by reference"
...
This reverts commit e56a78b160
.
2013-02-06 18:59:51 +01:00
Ingo Schommer
97fbfd3f12
FIX Respect escaping rules on readonly fields in CMS history view
...
Avoids showing unescaped HTML on fields which didn't allow it otherwise,
e.g. TextField. This also fixes problems with SiteTree->ExtraMeta
which got evaluated within the CMS. If this section contains any
JavaScript it gets executed and can disrupt CMS operation.
2013-02-04 17:16:15 +01:00
Ingo Schommer
1525684e68
Merge pull request #284 from mandrew/patch-1
...
FIX: updateCMSFields not accepting var by reference
2013-02-04 04:58:28 -08:00
Michael Andrewartha
e56a78b160
FIX: updateCMSFields not accepting var by reference
...
updateCMSFields should be taking the fields var by reference.
@see https://github.com/silverstripe/sapphire/pull/1156
2013-02-04 12:55:29 +00:00
Ingo Schommer
4269f94126
Merge pull request #283 from UndefinedOffset/3.0
...
ENHANCEMENT: Hide SilverStripeNavigator_CMSLink when in a LeftAndMain extension not just CMSMain extensions
2013-02-02 03:34:38 -08:00
UndefinedOffset
119d8aa892
ENHANCEMENT: Do not display SilverStripeNavigator_CMSLink when in a LeftAndMain extension not just CMSMain extensions
2013-02-01 14:16:19 -04:00
Ingo Schommer
74a44933b2
Excluded Postgres from Travis (breaks build due to internal errors)
...
We'll need to fix the "no space left on device" issue,
most likely caused by Postgres keeping too much of a query log,
or somehow creating a history of past data.
For now, having a Postgres build breaking the whole
build process (incl. MySQL builds) does more harm than good.
2013-01-30 13:07:38 +01:00
Ingo Schommer
b25063b09c
Extracted ErrorPage default data to getter
...
Allows for less verbose overloading, while still keeping i18n capabilities
in place, which isn't possible with DataObject::$default_records
2013-01-30 13:07:11 +01:00
Ingo Schommer
416178b668
Reduced code duplication in ErrorPage (no functional changes)
2013-01-29 19:34:05 +01:00
Ingo Schommer
b15b98345f
Using new "Security.login_url" configuration value
2013-01-29 18:06:49 +01:00
Ingo Schommer
d0585e484a
Updated translations
2013-01-21 11:57:12 +01:00
Sean Harvey
4999e5d886
Merge pull request #274 from unclecheese/patch-2
...
MINOR: Grammar error
2013-01-17 11:57:48 -08:00
unclecheese
cfc976bff8
MINOR: Grammar error
2013-01-17 14:31:35 -05:00
Ingo Schommer
0dd6dedab2
Moving "edit tree" button next to "add new" ( fixes #8119 )
2013-01-16 00:19:56 +01:00
Ingo Schommer
cb96255e80
Removed direct sprintf() usage from _t() calls
...
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
2012-12-21 11:18:18 +01:00
Ingo Schommer
894d48789c
String casting in SimpleXML tests for older phpunit versions
2012-12-17 17:32:46 +01:00
Ingo Schommer
83febeff12
Updated translations
2012-12-17 11:54:22 +01:00
Sam Minnée
a0d04e8843
Merge pull request #258 from creamarketing/assetadmin-root-pagination
...
BUG: Fixed pagination functionality on root assets folder
2012-12-13 18:07:49 -08:00
Niklas Forsdahl
d42c0041d2
BUG: Fixed pagination functionality on root assets folder
...
Moving to another page in the GridField for the root assets folder in AssetAdmin
caused all files to be displayed. This was caused by the functionality that tries
to fix some edge cases for detail view kicked in and didn't filter the list properly.
Fixed by making the edge case detection a little more specific (i.e. checking if
a numeric ID was sent as a request variable).
2012-12-13 16:31:19 +02:00
Ingo Schommer
611c3f1b2e
Added travis environment info output
2012-12-12 15:14:11 +01:00
Ingo Schommer
4fa4ae726b
Adjusted Behat steps to new definition format
2012-12-10 15:38:32 +01:00
Ingo Schommer
5922c1ea35
Merge pull request #252 from silverstripe-droptables/dependent-pages-fix
...
BUG Remove handwritten SQL and use the ORM.
2012-12-06 05:53:49 -08:00
Ingo Schommer
4c525fe801
Fixed composer.json dependencies
2012-12-04 23:01:41 +01:00
Mateusz Uzdowski
c0751df54e
BUG Remove handwritten SQL and use the ORM.
...
The custom SQL does not take subsites into account and breaks the CMS
on certain pages - under some circumstances the custom count will return
1 or more, while the set will be in fact empty because of augmentation.
2012-12-05 10:27:12 +13:00
Ingo Schommer
41aec54e88
BUG Consistently use FormResponse in CMS JavaScript ( fixes #8036 )
...
Regression caused by a security fix in 9bf3ae9a190
2012-12-04 12:07:17 +01:00
Ingo Schommer
75e58c9508
More graceful handling of missing GET data in ModelAdmin
...
See https://github.com/silverstripe/silverstripe-cms/pull/253
2012-12-04 11:38:32 +01:00
Ingo Schommer
e5f206065e
Using $TRAVIS_BRANCH again, since its now available on travis-ci.org
2012-11-28 16:33:50 +01:00
Kirk Mayo
40a1a35618
BUG Namespaces for CmsFormsContext and CmsUiContext are wrong
2012-11-26 01:16:02 +01:00
Hamish Friedlander
5a5770db5c
Merge changes for 3.0.3 release into 3.0
2012-11-26 11:38:12 +13:00
Hamish Friedlander
d9e1bec289
FIX CMS reference to Framework should avoid using self.version
2012-11-26 11:06:22 +13:00
Ingo Schommer
8d5cea550c
TRAVIS_BRANCH doesn't seem to be set in before_script, hardcoding
2012-11-23 16:31:51 +01:00
Ingo Schommer
e67474293f
More verbose travis build process
2012-11-23 16:20:14 +01:00
Ingo Schommer
b42cb5c308
Passing through $TRAVIS_BRANCH to before_script
2012-11-23 16:10:07 +01:00
Ingo Schommer
47e14f5e56
Fixed $TRAVIS_BRANCH env var usage in before_script
...
Fixes "class TableListField not found" errors in travis.
Before that, we've been testing the 3.0 cms with
master framework, which of course is a bad idea ;)
2012-11-23 15:59:01 +01:00
Ingo Schommer
ff1df3696f
Limiting redirection-follow to specific tests in CMSMainTest
...
Fixes *some* quirks when running tests with
the 'translatable' module enabled (which redirects
to URLs with ?locale=<locale> in the CMS by default).
2012-11-23 15:30:11 +01:00
Ingo Schommer
8659c27487
Remove unused set_up_once() invocations from various tests
...
SapphireTest method name was changed to instance method
and setUpOnce() naming in mid 2010 already (093da759).
Since those methods were never invoked, they're obsolete.
Checked that the SiteTree-related tests pass with
Translatable enabled.
2012-11-23 13:58:54 +01:00
Ingo Schommer
6eb597a2d5
Fixed travis.yml paths
2012-11-21 14:03:04 +01:00
Sean Harvey
1529cd1539
Merge pull request #241 from icecaster/patch-4
...
MINOR removed reference to non existent js
2012-11-18 20:00:02 -08:00
Tim Klein
59719a46cc
MINOR removed reference to non existent js
...
cms/javascript/SitetreeAccess.js is no longer with us :)
2012-11-19 16:15:57 +13:00
Ingo Schommer
65fe8e5ae3
Fixed line length
2012-11-19 01:18:01 +01:00
Kirk Mayo
d58b23d6fa
BUG AssetAdmin filter array indices ( fixes #8014 )
2012-11-19 00:51:12 +01:00
Sam Minnée
2227e7d152
Merge pull request #236 from chillu/pulls/behat
...
Behat Tests
2012-11-15 18:35:41 -08:00
Will Rossiter
2e8d9ede93
Merge pull request #237 from drzax/urlsegmentfield
...
FIX fallback text for translations.
2012-11-14 23:16:03 -08:00
Simon Elvery
91e48b850c
BUGFIX Provide fallback text for translations.
2012-11-14 10:03:05 +10:00