Daniel Hensby
1d1227cc9a
Merge branch '3'
2016-08-23 10:37:47 +01:00
Damian Mooyman
00d1d294ca
Update translations
2016-08-15 15:49:50 +12:00
Damian Mooyman
9805544cee
Update translations
2016-08-05 11:06:51 +12:00
Damian Mooyman
60644a5be8
Update translations
2016-05-11 10:58:25 +12:00
Ingo Schommer
19de22f427
API Moved frontend assets into admin/client/
...
admin/javascript => admin/client
admin/javascript/src => admin/client/src/legacy (mostly)
admin/scss/_variables.scss => admin/client/styles/_variables.scss
admin/scss => admin/client/styles/legacy/
admin/css/editor.css => admin/client/dist/css/editor.css
admin/css/screen.css => admin/client/dist/css/bundle.css
admin/images => admin/client/dist/images
admin/images/sprites/src => admin/client/src/sprites
admin/images/sprites/dist => admin/client/dist/sprites
admin/font => admin/client/dist/font
2016-04-20 21:13:10 +12:00
Ingo Schommer
8554b43ccc
Correct campaign badges, "revert" placeholder button
2016-04-18 13:59:18 +12:00
Ingo Schommer
107e38b7a7
Campaign publish feature
2016-04-18 13:59:18 +12:00
Paul Clarke
0ca090a391
Add generic React components
...
Includes moving some components from AssetAdmin
2016-04-06 08:35:50 +12:00
Damian Mooyman
cfd1a5d696
Update translations
2016-02-19 10:21:03 +13:00
Damian Mooyman
230d017677
Merge remote-tracking branch 'origin/3'
...
# Conflicts:
# admin/css/ie7.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/font/icon-reference.html
# admin/font/silverstripe.eot
# admin/font/silverstripe.svg
# admin/font/silverstripe.ttf
# admin/font/silverstripe.woff
# admin/scss/_forms.scss
# admin/scss/_style.scss
2016-02-12 15:41:45 +13:00
Damian Mooyman
d5b4c90cb4
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# admin/css/screen.css
# admin/css/screen.css.map
# admin/scss/_fonts.scss
# admin/scss/_retina.scss
2016-02-09 18:25:47 +13:00
Damian Mooyman
adc7a59108
Update translations
2016-02-09 17:45:21 +13:00
Damian Mooyman
d754884214
Update translations
2016-02-04 11:03:41 +13:00
Damian Mooyman
e091bb8474
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# admin/scss/_forms.scss
# admin/scss/_style.scss
# tests/model/VersionedTest.yml
2016-01-25 15:57:37 +13:00
Damian Mooyman
75493e79ff
Update translations
2016-01-25 15:06:55 +13:00
Damian Mooyman
d8ea6ceccc
Update translations
2016-01-21 14:22:35 +13:00
Sam Minnee
3ee8f505b7
MINORE: Remove training whitespace.
...
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.
Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.
The command used was this:
for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
Damian Mooyman
952896e638
Update translations
2015-12-23 13:22:38 +13:00
Damian Mooyman
48a30909f3
Merge remote-tracking branch 'origin/3.2' into 3
...
# Conflicts:
# admin/javascript/LeftAndMain.BatchActions.js
# css/UploadField.css
# forms/HtmlEditorField.php
2015-12-22 14:07:52 +13:00
Damian Mooyman
e68eb7e45d
Update translations
2015-11-11 17:06:45 +13:00
Damian Mooyman
b338efe5a7
Update translations
2015-11-11 16:07:20 +13:00
Damian Mooyman
c4dc10b255
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
forms/DropdownField.php
tests/model/ImageTest.php
2015-11-03 13:06:39 +13:00
Damian Mooyman
0cd3569fb9
Update translations
2015-10-06 18:33:16 +13:00
scott1702
48c48d703d
Disable split view mode when not enough room
2015-09-15 10:28:37 +12:00
Damian Mooyman
92f9af1984
Update translations
2015-09-02 11:15:53 +12:00
Damian Mooyman
f220adc3e0
Update translations
2015-08-24 16:52:39 +12:00
Damian Mooyman
102892e247
Update translations
2015-08-04 13:02:20 +12:00
Damian Mooyman
f2c39aac20
API batch restore action
2015-08-03 18:26:44 +12:00
scott1702
dfaaa3353e
Update batch archive warning to incl children pages
2015-08-03 16:17:31 +12:00
Damian Mooyman
bc8bc7d0c5
Update translations
2015-06-19 18:18:00 +12:00
Damian Mooyman
a72bd16f42
API Deprecate delete in favour of archive
...
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug in reporting publishing of error pages
Restoring a page also restores parents
2015-06-03 14:24:27 +12:00
Damian Mooyman
69a244e03f
Update translations
2015-05-14 13:45:03 +12:00
Damian Mooyman
636784845e
Update admin js translations
2015-03-10 09:13:35 +13:00
Damian Mooyman
a7bd6de2ec
Update translations
2015-03-09 17:11:10 +13:00
Damian Mooyman
c2af23033f
Update translations
2015-01-12 17:54:49 +13:00
Damian Mooyman
e3d4e79bba
Update translations
2014-08-05 15:02:18 +12:00
Damian Mooyman
da1231a6e5
Updated translation masters
2014-03-31 14:13:15 +13:00
Ingo Schommer
a101d4edb3
Updated translations
2014-02-18 11:49:55 +13:00
Ingo Schommer
ddcdb2c0f0
Updated translations
2013-12-19 18:04:37 +01:00
Ingo Schommer
2c145cd454
API JS i18n files with short locale names, generated by build task
...
The files are uploaded to transifex.com now, which means we needed
to consolidate the file names (= locales). Since Transifex doesn't allow
arbitrary JavaScript structures, we're using an intermediary JSON
format which gets transformed into the JS used by the framework.
See b59f3858afhttps://github.com/silverstripe/silverstripe-framework/issues/2499
2013-10-25 12:05:46 +02:00
Ingo Schommer
0c6ac1960e
Fixed whitespace usage
2013-02-18 15:43:52 +01:00
ARNHOE
924c76ccb1
Create nl_NL.js
2013-02-18 03:13:09 -08:00
senglmann
bb223bb35f
Update admin/javascript/lang/de_DE.js
...
fixed typo in translation
2013-02-06 10:13:49 +01:00
Naomi Guyer
55ec92d40e
ENHANCEMENT: Maori language javascript
2012-07-26 17:18:44 +12:00
Hamish Friedlander
dc18c51f32
Add javascript japanese translation - thanks Yuki Awano
2012-07-25 09:38:36 +12:00
Ingo Schommer
f794e98d7e
BUGFIX Moved localised JS messages in correct module ( fixes #7393 )
2012-06-04 11:52:31 +02:00
Ingo Schommer
a633326c3e
ENHANCEMENT Allow Requirements::add_i18n_javascript() to return its files more optimised inclusion, using it in LeftAndMain
2012-01-06 15:34:29 +01:00
