Arno Poot
afd9f28279
Updated siteconfig layout to be more like modeladmin
2013-07-26 17:45:28 +02:00
Simon Welsh
f937b95eaf
Merge pull request #799 from ARNHOE/3.1
...
Updated templates to be more consistent and removed trailing spaces
2013-07-18 12:49:04 -07:00
Arno Poot
184aeabcb4
Updated templates to be more consistent and removed trailing spaces
...
Edit
2013-07-18 13:14:29 +02:00
Will Rossiter
2c384cb380
Templates
2013-07-15 21:29:38 +12:00
Simon Welsh
ff18abb994
Merge branch '3.0' into 3.1
...
Conflicts:
.travis.yml
2013-07-14 17:24:06 +12:00
Simon Welsh
3a3e8f2faa
Adds LoginForm as an allowed action
...
Behaves as a form method defined on ContentController
2013-07-14 17:21:59 +12:00
Simon Welsh
094039dbc8
Remove PHP 5.5 from allowed failures
2013-07-14 17:21:18 +12:00
Ingo Schommer
9417092040
Fixed installer message escaping, unified usage ( fixes #2211 )
...
Same entity was already fixed in a different file,
we can't have them use different strings, so used the new one instead.
2013-07-10 10:29:04 +02:00
Mateusz U
f7031b799b
Merge pull request #792 from hafriedlander/fix/stageaccess
...
FIX Not checking stage in SiteTree#canView
2013-07-04 18:30:05 -07:00
Hamish Friedlander
a5f00ae2c3
FIX Not checking stage in SiteTree#canView
...
SiteTree versions that arent the live version shouldnt be accessed by
regular users, but the logic to check that was split off into canViewStage,
which wasnt checked by code that isnt specifically SiteTree aware
(like RestfulServer)
2013-07-05 12:14:22 +12:00
Ingo Schommer
2545f41bdc
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
.travis.yml
2013-07-05 00:22:14 +02:00
Ingo Schommer
e194b962db
PHP 5.5 CI, don't allow failures for sqlite3 and postgres
2013-07-04 23:01:09 +02:00
Ingo Schommer
a2c2be2ad5
Correct form name in CMSFileAddController, fixes upload
...
Fixes https://github.com/silverstripe/silverstripe-framework/issues/2172
2013-07-02 09:33:38 +02:00
Ingo Schommer
0bd257c8fc
Merge pull request #770 from chillu/pulls/cmsform
...
Using new CMSForm class to allow for validation errors in CMS
2013-06-28 02:54:09 -07:00
Ingo Schommer
98750a9cf1
Merge pull request #772 from chillu/pulls/sitetree-urlsegment-votes
...
API SiteTree->validURLSegment() prioritizes extension votes
2013-06-25 02:18:08 -07:00
Ingo Schommer
e324e9fc4e
Merge pull request #778 from silverstripe/pulls/allowed_actions-deny
...
Fix AssetAdmin::$allowed_actions
2013-06-25 01:07:31 -07:00
Ingo Schommer
aeacbc38aa
Fix AssetAdmin::$allowed_actions
2013-06-21 00:54:28 +02:00
Ingo Schommer
f03f396b35
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-06-19 14:03:49 +02:00
Ingo Schommer
f2a9f9aa0a
ErrorPageTest: Reset env state
...
Otherwise SapphireTest will complain, see 0da70dafa457564a6adb02140ffeb5dd01f3a982
2013-06-19 13:17:22 +02:00
Ingo Schommer
8e7802f8a1
Fixed spelling mistake in SilverStripeNavigator
...
Thanks to Donald Rogers for pointing it out
2013-06-18 18:27:49 +02:00
Ingo Schommer
a136170f55
Merge pull request #765 from jthomerson/enhancement_3.1_allow_disabling_generator_meta_tag
...
ENHANCEMENT: allow sites to override meta generator tag
2013-06-17 13:43:58 -07:00
Jeremy Thomerson
b8908efdf7
ENHANCEMENT: allow sites to override meta generator tag
2013-06-17 20:35:14 +00:00
Mike Parkhill
c7f14129ea
FIX #651 Broken redirection after creating new folder in assets
2013-06-13 14:58:09 +02:00
Ingo Schommer
2deb525d47
Using new CMSForm class to allow for validation errors in CMS
...
This class allows deferring handling of responses to the parent
controller's response negotiator implementation.
2013-06-13 07:44:37 +02:00
Ingo Schommer
0c4b2f8157
API SiteTree->validURLSegment() prioritizes extension votes
...
Tri-state, use NULL to ignore the extension result
2013-06-12 12:32:42 +02:00
Ingo Schommer
4bc942df76
Merge pull request #761 from jonom/patch-1
...
FIX #527 : Add Thumbnails to 'Choose another file' dialogue
2013-06-11 00:01:00 -07:00
Ingo Schommer
e9fe4f7c68
Behat: Removed unnecessary access-user-help.feature
...
It doesn't add much value in terms of testing
(can't see how we'd ever mess up the "Help" menu entry),
and it relies on the availability of an external resource
(userhelp.ss.org), making the tests more brittle.
It also breaks the feature following this one, because
somehow Behat doesn't reset the browser session, so
subsequent logins fail because a login still exists.
2013-06-07 11:42:02 +02:00
Ingo Schommer
5476bbeefb
Behat: Fixed indentation (no functional changes)
...
Using tabs consistently
2013-06-07 10:21:05 +02:00
Stig Lindqvist
b3f31d8e6f
Behat: New feature "Edit site wide title and tagline" #619
2013-06-07 17:46:37 +12:00
Mike Parkhill
ea29c1276b
Behat: Adding user help scenario #607
2013-06-07 17:46:15 +12:00
Stig Lindqvist
08850da71e
Behat: Type case in step definition
2013-06-07 16:17:44 +12:00
Stig Lindqvist
2a8307d794
Behat: Adding page publishing scenarios #616
2013-06-07 15:04:43 +12:00
Stig Lindqvist
a6be891214
Behat: Save draft notifications have changed
2013-06-07 11:40:46 +12:00
Ingo Schommer
df1836add2
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/behat/features/edit-a-page.feature
tests/behat/features/preview-a-page.feature
2013-06-05 14:39:21 +02:00
Ingo Schommer
d2105ef7a6
More verbose fixture step definitions
...
Too many clashes with other steps otherwise,
e.g. with 'And the preview contains "You can fill"'.
Also removed some duplicated code no longer necessary
because we use inheritance rather than composition
2013-06-05 14:25:29 +02:00
Ingo Schommer
8bd1e4373d
Behat: Fixed spelling in test
2013-06-05 13:37:19 +02:00
Ingo Schommer
47d7a19a23
Behat: Replace @database-defaults with explicit fixtures
2013-06-05 13:30:15 +02:00
Ingo Schommer
e7cc08f6ae
Behat: Auto-publishing SiteTree fixtures, RedirectorPage fixtures
...
They can be unpublished through an explicit step.
Extending from base FeatureContext in order to easily
share the same FixtureFactory but still add new blueprints to it.
2013-06-05 13:29:48 +02:00
Will Rossiter
347f2232f4
Merge pull request #764 from adrexia/filter-class
...
Add generic notice class to filter panels
2013-06-03 18:59:18 -07:00
Naomi Guyer
9dfc0b0e76
Add generic notice class to filter panels
...
* Added cms-notice class to filter panels for easier reuse of styles
2013-06-04 12:05:11 +12:00
Ingo Schommer
b7b2839df7
Don't show "edit tree" in list view ( fixes #627 )
2013-06-03 14:11:01 +02:00
g4b0
238f2908e5
BUG: fixed "regression" inserted with 9281ebc647
adding a new class to SiteTree elem (edit-disabled)
2013-06-03 13:46:10 +02:00
Ingo Schommer
5175352ed1
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-06-03 00:22:22 +02:00
Ingo Schommer
46d62efd81
Updated translations
2013-06-03 00:14:09 +02:00
jonom
d8885d0b31
Reflect changes in scss file
2013-05-31 18:31:42 -05:00
jonom
97489b6b18
Allow asset admin styles to be used in 'Choose another file' dialogue of UploadField
...
I've added thumbnails to the 'Choose another file' dialogue, this style change allows for that gridfield to be styled the same way with compact rows
2013-05-31 18:12:19 -05:00
Ingo Schommer
bd86ff848c
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
javascript/CMSMain.Tree.js
2013-05-31 17:53:05 +02:00
Sean Harvey
206f09ab65
Merge pull request #757 from mparkhill/651-assets-broken-redirection
...
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 15:04:22 -07:00
Sean Harvey
fbf6faf947
Merge pull request #756 from halkyon/status_flag_class_fix
...
BUG Fixing regression from silverstripe/sapphire/67d1327
2013-05-27 01:28:23 -07:00
Mike Parkhill
85f5a45951
FIX #651 Broken redirection after creating new folder in assets
2013-05-27 17:21:07 +12:00