silverstripe-framework/tests/behat/features
Ingo Schommer 2160fb8000 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/javascript/LeftAndMain.js
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
	tests/control/ControllerTest.php
2013-06-19 14:03:43 +02:00
..
bootstrap Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-19 14:03:43 +02:00
files NEW Support for Behat tests, and initial set of tests 2012-11-16 15:31:55 +13:00
insert-an-image.feature Behat: "Insert image from web" feature 2013-06-07 16:10:21 +02:00
login.feature NEW Support for Behat tests, and initial set of tests 2012-11-16 15:31:55 +13:00
manage-files.feature Behat: Fixed step notation 2013-06-06 15:26:50 +02:00
manage-users.feature Behat: Use explicit fixtures 2013-06-05 14:32:42 +02:00
profile.feature Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-05 15:17:06 +02:00