mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-09-28 12:26:29 +02:00
Merge remote-tracking branch 'origin/3.1'
Conflicts: .travis.yml
This commit is contained in:
commit
0a1ffd3e1a
23
.travis.yml
23
.travis.yml
@ -4,6 +4,12 @@ php:
|
|||||||
- 5.3
|
- 5.3
|
||||||
|
|
||||||
env:
|
env:
|
||||||
|
global:
|
||||||
|
- "ARTIFACTS_AWS_REGION=us-east-1"
|
||||||
|
- "ARTIFACTS_S3_BUCKET=silverstripe-travis-artifacts"
|
||||||
|
- secure: "7V20Qk3bIG2AlTJaA5D/uzB8vUVvRwQp+xjRYUxlahtj9FcuqEV3HIyjwwJe0T6Z1bnRYuu28ZnCT2CfP9BBZ3FE7AwSZbPase9c0/at2qDJNqkvIdC1xZ1H6Fcy2LSwNB9wLQPe613ItVdanitEuwE41iowxBPslxUUTnwx7eY="
|
||||||
|
- secure: "f/GWlbnNri2YpCOrJfZl7tkhpMmcRVUbCdmb+beAY90gFBJQPHtljzf8M4KaCP0OkLOtRFuGoMFdIcpadl4J6IG1XP18IJNz+nKzCL/sJj/FF9y77RdMHWE9jr21G9ar5tywkn7JM6vrnTCY89OnHeQx67SKvxqX5CpVx+rdcEU="
|
||||||
|
matrix:
|
||||||
- DB=MYSQL CORE_RELEASE=master
|
- DB=MYSQL CORE_RELEASE=master
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
@ -16,25 +22,34 @@ matrix:
|
|||||||
env: DB=MYSQL CORE_RELEASE=master
|
env: DB=MYSQL CORE_RELEASE=master
|
||||||
- php: 5.5
|
- php: 5.5
|
||||||
env: DB=MYSQL CORE_RELEASE=master
|
env: DB=MYSQL CORE_RELEASE=master
|
||||||
|
- php: 5.4
|
||||||
|
env: DB=MYSQL CORE_RELEASE=master BEHAT_TEST=1
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- php: 5.5
|
- php: 5.5
|
||||||
env: DB=MYSQL CORE_RELEASE=master
|
env: DB=MYSQL CORE_RELEASE=master
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
|
- composer self-update
|
||||||
|
- phpenv rehash
|
||||||
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
|
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
|
||||||
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
|
- "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi"
|
||||||
|
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi"
|
||||||
- cd ~/builds/ss
|
- cd ~/builds/ss
|
||||||
|
- php ~/travis-support/travis_setup_selenium.php --if-env BEHAT_TEST
|
||||||
|
- php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- phpunit cms/tests/
|
- "if [ \"$BEHAT_TEST\" = \"\" ]; then phpunit cms/tests; fi"
|
||||||
|
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi"
|
||||||
|
|
||||||
|
after_failure:
|
||||||
|
- php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_AWS_SECRET_ACCESS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_S3_BUCKET/
|
||||||
|
|
||||||
branches:
|
branches:
|
||||||
except:
|
except:
|
||||||
- 2.1
|
- 2.1
|
||||||
- 2.2
|
- 2.2
|
||||||
- 2.3
|
- 2.3
|
||||||
- 2.4
|
|
||||||
- post-2.4
|
|
||||||
- translation-staging
|
- translation-staging
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
|
@ -446,6 +446,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->extend('updateSiteTreeHints', $def);
|
||||||
|
|
||||||
$json = Convert::raw2json($def);
|
$json = Convert::raw2json($def);
|
||||||
$cache->save($json, $cacheKey);
|
$cache->save($json, $cacheKey);
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,11 @@ class SiteConfig extends DataObject implements PermissionProvider {
|
|||||||
*/
|
*/
|
||||||
public function getCMSFields() {
|
public function getCMSFields() {
|
||||||
|
|
||||||
$groupsMap = Group::get()->map('ID', 'Breadcrumbs')->toArray();
|
$groupsMap = array();
|
||||||
|
foreach(Group::get() as $group) {
|
||||||
|
// Listboxfield values are escaped, use ASCII char instead of »
|
||||||
|
$groupsMap[$group->ID] = $group->getBreadcrumbs(' > ');
|
||||||
|
}
|
||||||
asort($groupsMap);
|
asort($groupsMap);
|
||||||
|
|
||||||
$fields = new FieldList(
|
$fields = new FieldList(
|
||||||
|
@ -1978,7 +1978,11 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
|
|||||||
* @return FieldList
|
* @return FieldList
|
||||||
*/
|
*/
|
||||||
public function getSettingsFields() {
|
public function getSettingsFields() {
|
||||||
$groupsMap = Group::get()->map('ID', 'Breadcrumbs')->toArray();
|
$groupsMap = array();
|
||||||
|
foreach(Group::get() as $group) {
|
||||||
|
// Listboxfield values are escaped, use ASCII char instead of »
|
||||||
|
$groupsMap[$group->ID] = $group->getBreadcrumbs(' > ');
|
||||||
|
}
|
||||||
asort($groupsMap);
|
asort($groupsMap);
|
||||||
|
|
||||||
$fields = new FieldList(
|
$fields = new FieldList(
|
||||||
|
@ -142,16 +142,26 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// Scroll tree down to context of the current page
|
// Scroll tree down to context of the current page, if it isn't
|
||||||
|
// already visible
|
||||||
$('.cms-tree a.jstree-clicked').entwine({
|
$('.cms-tree a.jstree-clicked').entwine({
|
||||||
onmatch: function(){
|
onmatch: function(){
|
||||||
var self = this,
|
var self = this,
|
||||||
panel = self.parents('.cms-panel-content');
|
panel = self.parents('.cms-panel-content'),
|
||||||
|
scrollTo;
|
||||||
|
|
||||||
|
if(self.offset().top < 0 ||
|
||||||
|
self.offset().top > panel.height() - self.height()) {
|
||||||
|
// Current scroll top + our current offset top is our
|
||||||
|
// position in the panel
|
||||||
|
scrollTo = panel.scrollTop() + self.offset().top
|
||||||
|
+ (panel.height() / 2);
|
||||||
|
|
||||||
panel.animate({
|
panel.animate({
|
||||||
scrollTop: self.offset().top - (panel.height() / 2)
|
scrollTop: scrollTo
|
||||||
}, 'slow');
|
}, 'slow');
|
||||||
}
|
}
|
||||||
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') {
|
|||||||
'CMSMAIN.ERRORREVERTING': 'Błąd podczas powrotu do opublikowanej strony',
|
'CMSMAIN.ERRORREVERTING': 'Błąd podczas powrotu do opublikowanej strony',
|
||||||
'CMSMAIN.SAVING' : 'Zapisywanie...',
|
'CMSMAIN.SAVING' : 'Zapisywanie...',
|
||||||
'CMSMAIN.SELECTMOREPAGES' : "Zaznaczono %s stron.\n\nCzy na pewno chcesz wykonać tę akcje?",
|
'CMSMAIN.SELECTMOREPAGES' : "Zaznaczono %s stron.\n\nCzy na pewno chcesz wykonać tę akcje?",
|
||||||
'CMSMAIN.ALERTCLASSNAME': 'Ta strona zostanie zaktualizowana po jej zapisani\'ur',
|
'CMSMAIN.ALERTCLASSNAME': 'Ta strona zostanie zaktualizowana po jej zapisaniu',
|
||||||
'CMSMAIN.URLSEGMENTVALIDATION': 'Adres URL może składać się tylko z liter, cyfr i łączników.',
|
'CMSMAIN.URLSEGMENTVALIDATION': 'Adres URL może składać się tylko z liter, cyfr i łączników.',
|
||||||
'AssetAdmin.BATCHACTIONSDELETECONFIRM': "Czy na pewno usunąć %s folderów?",
|
'AssetAdmin.BATCHACTIONSDELETECONFIRM': "Czy na pewno usunąć %s folderów?",
|
||||||
'AssetTableField.REALLYDELETE': 'Czy na pewno usunąć zaznaczone pliki??',
|
'AssetTableField.REALLYDELETE': 'Czy na pewno usunąć zaznaczone pliki??',
|
||||||
|
Loading…
Reference in New Issue
Block a user