Commit Graph

282 Commits

Author SHA1 Message Date
Guy 4cf60e9393
Merge remote-tracking branch 'origin/2.2' into 2.3 2018-06-19 10:09:17 +12:00
Robbie Averill 9c8609f788
Merge pull request #280 from creative-commoners/pulls/master/add-supported-module-badge
Add supported module badge to readme
2018-06-18 10:42:19 +12:00
Dylan Wagstaff ec34959baa Add supported module badge to readme 2018-06-15 17:50:48 +12:00
Damian Mooyman 603abfe1d6
Merge pull request #279 from creative-commoners/pulls/2.2/fix-invalid-stage-pt2
BUG Fix invalid stage being specified for queried records
2018-06-13 09:28:24 +12:00
Guy 6a6bc6d677 BUG Fix invalid stage being specified for queried records 2018-06-12 15:16:33 +12:00
Robbie Averill b8d794a5c2
Merge pull request #278 from creative-commoners/pulls/2.2/fix-invalid-stage
BUG Fix invalid stage being specified for queried records
2018-06-12 09:16:07 +12:00
Damian Mooyman bea626eba3
BUG Fix invalid stage being specified for queried records 2018-06-11 15:08:34 +12:00
Robbie Averill 50f145a891 Merge branch '2.2' into 2.3 2018-04-20 16:36:23 +12:00
JorisDebonnet 60b8ba9cdc Avoid flagging pages as "modified"
I moved the internals of `writeToStage` in here, in order to be able to use `writeWithoutVersion`.
2018-04-20 16:32:41 +12:00
Robbie Averill 2c81a62b00 Update translations 2018-02-22 09:28:36 +13:00
Robbie Averill 99dd1012b6 Remove obsolete branch-alias 2018-02-22 09:25:13 +13:00
Daniel Hensby bb4d553b9c
Merge pull request #273 from thaissa/language-dropdown-fix 2018-02-09 12:16:21 +00:00
Thaissa Mendes 4cfae43fad When using LanguageDropdownField on searchable_fields, it doesn't get instantiated with title parameter - and as DropdownField class doesn't require it, we should make it optional 2018-02-09 09:49:03 -02:00
Will Rossiter 4ef5d462dd Merge pull request #266 from micahsheets/2.2
Add default hreflang tag for pages without translations.
2017-09-26 10:52:58 +13:00
Franco Springveldt 044971c6cf Update translations 2017-08-25 16:44:47 +12:00
Micah Sheets 62523e23df Update Translatable.php 2017-08-15 10:06:38 +12:00
Robbie Averill e105bc50f8 Merge remote-tracking branch 'origin/2.1' into 2.2 2017-06-01 14:21:37 +12:00
Ingo Schommer c906156c93 Only test supported releases and PHP versions 2017-02-13 22:16:47 +13:00
Brett Tasker 81eaa621e7 Update translations 2017-02-09 11:28:52 +13:00
Damian Mooyman 00682aa7bc Merge pull request #259 from webbuilders-group/ambiguous-column-fix
BUGFIX: Fixed potentential ambiguous column crash caused when query is joined to another table
2017-02-01 09:49:05 +13:00
UndefinedOffset e302c4ec46 BUGFIX: Fixed ambiguous column crash caused when publishing a versioned object if the query is joined against another table 2017-01-31 15:56:04 -04:00
Damian Mooyman 06da948586 Update translations 2016-11-17 12:39:49 +13:00
Damian Mooyman 6f0da00776 Merge pull request #254 from w-huber/2.2
Bug: There is no function self::get_reading_locale(), use self::get_current_locale()
2016-11-16 13:04:21 +13:00
w-huber 3bae1ffbdb Merge pull request #1 from w-huber/w-huber-patch-1
Update Translatable.php
2016-11-02 14:08:42 +01:00
w-huber c6f9bd0330 Update Translatable.php 2016-11-02 14:04:47 +01:00
Damian Mooyman 18b3c8f8bf Update translations 2016-08-17 11:08:01 +12:00
Damian Mooyman 6931031bc9 Merge pull request #250 from chrometoasters/pulls/249-no-translations
Fix link hreflang meta tags being output when there are no translations
2016-08-12 13:50:01 +12:00
Michal Kleiner 7f34bac485 Adjust block indentation 2016-08-04 16:32:59 +12:00
Michal Kleiner 4324d5b607 Output extra meta tags only when there are any existing translations 2016-08-04 16:32:17 +12:00
Daniel Hensby 0ae31a052e Merge pull request #248 from 3Dgoo/feature/folder-check-fix
Check if FieldList has tabset before trying to add cms fields to tabs.
2016-08-01 08:44:10 +01:00
3dgoo (Michael) 0fea48a608 Check if object is folder before trying to add cms fields. 2016-08-01 16:28:25 +09:30
Damian Mooyman 61afbab8b7 Merge pull request #243 from open-sausages/pulls/siteconfig-defaults-tests
Remove SiteConfig defaults from tests (fixes #224)
2016-05-19 13:59:00 +12:00
Damian Mooyman 345bb7a0ec Merge branch '2.2' into 2 2016-05-19 13:55:51 +12:00
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 d9f88049d6 Alias 2 branch as 2.3 2016-05-19 12:03: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
Ingo Schommer cf043a0106 Remove SiteConfig defaults from tests (fixes #224)
Causes TranslatableSiteConfigTest.testCanEditTranslatedRootPages to fail
when used in the CWP recipe (possibly because of subsites?).
2016-05-19 11:33:14 +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