Damian Mooyman
ac62b732a4
Merge pull request #1815 from open-sausages/pulls/4.0/tinymce-link-dialog
...
Fix behat tests for insert link to work with react implementation
2017-05-16 12:01:26 +12:00
Christopher Joe
f3b442e9b4
Fix behat tests for insert link to work with react implementation
2017-05-16 11:45:15 +12:00
Damian Mooyman
367c35a1de
Merge pull request #1820 from open-sausages/pulls/4/remove-who-can-view-toggle
...
Move who-can-view toggle to Admin module
2017-05-15 11:55:42 +12:00
Aaron Carlino
5bd3440e61
Move who-can-view toggle to Admin module
2017-05-15 11:33:18 +12:00
Damian Mooyman
d539109455
Merge pull request #1818 from open-sausages/pulls/4/fix-webpack-dev-config
...
BUGFIX: Get rid of special dev webpack plugins
2017-05-12 17:17:02 +12:00
Aaron Carlino
13e6d8ca76
Get rid of special dev plugins
2017-05-12 14:38:05 +12:00
Aaron Carlino
de079154f4
BUGFIX: Webpack dev config was overwriting plugins rather than concatenating
2017-05-12 13:50:17 +12:00
Damian Mooyman
23e1aa8c45
API Refactor inherited permissions ( #1811 )
2017-05-12 12:47:46 +12:00
Damian Mooyman
fc2219dc72
.travis.yml code cleanup
...
Fixed indentation
Move coverage build to script
Update travis node version to 6
Update npm to use yarn for CI
2017-05-11 10:03:13 +12:00
Sam Minnee
14540729ca
FIX: Use framework 3.5 to test cms 3.5
2017-05-09 11:41:55 +12:00
Damian Mooyman
1efb325b4d
Merge pull request #1813 from open-sausages/pulls/4.0/remove-deprecated-methods
...
Remove APIs with target deprecation of 4.0
2017-05-09 11:36:49 +12:00
Ingo Schommer
4923a2597b
Replaced usage of ResetFormAction ( #1812 )
...
See https://github.com/silverstripe/silverstripe-framework/pull/6883
2017-05-09 11:11:08 +12:00
Daniel Hensby
fa307a5dfe
Merge branch '3.6' into 3
2017-05-08 16:24:33 +01:00
Daniel Hensby
db7b1b9bd6
Merge branch '3.6.0' into 3.6
2017-05-08 16:24:04 +01:00
Daniel Hensby
aedbc83517
Merge branch '3.5' into 3.6
2017-05-08 16:23:51 +01:00
Damian Mooyman
c65d48f112
Prevent installation from removing behat.yml
2017-05-08 22:56:07 +12:00
Ingo Schommer
484a4ec4f6
API Removed deprecated RootURLController:set_default_homepage_link
2017-05-08 21:17:36 +12:00
Ingo Schommer
de41e14518
API Removed deprecated ModelAsController::find_old_page()
2017-05-08 21:14:38 +12:00
Aaron Carlino
359179025d
Reorganise i18n keys
2017-05-08 17:57:24 +12:00
Sam Minnee
11b8926c1a
fixup - prefer-stable necessary to avoid armageddon
2017-05-05 17:19:41 +12:00
Sam Minnee
6ddd753471
fixup - fix behat.paths.base reference
2017-05-05 17:19:41 +12:00
Sam Minnee
e2271d1b0a
fixup - make behat work
2017-05-05 17:19:41 +12:00
Sam Minnee
f4179d608d
NEW: Simplify test runs.
2017-05-05 17:19:41 +12:00
Sam Minnee
c1b3d87b58
fixup - don't need to explicitly include testsession
2017-05-05 17:19:41 +12:00
Damian Mooyman
df100b8798
API Upgrade to behat 3
2017-05-05 17:19:41 +12:00
John Milmine
618c7f126d
changed to static function so that subclasses of Versioned will be picked up
2017-05-04 15:05:25 +12:00
Aaron Carlino
71fd734440
Merge pull request #1809 from open-sausages/pulls/4.0/remove-archived-email
...
Remove obsolete ArchivedEmail.ss template and localisations
2017-05-03 19:14:16 +12:00
Damian Mooyman
0980c62c7c
Rebuild dist files
2017-05-03 17:17:51 +12:00
Damian Mooyman
ef6bc6e2af
Sync with transifex
2017-05-03 17:17:36 +12:00
Damian Mooyman
415c65c686
Removed ViewArchivedEmail.ss and all templates
2017-05-03 17:11:27 +12:00
Aaron Carlino
00f699b99b
Update translations
2017-05-02 10:46:54 +12:00
Damian Mooyman
d1e3bcc14e
Remove .tx file to freeze localisations
2017-05-01 16:23:11 +12:00
Damian Mooyman
0ef3844dd4
Remove .tx file to freeze localisations
2017-05-01 16:22:39 +12:00
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
