Commit Graph

3904 Commits

Author SHA1 Message Date
Ingo Schommer
f0810dc772 Added composer.json 2012-11-01 17:22:25 +01:00
Ingo Schommer
7abb6eccc1 Added composer.json 2012-11-01 16:34:52 +01:00
TeamCity
6327d72b3c Merge remote branch 'origin/master' into translation-staging 2012-10-31 11:57:06 +13:00
Ingo Schommer
53e92a080a Merge pull request #226 from adrexia/asset-grid-filter
BUG: Filter in asset grid appears in incorrect place
2012-10-30 14:59:25 -07:00
TeamCity
7d12996efe Updated translations 2012-10-31 07:01:51 +13:00
TeamCity
059464524f Updated translations master 2012-10-31 06:55:50 +13:00
TeamCity
e53ff028ca Merge remote branch 'origin/master' into translation-staging 2012-10-31 06:55:38 +13:00
Ingo Schommer
7131e167f1 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	code/model/RedirectorPage.php
2012-10-30 17:54:55 +01:00
Ingo Schommer
750d0b48a8 Merge remote-tracking branch 'origin/2.4' into 3.0 2012-10-30 17:22:59 +01:00
Will Rossiter
b221f7ba7a FIX Remove Metadata Label from RedirectorPage. (Fixes #7959) 2012-10-23 19:32:25 +13:00
Naomi Guyer
0d642af136 BUG: Filter in asset grid appears in incorrect place
Moved the filter component in the asset gridfield to after the sortable
header
2012-10-23 15:00:49 +13:00
Sam Minnée
39c52397fb Merge pull request #225 from phptek/3.0
BUGFIX: Fixed SideReport for use with Postgres (using v8.4) which requir...
2012-10-22 14:08:32 -07:00
Russell Michell
72543440cb BUGFIX: Fixed SideReport for use with Postgres (using v8.4) which requires table/column-names to be quoted. MySQL seems OK with either/both 2012-10-19 16:04:32 +13:00
Sean Harvey
f72cef95e6 Merge pull request #224 from adrexia/3.0
BUG: Installation successful "CMS" link has broken href (fixes #7874)
2012-10-17 19:04:40 -07:00
Naomi Guyer
c9244456e0 BUG: Installation successful "CMS" link has broken href (fixes #7874)
Fixed the template component of this bug. Language files will also need
to be updated. eg. "Start editing" should appear in the en lang files
as:
StartEditing: 'You can start editing your site''s content by opening <a
href="{link}">the CMS</a>
2012-10-18 14:47:11 +13:00
Ingo Schommer
607fc58c8f Build status in README 2012-10-16 18:25:49 +02:00
Ingo Schommer
2f7e6a7303 Merge pull request #221 from adrexia/add-cms-buttons
BUG: Add "add new" button to Pages list view (fixes 7649)
2012-10-16 07:23:00 -07:00
TeamCity
0c7b662afb Updated translations 2012-10-16 22:46:01 +13:00
TeamCity
f2eee43fdc Merge remote branch 'origin/master' into translation-staging 2012-10-16 22:37:40 +13:00
Ingo Schommer
db3499cdf5 Merge remote-tracking branch 'origin/3.0' 2012-10-16 10:26:09 +02:00
Ingo Schommer
d298ec9bc1 Blacklisting further travis branches 2012-10-16 10:24:18 +02:00
Naomi Guyer
d61f16d54a BUG: File Uploading Notifications (fixes #7883)
* Moved allowed file types into a variable to be used in the template.
2012-10-16 18:43:10 +13:00
Sean Harvey
230e80a1d7 Merge pull request #222 from tractorcow/3.0-test-fixes
BUG Fixed issue with MigrateSiteTreeLinkingTaskTest
2012-10-15 21:02:39 -07:00
Damian Mooyman
d50cb230e4 BUG Fixed issue with MigrateSiteTreeLinkingTask test data being incorrectly loaded into database
Fixed issue
2012-10-16 16:48:27 +13:00
Naomi Guyer
06e184a97f BUG: Add "add new" button to Pages list view (fixes 7649)
Rearranged the templates around CMSPagesController_ContentToolbar and
uncommented the toolbar from the pages list view so the add new button
would be included with including actions that aren't applicable to the
gridfield.

Linked to https://github.com/silverstripe/sapphire/pull/684/commits
2012-10-15 14:59:04 +13:00
TeamCity
ece6541356 Merge remote branch 'origin/master' into translation-staging 2012-10-15 11:22:38 +13:00
Sean Harvey
8a0ae5653f Merge branch '3.0' 2012-10-15 10:10:52 +13:00
Ingo Schommer
0a92c81002 Merge pull request #217 from ryanwachtl/fixing-update-url-from-title
BUG Fixing Update URLSegment from Title behavior.
2012-10-12 09:27:44 -07:00
Ingo Schommer
196db98331 Added github-compatible contributing notes 2012-10-11 17:18:07 +02:00
Sean Harvey
98197525c6 Remove use of backticks in BrokenLinksReport, always use ANSI quotes 2012-10-11 17:24:23 +13:00
Sam Minnée
de4f207534 Merge pull request #208 from halkyon/upload_assets_changes
Uploads go to "assets/assets" instead of root of assets
2012-10-10 13:24:06 -07:00
TeamCity
587861c5ed Merge remote branch 'origin/master' into translation-staging 2012-10-09 05:19:49 +13:00
Ingo Schommer
17113039be NEW Enable SiteTree::$nested_urls by default 2012-10-08 17:05:46 +02:00
Ingo Schommer
27925f1c75 Merge remote-tracking branch 'origin/3.0' 2012-10-08 16:48:57 +02:00
Ingo Schommer
832dae209b Partially revert 90a154c888 (on JS files) 2012-10-08 16:44:28 +02:00
Ryan Wachtl
5a5290421b BUG Fixing Update URLSegment from Title behavior.
The class name of a field used to determine if a page was "new" had changed from LiveURLSegment = > LiveLink.
2012-10-05 22:40:10 -05:00
TeamCity
c3f861b5ec Updated translations 2012-10-06 13:21:47 +13:00
TeamCity
efbc8ea1f2 Merge remote branch 'origin/master' into translation-staging 2012-10-06 04:28:15 +13:00
Jeremy Bridson
76e569a8bb ENHANCEMENT: open/7886 added preview button to the settings page so that when a user changes the theme they can preview the change. 2012-10-05 16:27:13 +13:00
TeamCity
6bb124401a Updated translations 2012-10-05 03:07:44 +13:00
TeamCity
ec20a2a814 Updated translations 2012-10-04 23:34:12 +13:00
TeamCity
d1d38a44cd Updated translations 2012-10-04 22:22:46 +13:00
TeamCity
3cb30a9319 Merge remote branch 'origin/master' into translation-staging 2012-10-04 04:28:21 +13:00
Ingo Schommer
0d03c62984 Merge remote-tracking branch 'origin/3.0' 2012-10-03 16:16:25 +02:00
Ingo Schommer
a6d09988ed Merge pull request #214 from silverstripe-droptables/ssexpress
Tweaks to CMS required for Translatable
2012-10-02 02:10:47 -07:00
Robert Curry
9cf5a6f47a BUG: Remove the is_null check on augmentValidURLSegment
Object::extend already does a check for NULL before it adds the results
to the array of return values. This was required for Translatable as the
result from Translatable::augmentValidURLSegment was being ignored.
2012-10-02 11:29:10 +13:00
Robert Curry
7316f96190 BUG: Only add validation to non-read only URLSegmentField
Fix required for Translatable, as it has a read-only URLSegmentField.
2012-10-02 11:29:10 +13:00
Ingo Schommer
1c50eb540a Merge pull request #212 from bummzack/3.0
Fixing issue #7902. Users with limited rights can't access "Settings" in the CMS
2012-10-01 12:44:56 -07:00
TeamCity
e218ab978a Updated translations 2012-09-28 19:21:41 +12:00
TeamCity
054c5a98fb Merge remote branch 'origin/master' into translation-staging 2012-09-27 13:42:34 +12:00