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
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
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
Simon Welsh
38f28deafe
Adds Travis testing to the CMS
2012-09-27 13:00:49 +12:00
Simon Welsh
03ae8e3728
Merge pull request #213 from sminnee/http-error-catching
...
FIX Use RequestHandler::httpError() for all HTTP errors.
2012-09-26 18:00:32 -07:00
Sam Minnee
39792debb8
FIX Use RequestHandler::httpError() for all HTTP errors.
...
https://github.com/silverstripe/sapphire/pull/827 adds some extension points for catching HTTP errors such as 404. This change fixes some issues where httpError() isn't used all the time. Note that the aforementioned pull request will be necessary to ensure that it works properly.
2012-09-27 12:56:56 +12:00
Sean Harvey
b92f759963
Fixing test to be less fragile (selects the input ID directly instead of holder)
2012-09-27 12:14:14 +12:00
TeamCity
002587c54b
Merge remote branch 'origin/master' into translation-staging
2012-09-27 12:12:27 +12:00
Sean Harvey
cb8c10a473
Merge branch '3.0' of github.com:silverstripe/silverstripe-cms into 3.0
2012-09-27 10:49:03 +12:00
TeamCity
1ec0782a90
Updated translations
2012-09-27 02:56:43 +12:00
TeamCity
eb56a9afeb
Updated translations
2012-09-26 10:22:59 +12:00
TeamCity
3170974599
Updated translations
2012-09-26 08:21:19 +12:00
Roman
bde71c1b9c
Fixing permission issue with CMSSettingsController, where it won't show up for users with limited rights, even when they have the EDIT_SITECONFIG permission
2012-09-25 22:13:31 +02:00
TeamCity
d7d1ecaf1b
Updated translations
2012-09-26 07:21:53 +12:00
TeamCity
e28546a22c
Updated translations
2012-09-26 06:21:27 +12:00
TeamCity
63b86bd5b9
Updated translations
2012-09-25 22:26:05 +12:00
TeamCity
ef4e29cf1a
Updated translations
2012-09-25 21:22:01 +12:00
TeamCity
6e95571c60
Updated translations
2012-09-25 20:24:27 +12:00
TeamCity
89ad9b20b0
Updated translations
2012-09-25 19:24:53 +12:00
TeamCity
6f6fcdf846
Updated translations
2012-09-25 17:49:46 +12:00
TeamCity
223342d04b
Updated translations master
2012-09-25 17:44:12 +12:00
TeamCity
a605fd3a57
Merge remote branch 'origin/master' into translation-staging
2012-09-25 17:44:00 +12:00
Sean Harvey
686f70330b
Merge pull request #210 from chillu/pull/sitetree-meta-removal
...
API Removed SiteTree.MetaTitle and MetaKeywords
2012-09-24 21:15:24 -07:00
