Christopher Pitt
ae5cf4e1b8
Added Scrutinizer support
2015-11-07 11:18:33 +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
Damian Mooyman
1c76fdbbee
Update translations
2015-05-26 18:25:18 +12:00
Ingo Schommer
fcabda4188
Merge remote-tracking branch 'origin/2.1'
...
# Conflicts:
# .travis.yml
# README.md
# code/model/Translatable.php
# composer.json
2015-04-30 08:51:21 +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
4ae02459a0
Aliasing master branch to 2.2
...
2.1 was required for 3.2 compat
2015-04-29 19:04:30 +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
Damian Mooyman
d58b670fbf
Merge pull request #184 from chillu/pulls/4.0-dep-master
...
Increase required core version from 3.2 to 4.0.
2015-02-23 08:47:54 +13:00
Ingo Schommer
5beb57e0bc
Increase required core version from 3.2 to 4.0.
...
Translatable::augmentSQL() follows new DataExtension signature,
using SQLSelect rather than SQLQuery.
2015-02-21 15:44:38 +13:00
Ingo Schommer
b8e0bee7be
Fixed table markdown again
...
Wow, Github markdown is PICKY
2015-02-21 12:24:07 +13:00
Ingo Schommer
f35b0bcc0e
Fixed table markdown
2015-02-21 12:15:28 +13:00
Ingo Schommer
03ac2fadec
Merge pull request #178 from dhensby/master
...
Adding .editorconfig
2015-01-03 14:02:10 +13:00
Daniel Hensby
5ff6228c75
Adding .editorconfig
2014-12-04 15:51:29 +00: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
Ingo Schommer
7633c07524
Merge pull request #171 from JorisDebonnet/patch-1
...
Avoid flagging pages as "modified"
2014-11-12 21:22:57 +13:00
JorisDebonnet
39b1bc6492
Avoid flagging pages as "modified"
...
I moved the internals of `writeToStage` in here, in order to be able to use `writeWithoutVersion`.
2014-11-11 16:15:09 +01:00
Damian Mooyman
13eba8d020
Alias dev-master as 2.1
2014-08-21 15:30:48 +12: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
2ed6df4498
Removed codesniffer from builds
...
Already partially replaced by Scrutinizer CI
2014-08-11 22:54:33 +12:00
Ingo Schommer
1eb06177bb
Merge pull request #167 from silverstripe/pulls/3.2-compat
...
Fix unit tests for 3.2 compatibility
2014-08-11 22:36:30 +12:00
Ingo Schommer
eb1917abbf
Updated composer core dep to 3.2
2014-08-11 22:36:07 +12:00
Ingo Schommer
07937a20f9
Fix unit tests for 3.2 compatibility
...
Exclude 'Version' from createTranslation():
Causes inconsistencies in Versioned->augmentWrite() because it doesn't write a SiteTree_versions record,
since the Version is already set on the record. In fact, its just copied from the original record,
so there's no SiteTree_versions row correlating to this new record yet.
2014-08-11 22:35:55 +12:00
Ingo Schommer
c8c375bd6d
Split out 3.1 compatible branch (removed master-based travis configs)
2014-08-01 15:59:44 +12:00
Ingo Schommer
7d8de22d47
Merge pull request #163 from xini/master
...
BUGFIX support for dropdowns of has_one relations
2014-07-21 23:25:48 +12:00
Florian Thoma
5deae7a8f9
BUGFIX support for dropdowns of has_one relations
2014-05-21 14:39:07 +10:00
Damian Mooyman
7342850139
Updated translations
2014-05-20 15:16:40 +12:00
Ingo Schommer
4d306cda6b
Added min stability to composer (for scrutinizer)
2014-03-13 10:15:47 +13:00