Commit Graph

278 Commits

Author SHA1 Message Date
Daniel Hensby
0825e1a548 Merge pull request #258 from robbieaverill/patch-1
Increase minimum PHP version and update Travis configuration
2017-01-26 20:39:18 +00:00
Robbie Averill
dac3af79e7 TEST Update Travis configuration to build 5.5 to 7.1 against core release "4", using local phpunit 2017-01-27 09:25:46 +13:00
Robbie Averill
0f609965a9 Increase minimum PHP version
SilverStripe 4 supports PHP 5.5 and up
2017-01-26 10:15:27 +13:00
Damian Mooyman
f2bb3f3b91 Merge pull request #245 from silverstripe/add-helpful-robot-badge-1
Added Helpful Robot badge
2016-06-07 13:58:24 +12:00
Daniel Hensby
1d3f5f5658 Merge pull request #246 from thezenmonkey/patch-1
Adding Locales should be done through YAML
2016-06-05 01:16:43 +01:00
Richard Rudy
143b0d1790 Adding Locales should be done through YAML
Configuring locales via PHP now returns an error as common_locales is a static property. Documentation shoudl reflect this.
2016-06-03 16:21:15 -04:00
Christopher Pitt
a0977b57e6 Added Helpful Robot badge 2016-05-21 17:16:09 +12:00
Damian Mooyman
64788bd42e Alias master (4.x compat) as 3.x 2016-03-24 10:28:38 +13:00
Damian Mooyman
d655ca7b50 Merge pull request #233 from sebastiand/patch-1
Add doc on excluding fields from translation
2016-03-14 08:39:11 +13:00
Sebastian Dubbel
88ed3707fa Add doc on excluding fields from translation
Documentation and example setup for excluding fields from translation via `Translatable::$translate_excluded_fields`
2016-03-09 07:07:33 +01:00
Daniel Hensby
043e1be74f Merge pull request #222 from flxlabs/patch-1
FIX language dropdown appears in CMS
2016-02-04 18:03:43 +00:00
flxlabs
7b11ced8e7 Update HtmlEditorField.Translatable.js
Should resolve Issue #214
2016-02-04 14:42:11 +01:00
Damian Mooyman
b0ffbfa3a1 Merge remote-tracking branch 'origin/2.1'
# Conflicts:
#	code/model/Translatable.php
2016-01-14 13:24:26 +13:00
Damian Mooyman
fcd8764333 Merge remote-tracking branch 'origin/2.0' into 2.1 2016-01-14 13:21:29 +13:00
Ingo Schommer
f702487da4 Merge pull request #215 from webbuilders-group/2.1
BUGFIX: Fixed issue #213 causing crash when accessing a translation with a checkbox
2016-01-13 23:14:24 +13:00
Cam Findlay
8d31789a70 DOCS Added user guide 2016-01-13 22:58:33 +13:00
Ingo Schommer
68514b7cdd Set current locale on POST requests (fixes #156) 2016-01-13 22:58:33 +13:00
Ingo Schommer
cbc32e830a Consistently use uppercase "Locale" GET param
Causes inconsistent behaviour between form field name ("Locale")
and view state in GET parameters ("Locale" and "locale").

Related to #156.
2016-01-13 22:58:33 +13:00
Damian Mooyman
f9ae5864d9 Merge pull request #219 from helpfulrobot/update-license-year
Updated license year
2016-01-05 11:15:32 +13:00
helpfulrobot
21887a99b4 Updated license year 2016-01-01 06:41:00 +13:00
UndefinedOffset
58156353d9 BUGFIX: Fixed issue #213 causing crash when accessing a translation with a checkbox 2015-12-02 10:04:22 -04:00
Daniel Hensby
386348eb18 Merge pull request #211 from helpfulrobot/add-standard-code-of-conduct
Added standard code of conduct
2015-11-21 12:29:36 +00:00
helpfulrobot
cd434106e0 Added standard code of conduct 2015-11-21 20:17:56 +13:00
Daniel Hensby
aa46b78ece Merge pull request #205 from helpfulrobot/convert-to-psr-2
Converted to PSR-2
2015-11-20 16:10:14 +00:00
Daniel Hensby
68f7c328c3 Merge pull request #207 from helpfulrobot/add-standard-editor-config
Added standard editor config
2015-11-20 14:59:49 +00:00
Damian Mooyman
feced03df2 Merge pull request #208 from scott1702/2.1
Add changelog for release
2015-11-20 09:59:13 +13:00
scott1702
7208024ce0 Add changelog for release 2015-11-20 09:52:30 +13:00
Daniel Hensby
fb11cd73a6 Merge pull request #209 from helpfulrobot/add-standard-license
Added standard license
2015-11-19 12:04:37 +00:00
Daniel Hensby
cf5d32585d Merge pull request #210 from helpfulrobot/add-standard-git-attributes
Added standard git attributes
2015-11-19 10:39:47 +00:00
helpfulrobot
80029d2372 Added standard git attributes 2015-11-19 19:14:12 +13:00
helpfulrobot
8dffc8a82a Added standard license 2015-11-19 18:32:50 +13:00
helpfulrobot
08f5f0411b Added standard editor config 2015-11-19 13:27:18 +13:00
Damian Mooyman
493735482a Merge pull request #204 from helpfulrobot/add-standard-scrutinizer-config
Added standard Scrutinizer config
2015-11-19 13:11:22 +13:00
helpfulrobot
a6898417e7 Converted to PSR-2 2015-11-18 17:07:47 +13:00
helpfulrobot
d5e39fbbdf Added standard Scrutinizer config 2015-11-18 15:38:57 +13:00
Damian Mooyman
d3c960a820 Update translations 2015-11-17 16:07:38 +13:00
Daniel Hensby
f874e30ad3 Merge branch 2.1
Conflicts:
	.travis.yml
2015-11-03 21:47:49 +00:00
Daniel Hensby
59a9d4d06e Merge remote-tracking branch 2.0 into 2.1
Conflicts:
	.travis.yml
	README.md
	composer.json
2015-11-03 21:44:46 +00:00
Damian Mooyman
b120f26484 Merge pull request #201 from dhensby/pulls/travis-update
Compatibility with 4.x-dev
2015-11-04 09:57:28 +13:00
Daniel Hensby
0ffcd0c0ec Moving to SQLSelect 2015-11-03 20:35:54 +00:00
Daniel Hensby
e4bdf34d13 Updating travis requirements 2015-11-03 20:35:53 +00:00
Scott Hutchinson
e3a91c3506 Merge pull request #200 from tractorcow/pulls/tests
Add tests for 3.2 and php 5.6
2015-10-30 18:56:39 +13:00
Damian Mooyman
2e75581861 Add tests for 3.2 and php 5.6 2015-10-30 17:59:48 +13:00
Damian Mooyman
295e11c0e0 Merge pull request #193 from chillu/pulls/consistent-locale-casing
Consistent locale casing, set locale on POST
2015-08-20 17:14:46 +12:00
Damian Mooyman
82c3251991 Update translations 2015-08-20 12:47:37 +12:00
Daniel Hensby
63190785e5 Move to new travis containerised infrastructure 2015-07-20 16:02:39 +01:00
Ingo Schommer
da30096d65 Set current locale on POST requests (fixes #156) 2015-06-01 20:54:38 +12:00
Ingo Schommer
a0a6ec2f91 Consistently use uppercase "Locale" GET param
Causes inconsistent behaviour between form field name ("Locale")
and view state in GET parameters ("Locale" and "locale").

Related to #156.
2015-06-01 20:54:04 +12:00
Ingo Schommer
6731a681e9 Merge pull request #192 from tractorcow/pulls/fix-translatable-userforms-compat
BUG Fix compat with userforms/translatable
2015-06-01 20:42:23 +12:00
Damian Mooyman
6aefb2e09f BUG Fix compat with userforms/translatable 2015-05-29 15:52:14 +12:00