Commit Graph

247 Commits

Author SHA1 Message Date
Damian Mooyman
9b2183167f Merge branch '2.1' into 2.2 2016-05-19 13:55:29 +12:00
Damian Mooyman
98c7957362 Merge pull request #244 from open-sausages/pulls/set-locale-defaults-in-tests
Consistently add Locale to test fixtures (fixes #223)
2016-05-19 13:54:16 +12:00
Ingo Schommer
d9cf71b91b Consistently add Locale to test fixtures (fixes #223)
Technically this should be fixed by changing the logic
in Translatable::get_extra_config(), which modifies the 'defaults'
configuration on the objects it applies to. Since this is called
very early during the configuration bootstrap, it sets whatever
the current value of Translatable::get_default_locale() is there.
Any changes at a later time don't affect newly created objects,
even Translatable::reset() doesn't alter the initially configured 'defaults'.
2016-05-19 12:50:42 +12:00
Damian Mooyman
8d4e345860 Add changelog for 2.2.0 2016-05-19 12:03:06 +12:00
Damian Mooyman
262f5431d9 Merge branch '2.1' into 2 2016-05-19 11:59:48 +12:00
Damian Mooyman
29713e9d81 Update translations 2016-05-18 16:58:44 +12:00
Damian Mooyman
d4f064c3f5 Merge pull request #240 from webtorque7/cachekey
Fixes #239, cacheKeyComponent updates cache key when filtering is disabled
2016-04-04 18:22:27 +12:00
Conrad
07bd3c58cb Fixes #239, cacheKeyComponent updates cache key when filtering is disabled 2016-04-04 15:10:24 +12:00
Damian Mooyman
e84b61246e Merge pull request #238 from christopherdarling/gridfieldfix
API Add support for gridfield
2016-03-24 11:55:52 +13:00
Christopher Darling
87687abdab API Add support for gridfield 2016-03-23 21:55:35 +00:00
Damian Mooyman
52b8f5a932 Create 2 branch aliased as 2.2 2016-03-24 10:30:37 +13:00
flxlabs
7bfece9666 Update HtmlEditorField.Translatable.js
Should resolve Issue #214
2016-03-09 15:49:19 +00:00
Daniel Hensby
1ad0d0b0a2 Merge pull request #231 from micmania1/cms-dependency 2016-03-07 15:40:26 +00:00
micmania1
d706885322 Moved translatable dependency from CMS 2016-03-03 23:13:23 +00:00
Damian Mooyman
3e87a27ed4 Updated changelog for 2.1.1 release 2016-02-04 17:56:03 +13:00
Damian Mooyman
54d49c28ea Update translations 2016-02-04 11:03:42 +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
UndefinedOffset
58156353d9 BUGFIX: Fixed issue #213 causing crash when accessing a translation with a checkbox 2015-12-02 10:04:22 -04: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
Damian Mooyman
d3c960a820 Update translations 2015-11-17 16:07:38 +13: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
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
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
Damian Mooyman
1c76fdbbee Update translations 2015-05-26 18:25:18 +12:00
Ingo Schommer
f4b41ddd92 Updated Travis build status branch 2015-04-29 19:19:15 +12:00
Ingo Schommer
8102975ce9 Updated Travis build status branch 2015-04-29 19:19:03 +12:00
Ingo Schommer
05b4b84f19 Fixed 3.x deprecations, updated dep from 3.1 to 3.2 2015-04-29 18:56:06 +12:00
Ingo Schommer
f2a017a21c Limit compat to 3.1
No longer compatible with 3.2 or higher due to deprecation
warnings on has_one() vs hasOne().
2015-04-29 18:54:26 +12:00
Ingo Schommer
94945a49cd Document user permission 2015-04-27 13:59:42 +12:00
Ingo Schommer
10a8352a6b Merge pull request #187 from tractorcow/pulls/2.0/obsolete-fix
Improve dev/build with obsolete class names
2015-04-09 15:47:21 +12:00
Damian Mooyman
c0d302eb8e Improve dev/build with obsolete class names 2015-02-24 11:17:03 +13:00
Ingo Schommer
c741a0bdf9 Merge pull request #186 from tractorcow/pulls/3.2-compat-on-2.x
Compatibility with 3.2
2015-02-23 21:57:32 +13:00
Ingo Schommer
986beafa44 Compatibility with 3.2
3.2 still uses SQLQuery rather than SQLSelect,
but changes the getWhere() return signature.
2015-02-23 18:51:59 +13:00
Damian Mooyman
4c59f97249 Update translations 2015-02-23 16:53:46 +13:00
Dirk Adler
1b196d8a83 fixes URLSegment validation for non nested urls 2014-11-19 17:02:18 +13:00
Damian Mooyman
818d7e27bd Update translations 2014-11-19 14:21:40 +13:00
Damian Mooyman
8563c7cc59 Remove empty translations 2014-08-21 15:26:15 +12:00
Sean Harvey
7c97324ff6 Updating translations 2014-08-20 09:24:05 +12:00
Ingo Schommer
c8c375bd6d Split out 3.1 compatible branch (removed master-based travis configs) 2014-08-01 15:59:44 +12:00