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
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
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
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
Ingo Schommer
20a817875a
Shortened behat.yml
2012-11-14 00:51:21 +01:00
Ingo Schommer
df23a6ce1a
Corrected step wording
2012-11-14 00:51:21 +01:00
Ingo Schommer
9841d5b074
NEW Added Behat tests
2012-11-14 00:51:21 +01:00
Stig Lindqvist
36220c9617
Updated license in readme to include year 2012
2012-11-13 22:35:26 +13:00
Ingo Schommer
3ffb90125d
Correct branch for Travis build status image
2012-11-09 13:21:20 +01:00
Will Rossiter
625d5062a2
Merge pull request #232 from drzax/urlsegmentfield
...
FIX: Load required CSS and translation files for SiteTreeURLSegmentField
2012-11-07 21:01:12 -08:00
Simon Elvery
6a69a2f71a
BUGFIX Ensure required lang and css are loaded when using SiteTreeURLSegmentField
2012-11-08 12:53:43 +10:00
Sean Harvey
5da4b5a0ce
Updating default en.yml translations
2012-11-07 11:43:31 +13:00
Ingo Schommer
abba77af51
Fixes required for jQuery UI 1.9
2012-11-06 15:54:37 +01:00
Sam Minnee
ef32310ef8
FIX: Allow 1024 chars for keywords, not a mere 255
2012-11-05 17:58:32 +13:00
Sean Harvey
2ae5c497af
Updated translations
2012-11-05 11:55:51 +13:00
Sean Harvey
b00397968b
Tweaking text for "You can start editing" on successful install
2012-11-05 11:12:49 +13:00
Sean Harvey
0964a5b832
Updating default en.yml with updated entities
2012-11-05 11:08:35 +13:00
Stig Lindqvist
fa348d6666
MINOR Code refactoring of CMSMain::SearchForm() extracted some methods.
2012-11-02 23:52:24 +01:00
Saophalkun Ponlu
79cc947ed8
Batch actions UI enhancement ( #7878 )
2012-11-02 23:05:20 +01:00
Ingo Schommer
f0810dc772
Added composer.json
2012-11-01 17:22:25 +01:00
Ingo Schommer
750d0b48a8
Merge remote-tracking branch 'origin/2.4' into 3.0
2012-10-30 17:22:59 +01:00
