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
Daniel Hensby
6d41db77fa
[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 15:02:41 +12:00
Daniel Hensby
f85dea2e6d
[SS-2016-008] Reset Member::Salt on password change
2016-08-15 15:02:36 +12:00
Damian Mooyman
bf19806f50
Update translations
2016-08-15 15:00:58 +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
e1352b6494
Merge 3.3.3 into 3.3
2016-08-05 16:41:13 +12:00
Damian Mooyman
958344eb5d
Added 3.3.3-rc1 changelog
2016-08-05 16:33:22 +12:00
Damian Mooyman
0d5ae23f2b
Merge 3.2 into 3.3
2016-08-05 14:36:35 +12: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
