255 Commits

Author SHA1 Message Date
helpfulrobot
43b6bae011 Added standard Travis config 2015-12-18 23:08:27 +13: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
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
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
2.0.9
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
2.0.8
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 2.0.7 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
2.0.6
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 2.0.5 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