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
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
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
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
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
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
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
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
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
1a03bdba7a
Added 3.2.5-rc2 changelog
2016-08-15 14:17:41 +12:00
Damian Mooyman
12a6b357e7
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 14:14:42 +12:00
Daniel Hensby
b1f449762b
[SS-2016-014] FIX Autologin cookies are ignored if autologin is disabled
2016-08-15 14:07:57 +12:00
Daniel Hensby
281b0de571
[SS-2016-013] FIX Uncasted member name
2016-08-15 14:07:51 +12:00
Daniel Hensby
2b30ade44d
[SS-2016-011] ChangePasswordForm does not check $member->canLogin before login
...
This could be used as a way to circumvent login restrictions by using the change password feature to log users in that are unable to login for reasons other than too many password attempts
2016-08-15 14:07:40 +12:00
Daniel Hensby
dc47f7ec9a
[SS-2016-008] Reset Member::Salt on password change
2016-08-15 14:07:24 +12:00
Damian Mooyman
63937aa124
Update translations
2016-08-15 14:01:09 +12:00
Damian Mooyman
b2a7170c64
Added 3.1.20-rc2 changelog
2016-08-15 13:41:31 +12:00
Damian Mooyman
62a242154e
[ss-2016-015] Fix value / title escaping in CheckboxSetField and OptionsetField
2016-08-15 13:24:06 +12:00
Daniel Hensby
1c7d5de51b
[SS-2016-014] FIX Autologin cookies are ignored if autologin is disabled
2016-08-15 13:24:06 +12:00
Daniel Hensby
6817c57f64
[SS-2016-013] FIX Uncasted member name
2016-08-15 13:21:14 +12:00
Daniel Hensby
6606d98663
[SS-2016-011] ChangePasswordForm does not check $member->canLogin before login
...
This could be used as a way to circumvent login restrictions by using the change password feature to log users in that are unable to login for reasons other than too many password attempts
2016-08-15 13:20:02 +12:00
Daniel Hensby
298f61521c
[SS-2016-008] Reset Member::Salt on password change
2016-08-15 13:19:02 +12:00
Damian Mooyman
4d9f929ca3
Update translations
2016-08-15 13:12:49 +12:00
Daniel Hensby
56f0b72e8d
FIX ETag header now properly quoted
2016-08-11 15:49:29 +01:00
Damian Mooyman
66668450ed
Merge 3.2.5 into 3.2
2016-08-05 14:33:10 +12:00
Damian Mooyman
6e6451fa71
Added 3.2.5-rc1 changelog
2016-08-05 13:24:35 +12:00
Damian Mooyman
cb39f2ef27
Merge 3.1 into 3.2
...
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/fa_IR.js
# javascript/lang/src/fa_IR.js
2016-08-05 11:41:04 +12:00
Damian Mooyman
3fb3a1bd7d
Merge 3.1.20 into 3.1
2016-08-05 11:31:56 +12:00
Damian Mooyman
ec969c21e6
Added 3.1.20-rc1 changelog
2016-08-05 11:17:57 +12:00
Damian Mooyman
9805544cee
Update translations
2016-08-05 11:06:51 +12:00
Damian Mooyman
e683c97f6e
Merge pull request #5867 from andrewandante/MINOR_getAuthenticator-returns-default
...
Modify getAuthenticator to fall back to get_default_authenticator
2016-08-03 12:07:35 +12:00
Andrew Aitken-Fincham
66f2e6811b
modify getAuthenticator to fall back to get_default_authenticator
2016-08-03 10:36:43 +12:00
Daniel Hensby
d083c9622a
Merge pull request #4394 from simonwinter/patch-1
...
Update 05_Typography.md
2016-08-02 21:27:56 +01:00
