Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # git pull
- From git://github.com/silverstripe/silverstripe-cms
- 894d487..0f8d7a0 3.0 -> origin/3.0
- 4c525fe..c7b0666 2.4 -> origin/2.4
- 6cb7710..1e3473d 3.1 -> origin/3.1
- * [new branch] 3.1.0-beta2 -> origin/3.1.0-beta2
- 75e2567..56208a5 master -> origin/master
- 16eff71..d2b4ee0 post-2.4 -> origin/post-2.4
- 4e5a142..5bc571d translation-staging -> origin/translation-staging
- Updating 894d487..0f8d7a0
- Fast-forward
- .travis.yml | 1 -
- code/controllers/CMSMain.php | 36 +++----
- code/controllers/CMSPageHistoryController.php | 5 -
- code/controllers/ContentController.php | 7 +-
- code/controllers/SilverStripeNavigator.php | 4 +-
- code/model/ErrorPage.php | 127 ++++++++++++++----------
- code/model/SiteTree.php | 2 +-
- css/screen.css | 2 +-
- javascript/lang/nl_NL.js | 39 ++++++++
- lang/cs.yml | 28 +++---
- lang/da.yml | 34 +++----
- lang/de.yml | 36 +++----
- lang/eo.yml | 340 +++++++++++++++++++++++++++++++--------------------------------
- lang/et_EE.yml | 22 ++---
- lang/fi.yml | 10 +-
- lang/fr.yml | 74 +++++++-------
- lang/he_IL.yml | 84 ++++++++--------
- lang/hu.yml | 22 ++---
- lang/it.yml | 66 ++++++-------
- lang/ja_JP.yml | 18 ++--
- lang/lt.yml | 80 +++++++--------
- lang/mi_NZ.yml | 2 +-
- lang/nl.yml | 26 ++---
- lang/pl.yml | 42 ++++----
- lang/pt.yml | 30 +++---
- lang/ru.yml | 36 +++----
- lang/sk.yml | 152 ++++++++++++++--------------
- lang/sr.yml | 48 ++++-----
- lang/sv.yml | 24 ++---
- lang/th.yml | 2 +-
- lang/tr.yml | 2 +-
- lang/uk.yml | 10 +-
- lang/zh_TW.yml | 12 +--
- scss/_CMSMain.scss | 3 +-
- tasks/SiteTreeMaintenanceTask.php | 12 ++-
- templates/Includes/CMSMain_TreeView.ss | 4 -
- templates/Includes/CMSPagesController_ContentToolActions.ss | 3 +
- tests/controller/ContentControllerPermissionsTest.php | 5 +-
- tests/model/SiteTreePermissionsTest.php | 5 +-
- tests/travis/before_script | 8 +-
- 40 files changed, 761 insertions(+), 702 deletions(-)
- create mode 100644 javascript/lang/nl_NL.js
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement