Ingo Schommer
76b99e4006
Fixed tests without assertions
2012-11-23 15:52:00 +01:00
Ingo Schommer
26bdee4f08
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
tests/model/SiteTreeTest.php
2012-11-23 15:31:03 +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
d92f04dde2
Merge pull request #243 from silverstripe-droptables/incorrect-bc-nesting
...
BUG Incorrect html nesting of breadcrumbs
2012-11-22 15:28:57 -08:00
Ingo Schommer
e6e12fe00e
Merge branch '3.0'
...
Conflicts:
composer.json
2012-11-22 23:48:18 +01:00
Naomi Guyer
4fab9b8248
BUG Incorrect html nesting of breadcrumbs
...
Removed h2 from outside breadcrumbs, and put it within the breadcrumbs
div
Relies on sapphire commit 72b4fbf
2012-11-22 12:19:38 +13: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
Sean Harvey
4c73f23ddb
Removing deprecated FileList as it relies on TableListField
...
This has been moved to "legacytablefields" module
https://github.com/silverstripe-labs/legacytablefields
2012-11-16 12:42:04 +13:00
Will Rossiter
2e8d9ede93
Merge pull request #237 from drzax/urlsegmentfield
...
FIX fallback text for translations.
2012-11-14 23:16:03 -08:00
Stig Lindqvist
8b561b7604
Merge pull request #239 from halkyon/deprecation_cleanup
...
Deprecation cleanup
2012-11-14 18:57:47 -08:00
Sean Harvey
cef087f689
Removed deprecated SiteTree::TreeTitle(), use getTreeTitle() instead
2012-11-15 14:41:17 +13:00
Sean Harvey
d236bb58eb
Removed deprecated SiteTree::prepopuplate_permission_cache()
...
This function is misspelled, and was marked deprecated. This commit
removes that function. Please use prepopulate_permission_cache()
instead (note the removal of the extraneous "p" in "prepopuplate")
2012-11-15 14:39:48 +13:00
Sean Harvey
94b37dbeb0
Fixing AssetAdmin to use static FormField::create_tag()
...
Instead of createTag() which is deprecated
2012-11-15 14:32:52 +13:00
Sean Harvey
33884acbc5
Removed deprecated ContentController::LangAttributes()
...
Use ContentLocale() instead and write attribute names suitable
to XHTML/HTML instead
2012-11-15 14:32:21 +13:00
Sean Harvey
555ecd7f24
Removed deprecated SiteTreeDecorator, use SiteTreeExtension instead
2012-11-15 14:31:54 +13:00
Sean Harvey
35bcf69c01
Removed deprecated Register::register() and unregister()
...
Report automatically includes reports instead, and
add_excluded_reports() can be used to exclude certain reports
2012-11-15 14:30:47 +13: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
Simon Welsh
d006c08db3
Reverts test code committed in a52514a3
2012-11-10 15:42:45 +13:00
Ingo Schommer
3ffb90125d
Correct branch for Travis build status image
2012-11-09 13:21:20 +01:00
Ingo Schommer
3f24b0fc17
Added README with build status
2012-11-09 13:14:28 +01:00
Ingo Schommer
65793e2b38
Added travis support
2012-11-09 13:07:23 +01:00
Ingo Schommer
0fe93796c4
Composer branch alias from dev-master to 3.1
...
Satisfies the "3.*" requirements added to most modules
2012-11-08 17:03:35 +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
Andrew O'Neil
b31188f252
APICHANGE: Use late static binding for Object::has_extension()
2012-11-07 11:08:36 +13:00
Andrew O'Neil
48a9bcf276
APICHANGE: Use late static binding for Object::remove_extension()
2012-11-07 11:08:36 +13:00
Andrew O'Neil
1722f00869
APICHANGE: add_extension() is now called directly on the class, instead of on Object
2012-11-07 11:08:36 +13:00
Sean Harvey
381ab72860
Merge pull request #231 from chillu/pulls/tab-consolidation
...
ENHANCEMENT Tab style consolidation and design consistency
2012-11-06 13:36:30 -08:00
Ingo Schommer
a52514a306
ENHANCEMENT Tab style consolidation and design consistency
2012-11-06 22:24:01 +01:00
Ingo Schommer
bd86cf2c50
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
code/model/SiteTree.php
2012-11-06 19:56:04 +01: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
79e6304ce1
Merge branch '3.0'
2012-11-05 15:13:06 +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
600c73086b
Merge pull request #223 from adrexia/7883-File-Uploading-Notifications
...
BUG: File Uploading Notifications (fixes #7883 )
2012-11-02 14:08:20 -07:00
