Commit Graph

304 Commits

Author SHA1 Message Date
Steve Boyd
ed155503d2 Merge branch '2.4' into 2 2021-01-02 11:32:40 +13:00
Steve Boyd
8fee2b2372 Merge branch '2.3' into 2.4 2021-01-02 11:31:18 +13:00
Steve Boyd
6a191b09f9 Merge branch '2.2' into 2.3 2021-01-02 11:30:41 +13:00
Maxime Rainville
d168dc7830 Merge branch '2.1' into 2.2 2020-10-15 17:35:15 +13:00
Sam Minnee
97379fc92b MNT: Fix invalid composer.json casing 2020-10-11 16:23:45 +13:00
Sam Minnee
ae1155cd04 MNT: Fix invalid composer.json casing 2020-10-11 16:22:57 +13:00
Ingo Schommer
a8385e1f43
Merge pull request #286 from open-sausages/pulls/2/warning-of-imminent-anarchy
DOC Add a warnign about support for translatable
2020-08-10 13:18:37 +12:00
Maxime Rainville
23a6c875e6 DOC Add a warnign about support for translatable 2020-08-10 11:54:43 +12:00
Aaron Carlino
bed7d9a068
META: Add github action to build docs 2019-12-19 13:49:38 +13:00
Aaron Carlino
2f4fc13743
Merge pull request #284 from silverstripe/pulls/2.1/new-docs
Update userguide for compliance with new docs site
2019-12-19 12:43:34 +13:00
Aaron Carlino
9b89384aa2 Update userguide for compliance with new docs site 2019-12-06 15:03:34 +13:00
Guy Marriott
7806356ddc
Merge branch '2.3' into 2.4 2019-08-01 11:08:29 +12:00
Robbie Averill
a353d52372 Merge branch '2.4' into 2 2019-07-23 15:40:03 +02:00
Robbie Averill
bff0c63b4f Remove obsolete branch alias 2019-07-23 15:39:17 +02:00
Robbie Averill
f761674834 Merge branch '2.3' into 2.4 2019-07-23 15:38:42 +02:00
Robbie Averill
78694caff3 Update Travis builds to include PHP 7 2019-07-23 15:36:05 +02:00
Robbie Averill
220e49271c Merge branch '2.2' into 2.3 2019-07-23 15:33:51 +02:00
Guy Marriott
34e5b0bc60
Merge pull request #283 from creative-commoners/pulls/2.3/multibyte-urls
FIX Translatable now handles multibute URLs when they are enabled
2019-04-05 16:07:38 +13:00
Robbie Averill
c09866f586 FIX Translatable now handles multibute URLs when they are enabled 2019-04-05 14:29:03 +13:00
Robbie Averill
43b44f4800
Merge pull request #281 from wernerkrauss/patch-1
Updating links to transifex and docs
2018-08-28 17:31:44 +12:00
wernerkrauss
66593d8bb3
Updating links to transifex and docs
Doc link was broken
2018-08-28 07:21:28 +02:00
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
dfa1c965a5 Update branch alias for 2.4.x-dev 2018-02-22 10:27:17 +13: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