Commit Graph

3934 Commits

Author SHA1 Message Date
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
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
Sean Harvey
20f044cef0 BUG Fixing regression from silverstripe/sapphire/67d1327
Status flag classes didn't pick up styling because the flag was
changed to prefix "status-".
2013-05-26 12:31:15 +12:00
Will Rossiter
2809b009a1 Merge pull request #186 from silverstripe-rebelalliance/api/translation_priority
Add config fragment for new i18n ordering system
2013-05-25 00:59:08 -07:00
Simon Welsh
e8f6b416d7 Revert call to setCheckModelPermissions() 2013-05-25 13:56:02 +12:00
Sean Harvey
9c1a69ae08 Merge pull request #755 from patbolo/restored-page-correct-title
FIX Correct page title shown when restoring a page, instead of html of t...
2013-05-24 18:45:38 -07:00
jean
698a75d903 FIX Correct page title shown when restoring a page, instead of html of tree node 2013-05-25 11:37:26 +12:00
Will Rossiter
ae494b01bc Merge pull request #259 from chillu/pulls/perms-opt-in
FIX: Respect model permissions in AssetAdmin
2013-05-24 15:44:55 -07:00
Sean Harvey
7f174f0a8d Merge pull request #754 from phptek/bug/073
BUGFIX: Content authors with SiteTree#canView() but not SiteTree#canEdit...
2013-05-22 20:10:25 -07:00
Russell Michell
9281ebc647 BUGFIX: Content authors with SiteTree#canView() but not SiteTree#canEdit() were unable to click on SiteTree items in the CMS.
- The 'disabled' attribute in <li> will now only render if the author _really_ can't do _anything_
2013-05-23 14:48:24 +12:00
Ingo Schommer
417bef9948 Merge pull request #700 from oddnoc/successfullyinstalled-fix
Return 410 for successfullyinstalled after install files are gone
2013-05-22 12:40:56 -07:00
Ingo Schommer
f64488b0d8 Merge pull request #751 from madmatt/fix_for_cms_issue_750
Fix Issue #750
2013-05-22 12:21:09 -07:00
Fred Condo
cd81d327ac Return 410 for successfullyinstalled after install files are gone
It was possible to append '/successfullyinstalled' to any SilverStripe
URL (with the cms module present), and the code would run, including
republishing the 404 page.

Now, if the install.php file is gone, this controller method throws the
410 (Gone) status code. The 410 status is chosen rather than 404 to
mitigate the likelihood that crawlers such as the Googlebot will follow
stray links to this URI.
2013-05-21 15:11:57 -07:00
Matt Peel
3cc6485c14 Add default params to _t() calls to ensure if a translation isn't found, it falls back to a useful English string 2013-05-21 14:57:29 +12:00
Ingo Schommer
b2e9353755 Merge pull request #701 from tractorcow/3.1-api-updaterelativelink
API Added SiteTreeExtension::updateRelativeLink
2013-05-17 05:05:03 -07:00
Ingo Schommer
041a8bd5a7 Update github path 2013-05-17 13:30:33 +02:00
Ingo Schommer
cf81c32dd8 Merge pull request #740 from kinglozzer/3.1
FIX 'Add new' page button missing ParentID
2013-05-17 04:17:03 -07:00
Sean Harvey
180defd2ca Merge pull request #745 from mateusz/alternate-preview-link
API Add a missing hook so we can override the SiteTree preview link.
2013-05-16 20:18:49 -07:00
Mateusz Uzdowski
bccd2f8e51 API Add a missing alternatePreviewLink hook for SiteTree extensions. 2013-05-17 15:00:08 +12:00