Damian Mooyman
cbded1ae69
Merge pull request #1494 from open-sausages/pulls/4.0/fix-preview-in-asset-admin
...
FIX preview issue in Asset Admin
2016-05-12 12:57:00 +12:00
Hamish Friedlander
7393995836
FIX preview in Asset Admin
2016-05-12 12:42:13 +12:00
Damian Mooyman
2695030430
Merge 3 into master
...
# Conflicts:
# client/lang/src/ar.js
# client/lang/src/cs.js
# client/lang/src/de.js
# client/lang/src/en.js
# client/lang/src/eo.js
# client/lang/src/es.js
# client/lang/src/fa_IR.js
# client/lang/src/fr.js
# client/lang/src/hu.js
# client/lang/src/id.js
# client/lang/src/is.js
# client/lang/src/it.js
# client/lang/src/ja.js
# client/lang/src/ko.js
# client/lang/src/lt.js
# client/lang/src/mi.js
# client/lang/src/nb.js
# client/lang/src/nl.js
# client/lang/src/pl.js
# client/lang/src/ro.js
# client/lang/src/ru.js
# client/lang/src/sk.js
# client/lang/src/sl.js
# client/lang/src/sr.js
# client/lang/src/sr_RS@latin.js
# client/lang/src/sv.js
# client/lang/src/zh.js
# lang/bg.yml
2016-05-11 14:35:12 +12:00
Damian Mooyman
7d9ca4fac5
Merge 3.3 into 3
...
# Conflicts:
# javascript/lang/src/ar.js
# javascript/lang/src/cs.js
# javascript/lang/src/de.js
# javascript/lang/src/en.js
# javascript/lang/src/eo.js
# javascript/lang/src/es.js
# javascript/lang/src/fa_IR.js
# javascript/lang/src/fr.js
# javascript/lang/src/hu.js
# javascript/lang/src/id.js
# javascript/lang/src/is.js
# javascript/lang/src/it.js
# javascript/lang/src/ja.js
# javascript/lang/src/ko.js
# javascript/lang/src/lt.js
# javascript/lang/src/mi.js
# javascript/lang/src/nb.js
# javascript/lang/src/nl.js
# javascript/lang/src/pl.js
# javascript/lang/src/ro.js
# javascript/lang/src/ru.js
# javascript/lang/src/sk.js
# javascript/lang/src/sl.js
# javascript/lang/src/sr.js
# javascript/lang/src/sr_RS@latin.js
# javascript/lang/src/sv.js
# javascript/lang/src/zh.js
2016-05-11 14:03:59 +12:00
Damian Mooyman
1f2c0aaaa0
Merge 3.2 into 3.3
2016-05-11 13:59:56 +12:00
Damian Mooyman
ef12e8f42b
Merge 3.1 into 3.2
...
# Conflicts:
# javascript/lang/ar.js
# javascript/lang/cs.js
# javascript/lang/de.js
# javascript/lang/eo.js
# javascript/lang/es.js
# javascript/lang/fa_IR.js
# javascript/lang/fi.js
# javascript/lang/fr.js
# javascript/lang/hu.js
# javascript/lang/id.js
# javascript/lang/is.js
# javascript/lang/it.js
# javascript/lang/ja.js
# javascript/lang/ko.js
# javascript/lang/lt.js
# javascript/lang/mi.js
# javascript/lang/nb.js
# javascript/lang/nl.js
# javascript/lang/pl.js
# javascript/lang/ro.js
# javascript/lang/ru.js
# javascript/lang/sk.js
# javascript/lang/sl.js
# javascript/lang/sr.js
# javascript/lang/sr_RS@latin.js
# javascript/lang/sv.js
# javascript/lang/zh.js
# lang/cs.yml
# lang/fa_IR.yml
2016-05-11 13:49:03 +12:00
Damian Mooyman
0de5f525ef
Merge 3.3.2 into 3.3
2016-05-11 13:33:15 +12:00
Damian Mooyman
cf3d01a3c1
Merge 3.2.4 into 3.2
2016-05-11 13:29:18 +12:00
Damian Mooyman
61d37fc084
Merge 3.1.19 into 3.1
2016-05-11 13:14:26 +12:00
Damian Mooyman
4571779213
Update translations
2016-05-11 11:05:57 +12:00
Damian Mooyman
dd0163ae00
Update translations
2016-05-11 11:05:37 +12:00
Damian Mooyman
03c628345b
Update translations
2016-05-11 10:58:24 +12:00
Ingo Schommer
54573292a3
Merge pull request #1489 from open-sausages/pulls/4.0/fix-save-from-page-settings
...
FIX Not being able to save when viewing page settings
2016-05-09 18:07:11 +12:00
Hamish Friedlander
1263bf8a04
FIX Not being able to save when viewing page settings
2016-05-09 16:43:19 +12:00
Ingo Schommer
740d2c60a3
Merge pull request #1488 from open-sausages/pulls/4.0/fix-add-i18n-javascript-locations
...
FIX add_i18n_javascript calls not being updated after JS move
2016-05-09 15:56:00 +12:00
Hamish Friedlander
2af63a84ef
FIX add_i18n_javascript calls not being updated after JS move
...
This fixes alert / confirm boxes that were popping up without text (for
example silverstripe-cms/issues/1476), although ideally we wouldn't
show empty dialog boxes on this sort of error - we'd have some default,
or a way to detect the issue.
2016-05-09 15:41:58 +12:00
Ingo Schommer
d52058a4fd
Merge pull request #1484 from open-sausages/pulls/4.0/Add-page-steps-bug
...
Make page steps use the same styles, consistent markup
2016-05-09 12:53:39 +12:00
Ingo Schommer
4297d33343
Merge pull request #1475 from candidasa/ss4-issue1473
...
MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it up…
2016-05-09 07:59:07 +12:00
Daniel Hensby
bc06d72e5f
Merge pull request #1481 from frankmullenger/4917-renaming
...
MINOR: Removing camel cased 'Html' references.
2016-05-07 11:11:16 +01:00
Paul Clarke
a039753f5c
removed .field class as it adds a bottom border
2016-05-06 15:30:08 +12:00
Paul Clarke
ca3770f03d
Make page steps use the same styles, consistent markup
2016-05-06 15:11:31 +12:00
Frank Mullenger
1181cac123
MINOR: Removing camel cased 'Html' references.
2016-05-06 14:31:19 +12:00
Julian Seidenberg
9169b11b8f
MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it upon first viewing of a new database ( fixes #1473 )
2016-05-06 11:24:03 +12:00
Daniel Hensby
4207e9bae9
Update translations
2016-05-05 12:47:36 +01:00
Daniel Hensby
228c406e64
Merge remote-tracking branch '3.2.4' into 3.3.2
2016-05-05 12:33:08 +01:00
Daniel Hensby
ce3575e362
Update translations
2016-05-05 12:25:44 +01:00
Daniel Hensby
5cbfad4aea
Merge remote-tracking branch 'origin/3.1.19' into 3.2.4
2016-05-05 12:25:13 +01:00
Daniel Hensby
2d10c94049
Update translations
2016-05-05 10:24:15 +01:00
Ingo Schommer
ba2c84109c
Merge pull request #1467 from open-sausages/pulls/4.0/menu-title-override
...
API set menu title without editing transifex masters
2016-05-02 22:10:20 +12:00
Damian Mooyman
46f69b0c0d
API set menu title without editing transifex masters
2016-05-02 21:54:09 +12:00
Ingo Schommer
7534d75789
Merge pull request #1464 from open-sausages/pulls/4.0/cleanup-navigator
...
API Changes to CMSPreviewable interface implementors
2016-05-02 21:33:45 +12:00
Damian Mooyman
1aa5492410
API Cleanup SilverStripeNavigator and CMSPreview
2016-05-02 17:02:37 +12:00
Damian Mooyman
59ca068806
Rebuild dist files for merge
2016-04-29 18:02:30 +12:00
Damian Mooyman
d7d6fd8758
Merge 3 into master
...
# Conflicts:
# code/controllers/CMSPageAddController.php
# code/model/ErrorPage.php
# composer.json
# css/screen.css
# tests/behat/features/insert-a-link.feature
2016-04-29 14:34:29 +12:00
Damian Mooyman
f0b574b835
Merge pull request #1459 from open-sausages/pulls/4.0/add-to-campaign
...
Add 'Add to campaign' button to pages
2016-04-28 10:04:24 +12:00
Daniel Hensby
af4b546050
Merge branch '3.3' into 3
2016-04-26 01:59:56 +01:00
Daniel Hensby
06d882b49c
Merge 3.2 into 3.3
2016-04-26 01:50:03 +01:00
Damian Mooyman
7a36789130
Cleanup PHPDoc and use injector for AddToCampaignHandler
2016-04-26 11:56:37 +12:00
Daniel Hensby
6cd1837f0c
Merge 3.1 into 3.2
...
Conflicts:
code/reports/SideReport.php
2016-04-26 00:09:19 +01:00
Ingo Schommer
30375937a6
Merge pull request #1461 from open-sausages/pulls/4.0/OSS-1750-js-file-rename
...
Adapted JS lib references to renamed paths
2016-04-25 15:57:03 +12:00
Ingo Schommer
fa9d90c74f
Adapted JS lib references to renamed paths
2016-04-25 15:43:43 +12:00
Loz Calver
4f673635a1
Merge pull request #1460 from open-sausages/pulls/4.0/fix-icon-styles
...
Fix font-icon regression on tree view
2016-04-22 11:05:47 +01:00
Ingo Schommer
38d828b3db
Merge pull request #1457 from open-sausages/pulls/3/fix-dependencies
...
BUG Correct framework/module dependencies for cms
2016-04-22 13:52:16 +12:00
David Craig
85fb080319
Fix font-icon regression on tree view
2016-04-22 10:44:40 +12:00
scott1702
69d7a3ae7d
Add 'Add to campaign' button to pages
2016-04-22 08:39:39 +12:00
Damian Mooyman
b4f466f5e1
BUG Correct framework/module dependencies for cms
2016-04-21 18:45:56 +12:00
Ingo Schommer
830a97a9fc
Merge pull request #1456 from open-sausages/pulls/4.0/static-file-restructure
...
Adjust file paths for new static file structure in framework
2016-04-20 21:16:05 +12:00
Ingo Schommer
e4861bdc79
Adjust file paths for new static file structure in framework
2016-04-20 21:13:20 +12:00
Sam Minnée
398adbb7e8
Merge pull request #1455 from open-sausages/pulls/4.0/css-editorconfig
...
Editorconfig for JS and CSS
2016-04-19 11:01:10 +12:00
Ingo Schommer
2c2056fe56
Editorconfig for JS and CSS
2016-04-19 10:41:08 +12:00
