Commit Graph

5568 Commits

Author SHA1 Message Date
Damian Mooyman
b1c59d40c6 API Namespace i18n keys 2017-04-28 15:09:56 +12:00
Damian Mooyman
eae598adb5 Remove empty localisation files 2017-04-28 14:51:01 +12:00
Damian Mooyman
9147fa44ba
Fix source file encoding 2017-04-28 14:06:29 +12:00
Damian Mooyman
88c8a2d2f9
Rebuild js dist files 2017-04-28 14:02:46 +12:00
Damian Mooyman
cd2c961f81
Run upgrader 2017-04-28 13:46:21 +12:00
Damian Mooyman
e665a51942
Remove unused keys (textcollector with merge=0) 2017-04-28 13:44:35 +12:00
Damian Mooyman
85de5dd2b9 Revert yml files to transifex 2017-04-28 13:41:28 +12:00
Aaron Carlino
3077f31899 Alphabetise keys 2017-04-27 14:45:17 +12:00
Aaron Carlino
e8e11d618e Migrate new JS keys to all langs 2017-04-27 11:43:05 +12:00
Aaron Carlino
b6d4eb3e77 New module-based JS translation keys 2017-04-27 11:43:04 +12:00
Uncle Cheese
29805ee446 New namespaced i18n keys 2017-04-27 11:43:04 +12:00
Uncle Cheese
6fb1012eb8 Ran upgrader for lang files 2017-04-27 11:43:04 +12:00
John Milmine
1ff6f3f1b0 fixing doArchive
for users who can delete, but not unpublish, they should be able to delete draft pages that they’ve created.

Old code used to unpublish even if the page wasn’t published, which meant users who couldn’t publish, also could delete draft pages. They could create draft pages, but not delete them.
2017-04-27 08:48:19 +12:00
Daniel Hensby
48a3152ee2 Merge pull request #1803 from open-sausages/pulls/3.6/fix-settings-history
BUG Fix page history / settings forms
2017-04-26 10:00:01 +01:00
Daniel Hensby
eeaec7a876 Merge pull request #1800 from dhensby/pulls/3.6.0/test-fix
FIX intl test
2017-04-26 09:59:18 +01:00
Damian Mooyman
000a5f7209
BUG Fix page history / settings forms 2017-04-26 18:13:48 +12:00
Sam Minnee
18171f8875 Merge branch '3.4' into 3.5 2017-04-24 15:59:38 +12:00
Uncle Cheese
cfef458a00 Remove .tx folder 2017-04-24 15:57:45 +12:00
Uncle Cheese
58c0405b58 Remove .tx folder 2017-04-24 14:49:42 +12:00
Ingo Schommer
d820b26b46 Merge branch 'ishannz-master' 2017-04-22 11:45:12 +12:00
Ingo Schommer
cf2b0417cb Fix coding conventions 2017-04-22 11:44:49 +12:00
Daniel Hensby
0494af1243
Aliasing 3 as 3.7.x-dev 2017-04-21 16:09:05 +01:00
Daniel Hensby
7e77753274
FIX intl test 2017-04-21 15:17:47 +01:00
Daniel Hensby
2bde67d6de
Merge branch '3.6' into 3 2017-04-21 14:09:35 +01:00
root
475b733579 Update translations 2017-04-21 11:49:37 +01:00
Christopher Joe
4b19987ad2 FIx tweak visibility around the slideDown/slideUp animation 2017-04-21 16:38:34 +12:00
Ishan Jayamanne
3b69a47158 fix Hidden listbox #1785 2017-04-21 14:59:27 +12:00
Damian Mooyman
2225af75c3 Update RedirectorPageTest 2017-04-20 11:16:14 +12:00
Ingo Schommer
8fc0703d8f Merge pull request #1787 from open-sausages/pulls/4.0/tree-dropdown-react
API Major refactor of Hierarchy
2017-04-18 08:42:51 +12:00
Damian Mooyman
1a6518803b ENHANCEMENT Make page urls bookmarkable 2017-04-12 13:00:21 +12:00
Tim Kung
bb3c09c359 - making form actions on edit forms safer
- re-adding removed methods
2017-04-12 11:42:21 +12:00
Damian Mooyman
03a2a907ce
Fix whitespace in templates causing double arrows 2017-04-12 09:33:56 +12:00
Damian Mooyman
d75a3cb0e9 API Update site tree hierarchy to use a MarkingSet and template 2017-04-12 08:57:09 +12:00
Ingo Schommer
904f18cc48 Pin PHP7 build to 7.1.2
7.1.3 breaks with segfaults: https://travis-ci.org/silverstripe/silverstripe-cms/jobs/220828001

Same fix as framework: 6cfeb7f07e
2017-04-12 08:43:36 +12:00
Ingo Schommer
32c2353314 Merge pull request #1735 from dhensby/pulls/4/code-cov-after-success
Move code coverage report upload to after_success
2017-04-12 08:32:39 +12:00
Ingo Schommer
9cad8ba01b Fixed linting 2017-04-12 08:21:02 +12:00
Ingo Schommer
53b4c779f2 Merge branch 'master' into pulls/4/code-cov-after-success 2017-04-12 08:12:14 +12:00
Ingo Schommer
d677694f2e Merge pull request #1776 from open-sausages/pulls/4.0/fix-gitignore
Remove extraneous gitignore declarations
2017-04-12 08:08:32 +12:00
Ingo Schommer
41badd9bbb Merge pull request #1783 from open-sausages/pulls/4.0/leftandmain-cleanup
BUG Ensure all CMS forms include full ID / VersionID in path
2017-04-11 17:25:36 +12:00
Tim Kung
41eddfcc8e fixing cms page history controller to use new page id param 2017-04-07 15:58:35 +12:00
Tim Kung
487235f991 adding page id into cmsmain 2017-04-07 14:41:15 +12:00
Damian Mooyman
b1b0c6af63
BUG Ensure all CMS forms include full ID / VersionID in path
Fixes #1510
Refactor tree operations into CMSMain
Cleanup CMSMain and subclasses
2017-04-06 13:40:46 +12:00
Chris Joe
78143a32f8 Merge pull request #1762 from open-sausages/pulls/4.0/manifest-cache
Update module_priority to use full module name
2017-04-06 09:39:30 +12:00
Damian Mooyman
780878e6a1
Remove extraneous gitignore declarations 2017-04-06 09:34:15 +12:00
Chris Joe
3c00c437f4 Merge pull request #1774 from open-sausages/pulls/4.0/6258-update-archive-warning-msg
ENHANCEMENT Update archive warning message
2017-04-06 09:20:08 +12:00
Damian Mooyman
8f8553a737 Update translations 2017-04-05 16:08:16 +12:00
Christopher Joe
e12a2709d0 Fix syntax error in selector 2017-04-05 15:14:12 +12:00
Damian Mooyman
af1002194d Merge pull request #1781 from silverstripe/pulls/3/ss3-php7
Fixing VirtualPage for php7 patch
2017-04-05 13:09:50 +12:00
Daniel Hensby
2ddb616829 FIX Correct case of CopyContentFrom method 2017-04-05 10:49:17 +10:00
Sam Minnee
80e8967308 FIX: Fix VirtualPage::init() content-modification check.
This check had never worked but PHP 5 silently ignored it and PHP 7
raised it as an error.
2017-04-05 10:49:16 +10:00