tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-29 16:09:23 +02:00
Code Issues Projects Releases Wiki Activity
15,776 Commits 29 Branches 516 Tags 147 MiB
8ae794ee99
Commit Graph

46 Commits

Author SHA1 Message Date
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
d754884214 Update translations 2016-02-04 11:03:41 +13:00
Damian Mooyman
d8ea6ceccc Update translations 2016-01-21 14:22:35 +13:00
Damian Mooyman
e6b877df27 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	control/Director.php
#	control/HTTP.php
#	core/startup/ParameterConfirmationToken.php
#	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
#	docs/en/00_Getting_Started/04_Directory_Structure.md
#	docs/en/00_Getting_Started/05_Coding_Conventions.md
#	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/01_Tutorials/04_Site_Search.md
#	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
#	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
#	docs/en/02_Developer_Guides/13_i18n/index.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
#	docs/en/03_Upgrading/index.md
#	docs/en/changelogs/index.md
#	docs/en/howto/customize-cms-menu.md
#	docs/en/howto/navigation-menu.md
#	docs/en/index.md
#	docs/en/installation/index.md
#	docs/en/installation/windows-manual-iis-6.md
#	docs/en/misc/contributing/code.md
#	docs/en/misc/contributing/issues.md
#	docs/en/misc/module-release-process.md
#	docs/en/reference/dataobject.md
#	docs/en/reference/execution-pipeline.md
#	docs/en/reference/grid-field.md
#	docs/en/reference/modeladmin.md
#	docs/en/reference/rssfeed.md
#	docs/en/reference/templates.md
#	docs/en/topics/commandline.md
#	docs/en/topics/debugging.md
#	docs/en/topics/email.md
#	docs/en/topics/forms.md
#	docs/en/topics/index.md
#	docs/en/topics/module-development.md
#	docs/en/topics/modules.md
#	docs/en/topics/page-type-templates.md
#	docs/en/topics/page-types.md
#	docs/en/topics/search.md
#	docs/en/topics/testing/index.md
#	docs/en/topics/testing/testing-guide-troubleshooting.md
#	docs/en/topics/theme-development.md
#	docs/en/tutorials/1-building-a-basic-site.md
#	docs/en/tutorials/2-extending-a-basic-site.md
#	docs/en/tutorials/3-forms.md
#	docs/en/tutorials/4-site-search.md
#	docs/en/tutorials/5-dataobject-relationship-management.md
#	docs/en/tutorials/building-a-basic-site.md
#	docs/en/tutorials/dataobject-relationship-management.md
#	docs/en/tutorials/extending-a-basic-site.md
#	docs/en/tutorials/forms.md
#	docs/en/tutorials/index.md
#	docs/en/tutorials/site-search.md
#	main.php
#	model/SQLQuery.php
#	security/ChangePasswordForm.php
#	security/MemberLoginForm.php
#	tests/control/ControllerTest.php
#	tests/core/startup/ParameterConfirmationTokenTest.php
#	tests/model/SQLQueryTest.php
#	tests/security/SecurityTest.php
#	tests/view/SSViewerTest.php
#	view/SSTemplateParser.php
#	view/SSTemplateParser.php.inc
#	view/SSViewer.php
 2016-01-20 13:16:27 +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
scott1702
9f9d0089df Send user to new area when inserting url 2015-10-29 11:37:59 +13:00
scott1702
23baa288ba Sticky footer on insert media/link elements 2015-10-01 15:35:56 +13: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
69a244e03f Update translations 2015-05-14 13:45:03 +12: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
5a69cf67ff Update translation masters 2014-05-06 17:38:58 +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 b59f3858af for generator logic.

Fixes https://github.com/silverstripe/silverstripe-framework/issues/2499
 2013-10-25 12:05:46 +02:00
Ingo Schommer
f0ccdeb9fc Updated Te Reo translation 2013-10-08 21:28:35 +02:00
Ingo Schommer
93558a6d62 Globalization in TreeDropdownField JS 2013-10-08 12:12:25 +02:00
Ingo Schommer
9288bdc5ea Updated Te Reo translations 2013-10-08 11:37:11 +02:00
Julian Seidenberg
22c7bbfcd4 NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true). 2013-05-25 19:07:06 +12:00
ARNHOE
823b2acda3 Update javascript/lang/nl_NL.js 2013-02-18 12:09:38 +01:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c 
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
 2012-09-30 17:18:13 +13:00
Ingo Schommer
3b592122fd i18n for "select an anchor" string (see #7798) 2012-08-26 23:58:31 +02:00
dd1079
fa671062f8 Update javascript/lang/de_DE.js 
Adding German language strings
 2012-08-01 19:17:04 +03: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
61232ba848 MINOR Localization of new UploadField strings 2012-05-12 09:53:53 +02:00
Normann Lou
9a301e3990 BUGFIX: Empty error message on renaming a page and confirming url is changed accordingly 2012-03-27 17:07:24 +02:00
Ingo Schommer
c0d187071a ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
Russell Michell
ade3f5b912 MINOR: Typo in language file 2012-01-10 12:31:09 +13:00
Stig Lindqvist
3c516b7b97 API CHANGE: Refactored GridField modifiers into GridField_ColumnProvider, GridField_HTMLProvider, GridField_ActionProvider, and GridField_DataModifier interfaces, all added as components in the config. 
API CHANGE: Simplified state handling so that it's just a key store. Affectors are replaced with GridField_ActionProviders. API CHANGE: Removed GridField state manipulation actions instead opting for GridField_ActionProvider actions.
API CHANGE: Removed support for modifiers that add "body" rows, instead having core support for generating the body rows hardcoded into the GridField.
API CHANGE: Allow modification of columns across the whole GridField with the GridField_ColumnProvider interface.
API CHANGE: Renamed GridField_AlterAction to GridField_Action, and added actionName/args parameters, since it can be used for all actions (including batch actions and row actions)
API CHANGE: Removed GridFieldRow class.
 2012-01-09 13:30:34 +13:00
Ingo Schommer
7253746bdc MINOR Fixed IE6 compat note styling 2011-12-15 20:38:35 +01:00
Ingo Schommer
d916140686 ENHANCEMENT Added incompatibility notice for Internet Explorer 6 in LeftAndMain.js 2011-04-24 12:31:19 +12:00
Ingo Schommer
2fa786d392 MINOR Added it_IT javascript translation (fixes #6265, thanks giulio) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@115126 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-16 08:14:25 +00:00
Sam Minnee
68747773ae MINOR Updated cs_CZ and sk_SK translations in sapphire/javascript (fixes #6085, thanks Pike) (from r113690) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114538 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-05 08:36:57 +00:00
Sam Minnee
0d19b45155 MINOR: Add translation correction for Czech and add Slovakian translation in cms and sapphire (js). Thanks to @Pike (from r111262) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112904 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 03:53:00 +00:00
Ingo Schommer
1757ac1f78 ENHANCEMENT Added cs_CZ javascript translations (#5540, thanks Pike) (from r104162) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112339 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 00:01:06 +00:00
Ingo Schommer
9e73f6c391 MINOR Added new javascript lang strings from FileIFrameField 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77095 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-18 20:57:23 +00:00
Ingo Schommer
405a7905e2 ENHANCEMENT Added nl_NL javascript translations for sapphire, see #3896 - thanks Mad_Clog 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75351 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-04-28 00:10:11 +00:00
Ingo Schommer
085346f0e0 MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:19:48 +00:00
Andrew O'Neil
ae0bbfb2c0 #2975 - Malformed javascript language string (ajshort) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64947 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-30 21:39:03 +00:00
Ingo Schommer
fbd37c897e BUGFIX typo in js file 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63570 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-03 01:14:45 +00:00
Ingo Schommer
6bd34d3e53 ENHANCEMENT Using ss.i18n in all sapphire form fields with clientside language strings 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63567 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-10-03 00:47:08 +00:00