Damian Mooyman
|
2c1f837442
|
Merge branch '3.1' into 3.2
# Conflicts:
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
# docs/en/02_Developer_Guides/00_Model/10_Versioning.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
# docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/14_Files/index.md
# lang/cs.yml
# lang/fi.yml
# lang/sk.yml
|
2016-02-29 16:59:20 +13:00 |
|
Damian Mooyman
|
71bf14d590
|
Merge remote-tracking branch 'origin/3.1.18' into 3.1
|
2016-02-29 16:49:25 +13:00 |
|
Damian Mooyman
|
9050761f17
|
Added 3.2.3 changelog
|
2016-02-29 15:22:39 +13:00 |
|
Damian Mooyman
|
2147205dc1
|
Added 3.1.18 changelog
|
2016-02-29 15:10:05 +13:00 |
|
Damian Mooyman
|
3f18b2f8cd
|
Update translations
|
2016-02-29 15:01:10 +13:00 |
|
Damian Mooyman
|
31e04862a8
|
Update translations
|
2016-02-29 14:57:30 +13:00 |
|
Damian Mooyman
|
6c74481462
|
Merge pull request #5104 from ntd/pr3
FIX Do not hang on nested parameters in search context
|
2016-02-29 10:29:05 +13:00 |
|
Nicola Fontana
|
29b35c7ccf
|
Do not hang on nested parameters in search context
Backport of 0b5a57389b for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
|
2016-02-28 21:40:34 +01:00 |
|
Damian Mooyman
|
14aa497b80
|
Merge branch '3.2.3' into 3.2
|
2016-02-27 21:11:57 +13:00 |
|
Damian Mooyman
|
3c053bb85d
|
Added 3.2.3-rc2 changelog
|
2016-02-27 21:00:59 +13:00 |
|
Damian Mooyman
|
3f5c635353
|
Added 3.2.3-rc2 changelog
|
2016-02-27 21:00:46 +13:00 |
|
Damian Mooyman
|
6bbd50c917
|
Update translations
|
2016-02-27 21:00:46 +13:00 |
|
Daniel Hensby
|
c2a0e8945f
|
FIX undeclared constant issue
|
2016-02-27 21:00:45 +13:00 |
|
Damian Mooyman
|
cd05068814
|
Merge branch '3.1.18' into 3.1
|
2016-02-27 20:59:51 +13:00 |
|
Damian Mooyman
|
b77acaeeb7
|
Added 3.1.18-rc2 changelog
|
2016-02-27 20:53:23 +13:00 |
|
Damian Mooyman
|
9d9a6fc0e8
|
Added 3.1.18-rc2 changelog
|
2016-02-27 20:53:15 +13:00 |
|
Damian Mooyman
|
387264fbbb
|
Update translations
|
2016-02-27 20:53:15 +13:00 |
|
Daniel Hensby
|
bd48d89642
|
FIX undeclared constant issue
|
2016-02-27 20:53:15 +13:00 |
|
Damian Mooyman
|
4d6e8a4dbd
|
Merge pull request #5102 from dhensby/pulls/fix-proxy-host-header
BUG Fixing undeclared constant issue
|
2016-02-27 20:19:11 +13:00 |
|
Daniel Hensby
|
3d2fcf9087
|
Fixing undeclared constant issue
|
2016-02-26 14:45:07 +00:00 |
|
Damian Mooyman
|
a2c7524b85
|
Merge branch '3.1.18' into 3.1
|
2016-02-26 17:39:06 +13:00 |
|
Damian Mooyman
|
73780ce94e
|
Merge branch '3.2.3' into 3.2
|
2016-02-26 17:36:45 +13:00 |
|
Damian Mooyman
|
8c12b6f992
|
Added 3.2.3-rc1 changelog
|
2016-02-26 17:25:00 +13:00 |
|
Damian Mooyman
|
9e0037d43e
|
Added 3.1.18-rc1 changelog
|
2016-02-26 17:13:49 +13:00 |
|
Damian Mooyman
|
320c833fa1
|
BUG Fix regressions in missing CSRF on print button
|
2016-02-26 17:03:35 +13:00 |
|
Damian Mooyman
|
b0ad86bf8f
|
BUG Fix regression in gridfield get actions
|
2016-02-26 17:03:27 +13:00 |
|
Damian Mooyman
|
cc95703b18
|
BUG Fix regressions in missing CSRF on print button
|
2016-02-26 16:59:40 +13:00 |
|
Damian Mooyman
|
3dc0d0ee89
|
BUG Fix regression in gridfield get actions
|
2016-02-26 16:59:25 +13:00 |
|
Damian Mooyman
|
ff5ed6efeb
|
Merge remote-tracking branch 'origin/3.2.2' into 3.2
|
2016-02-24 17:03:43 +13:00 |
|
Damian Mooyman
|
06d5050321
|
Merge remote-tracking branch 'origin/3.1.17' into 3.1
|
2016-02-24 16:54:18 +13:00 |
|
Damian Mooyman
|
531b8b167b
|
Added 3.2.2 changelog
|
2016-02-24 15:33:02 +13:00 |
|
Damian Mooyman
|
1fe7d029db
|
Added 3.1.17 changelog
|
2016-02-24 15:31:12 +13:00 |
|
Damian Mooyman
|
01c13bf6b3
|
Update translations
|
2016-02-24 15:20:40 +13:00 |
|
Damian Mooyman
|
50aab6d8d4
|
Update translations
|
2016-02-24 15:14:58 +13:00 |
|
Damian Mooyman
|
9a4f0b48df
|
Added 3.1.17-rc2 changelog
|
2016-02-24 12:38:54 +13:00 |
|
Damian Mooyman
|
d51264873d
|
Merge pull request #5087 from scott1702/fix-nav
Fix incorrect height on main nav after toggle
|
2016-02-24 12:32:47 +13:00 |
|
Damian Mooyman
|
6cd66a6b13
|
Added 3.2.2-rc2 changelog
|
2016-02-24 12:01:41 +13:00 |
|
Ingo Schommer
|
37059eb6b3
|
[ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers
|
2016-02-24 11:47:16 +13:00 |
|
Damian Mooyman
|
013524af50
|
[ss-2016-002] Ensure Gridfield actions respect CSRF
|
2016-02-24 11:47:15 +13:00 |
|
Damian Mooyman
|
5d2fc0d7ca
|
[ss-2015-028] Block unauthenticated access to dev/build/defaults
|
2016-02-24 11:46:33 +13:00 |
|
Ingo Schommer
|
faa94d51d5
|
[ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers
|
2016-02-24 11:33:54 +13:00 |
|
Damian Mooyman
|
e2c77c5a8f
|
[ss-2016-002] Ensure Gridfield actions respect CSRF
|
2016-02-24 11:33:53 +13:00 |
|
Damian Mooyman
|
15d4db3b4a
|
[ss-2015-028] Block unauthenticated access to dev/build/defaults
|
2016-02-24 11:32:49 +13:00 |
|
scott1702
|
a67b8144b0
|
Fix incorrect height on main nav after toggle
|
2016-02-24 10:23:16 +13:00 |
|
Daniel Hensby
|
caf0ec3c5f
|
Merge pull request #5074 from tractorcow/pulls/3.2/fix-publish-version
BUG Correct behaviour of publish with $createNewVersion = true
|
2016-02-22 22:52:10 +00:00 |
|
Damian Mooyman
|
65a0981c08
|
BUG Correct behaviour of publish with $createNewVersion = true
Fixes #5040
Cleanup code to make behaviour more apparent
|
2016-02-23 10:15:49 +13:00 |
|
Damian Mooyman
|
94cec68c7e
|
Merge pull request #5065 from SpiritLevel/typo
typo in api link
|
2016-02-22 09:14:51 +13:00 |
|
David Alexander
|
23c6b25c6c
|
typo in api link
|
2016-02-18 23:11:31 -07:00 |
|
Damian Mooyman
|
f1f662fd49
|
Merge pull request #5050 from SpiritLevel/3.2
DOCS 3.2 : fixing api: links now that api: tag parser working
|
2016-02-19 14:28:20 +13:00 |
|
Damian Mooyman
|
4ba2eb6244
|
Merge pull request #5053 from robbieaverill/patch-1
Typo fixes
|
2016-02-19 14:27:07 +13:00 |
|