Daniel Hensby
|
b7bb7a46da
|
Merge branch '3.2' into 3.3
|
2016-11-23 22:26:15 +00:00 |
|
Daniel Hensby
|
17eb351f81
|
Merge branch '3.1' into 3.2
|
2016-11-23 21:54:22 +00:00 |
|
Damian Mooyman
|
730512f036
|
Merge pull request #6328 from dhensby/pulls/3.1/test-i18n-fix
FIX Tests shouldnt set date or time format to null
|
2016-11-24 10:01:42 +13:00 |
|
Daniel Hensby
|
03b4e6ea32
|
FIX Tests shouldnt set date or time format to null
|
2016-11-23 12:36:53 +00:00 |
|
Daniel Hensby
|
fad53ae33e
|
Merge branch '3.2' into 3.3
|
2016-11-03 13:26:30 +00:00 |
|
Daniel Hensby
|
6eebf07a8e
|
Merge branch '3.1' into 3.2
|
2016-11-03 13:20:11 +00:00 |
|
Daniel Hensby
|
c914dde7d1
|
Update travis build to use target branch as core release
|
2016-11-03 13:17:41 +00:00 |
|
Damian Mooyman
|
182c9fb70f
|
Merge pull request #6282 from sminnee/fix-32
FIX: Ensure that builds use the 3.2 dependencies.
|
2016-11-03 17:40:30 +13:00 |
|
Sam Minnee
|
edfe514540
|
FIX: Ensure that builds use the 3.4 dependencies.
This fix does it in a way that doesn’t need manual maintenance
per-branch
|
2016-11-03 16:38:38 +13:00 |
|
Daniel Hensby
|
a97ebf93de
|
Merge branch '3.2' into 3.3
|
2016-10-27 16:15:10 +01:00 |
|
Daniel Hensby
|
5f4f07a256
|
Merge branch '3.1' into 3.2
|
2016-10-27 16:14:01 +01:00 |
|
Loz Calver
|
68866ad31f
|
Merge pull request #6238 from nfauchelle/patch-2
Remove double quotes so example is not parsed.
|
2016-10-27 09:05:36 +01:00 |
|
Nick
|
d1c29d6595
|
Remove double quotes so example is not parsed.
[Notice] Undefined variable: map
Since it's using double quotes it tries to process $map, $key and $value
|
2016-10-27 09:06:11 +13:00 |
|
Daniel Hensby
|
64de2223f8
|
Merge branch '3.2' into 3.3
|
2016-09-14 11:39:28 +01:00 |
|
Daniel Hensby
|
90a01870ea
|
Merge branch '3.1' into 3.2
|
2016-09-14 11:39:00 +01:00 |
|
Damian Mooyman
|
014d6db8d8
|
Merge pull request #5989 from dhensby/pulls/3.1/fix-sake-lf
FIX Force line endings to LF on sake file
|
2016-09-14 10:21:41 +12:00 |
|
Daniel Hensby
|
a14df0bc2d
|
FIX Force line endings to LF on sake file
|
2016-09-12 14:15:07 +01:00 |
|
Daniel Hensby
|
b80dc6450a
|
Merge branch '3.2' into 3.3
|
2016-09-07 09:21:21 +01:00 |
|
Damian Mooyman
|
9455ced41a
|
Merge pull request #5959 from dhensby/pulls/3.2/bad-strpos-fix
FIX Bad strpos call in HTTP::register_etag()
|
2016-09-07 12:05:57 +12:00 |
|
Daniel Hensby
|
e7ecf6cf15
|
FIX Bad strpos call in HTTP::register_etag()
|
2016-09-06 23:32:57 +01:00 |
|
Daniel Hensby
|
088d88e978
|
Merge branch '3.2' into 3.3
|
2016-08-22 16:22:02 +01:00 |
|
Daniel Hensby
|
f4a6e9e517
|
Merge branch '3.1' into 3.2
|
2016-08-22 15:30:03 +01:00 |
|
Loz Calver
|
0f3eabcf03
|
Merge pull request #5902 from dhensby/pulls/relation-list-cleanup
Cleanup of RelationList, HasManyList and ManyManyList
|
2016-08-22 14:27:29 +01:00 |
|
Loz Calver
|
c8f49045dc
|
Merge pull request #5903 from dhensby/pulls/3.2/fix-bad-arraylist-sort
FIX ArrayList sorting now caseinsensitive
|
2016-08-22 14:27:10 +01:00 |
|
Daniel Hensby
|
229a2b9217
|
Merge pull request #4133 from nimeso/patch-1
|
2016-08-22 11:52:47 +01:00 |
|
Daniel Hensby
|
4998b80445
|
FIX ArrayList sorting now caseinsensitive
|
2016-08-22 11:21:50 +01:00 |
|
Daniel Hensby
|
8e4e2b4fa8
|
Merge pull request #4173 from AntonyThorpe/patch-4
DOCS Update 06_Tabbed_Forms.md
|
2016-08-19 15:49:51 +01:00 |
|
Daniel Hensby
|
8737ddefba
|
Cleanup of RelationList, HasManyList and ManyManyList
|
2016-08-19 10:37:58 +01:00 |
|
Damian Mooyman
|
6e864702ce
|
Merge pull request #5901 from dhensby/pulls/3.2/cleanup-gridautocompleter
Cleaning up GridFieldAddExistingAutocompleter
|
2016-08-19 11:24:55 +12:00 |
|
Daniel Hensby
|
bdf9e97b0e
|
Cleaning up GridFieldAddExistingAutocompleter
|
2016-08-19 00:00:56 +01:00 |
|
Daniel Hensby
|
dc008b38ab
|
Merge branch '3.2' into 3.3
|
2016-08-18 22:18:47 +01:00 |
|
Damian Mooyman
|
8028387c84
|
Merge pull request #5847 from dhensby/pulls/3.2/fix-etag-quoting
FIX ETag header now properly quoted
|
2016-08-17 11:16:26 +12:00 |
|
Damian Mooyman
|
ebc0bafea9
|
Merge 3.2 into 3.3
|
2016-08-15 18:51:07 +12:00 |
|
Damian Mooyman
|
f3afd14e4f
|
Merge 3.2 into 3.3
|
2016-08-15 18:47:43 +12:00 |
|
Damian Mooyman
|
8ec89be9d4
|
Merge 3.1 into 3.2
# Conflicts:
# forms/CheckboxSetField.php
# forms/OptionsetField.php
# security/Member.php
# tests/forms/CheckboxSetFieldTest.php
|
2016-08-15 18:46:26 +12:00 |
|
Damian Mooyman
|
cba7950701
|
Merge 3.3.3 into 3.3
|
2016-08-15 18:36:16 +12:00 |
|
Damian Mooyman
|
169d072502
|
Merge 3.2.5 into 3.2
|
2016-08-15 18:35:00 +12:00 |
|
Damian Mooyman
|
439753a61b
|
Merge 3.1.20 into 3.1
|
2016-08-15 18:33:45 +12:00 |
|
Damian Mooyman
|
68986558c9
|
Added 3.3.3 changelog
|
2016-08-15 18:05:32 +12:00 |
|
Damian Mooyman
|
b57fde6cff
|
Update translations
|
2016-08-15 17:44:52 +12:00 |
|
Damian Mooyman
|
351bf6cfe4
|
Added 3.2.5 changelog
|
2016-08-15 17:22:23 +12:00 |
|
Damian Mooyman
|
8178f20eac
|
Update translations
|
2016-08-15 17:02:07 +12:00 |
|
Damian Mooyman
|
6f60d2518b
|
Added 3.1.20 changelog
|
2016-08-15 16:44:36 +12:00 |
|
Damian Mooyman
|
a3f8e522d8
|
Update translations
|
2016-08-15 16:31:56 +12:00 |
|
Damian Mooyman
|
7c0669486a
|
Added 3.3.3-rc2 changelog
|
2016-08-15 15:34:41 +12:00 |
|
Damian Mooyman
|
d83c678b6a
|
Added 3.3.3-rc2 changelog
|
2016-08-15 15:07:26 +12:00 |
|
Daniel Hensby
|
3fa84cf0c6
|
[SS-2016-007] FIX Encode user supplied URL for embeding into page
|
2016-08-15 15:03:42 +12:00 |
|
Damian Mooyman
|
049cdefacf
|
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
|
2016-08-15 15:02:58 +12:00 |
|
Daniel Hensby
|
fa7f5af861
|
[SS-2016-014] FIX Autologin cookies are ignored if autologin is disabled
|
2016-08-15 15:02:53 +12:00 |
|
Daniel Hensby
|
83e3302c04
|
[SS-2016-013] FIX Uncasted member name
|
2016-08-15 15:02:47 +12:00 |
|