tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote branch 'origin/master' into translation-staging

Browse Source
This commit is contained in:
TeamCity 2012-10-16 22:37:40 +13:00
commit f2eee43fdc
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -21,8 +21,12 @@ script:
branches: branches:
except: except:
- translation-staging - 2.1
- 2.2
- 2.3
- 2.4 - 2.4
- post-2.4
- translation-staging
notifications: notifications:
irc: irc:

8
tests/tasks/MigrateSiteTreeLinkingTaskTest.yml
View File

@ -6,16 +6,16 @@ SiteTree:
about: about:
Title: About Us Title: About Us
URLSegment: about URLSegment: about
Content: <a href="home">Home</a><a href="staff/">Staff</a> Content: '<a href="home">Home</a><a href="staff/">Staff</a>'
staff: staff:
Title: Staff Title: Staff
URLSegment: staff URLSegment: staff
Content: <a href="home/">Home</a><a href="about">About</a> Content: '<a href="home/">Home</a><a href="about">About</a>'
Parent: =>SiteTree.about Parent: =>SiteTree.about
action: action:
Title: Action Link Title: Action Link
URLSegment: action URLSegment: action
Content: <a href="home/SearchForm">Search Form</a> Content: '<a href="home/SearchForm">Search Form</a>'
hash_link: hash_link:
Title: Hash Link Title: Hash Link
URLSegment: hash-link URLSegment: hash-link
@ -23,7 +23,7 @@ SiteTree:
admin_link: admin_link:
Title: Admin Link Title: Admin Link
URLSegment: admin-link URLSegment: admin-link
Content: <a href="admin">Admin</a> Content: '<a href="admin">Admin</a>'
no_links: no_links:
Title: No Links Title: No Links
URLSegment: No Links URLSegment: No Links