Damian Mooyman
393a4788bf
Merge branch '3.2' into 3.3
2016-02-29 17:29:41 +13:00
Damian Mooyman
f7d49df258
Merge tag '3.2.3' into 3.2
...
Release 3.2.3
# Conflicts:
# lang/cs.yml
2016-02-29 17:27:00 +13:00
Damian Mooyman
24a6c53645
Merge branch '3.2' into 3.3
...
# Conflicts:
# admin/code/ModelAdmin.php
# lang/cs.yml
# lang/lt.yml
# lang/sk.yml
2016-02-29 17:03:22 +13:00
Damian Mooyman
4fbf0b0863
Merge remote-tracking branch 'origin/3.3.1' into 3.3
2016-02-29 17:01:26 +13:00
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
fb58233201
Added 3.3.1 changelog
2016-02-29 15:23: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
8a8d82cc57
Merge branch '3.3.1' into 3.3
...
# Conflicts:
# lang/cs.yml
2016-02-27 21:19:29 +13:00
Damian Mooyman
14aa497b80
Merge branch '3.2.3' into 3.2
2016-02-27 21:11:57 +13:00
Damian Mooyman
807377ad2d
Added 3.3.1-rc2 changelog
2016-02-27 21:02:09 +13:00
Damian Mooyman
3d2c87029c
Added 3.3.1-rc2 changelog
2016-02-27 21:01: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
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
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
ae29576763
Merge branch '3.3.1' into 3.3
2016-02-26 17:35:42 +13:00
Damian Mooyman
a80c6e1e8c
Added 3.3.1-rc1 changelog
2016-02-26 17:30:07 +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
5f2d3f31d7
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# dev/DevelopmentAdmin.php
# docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
# lang/cs.yml
# lang/lt.yml
2016-02-24 17:29:06 +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
0ec021dac8
Added 3.3.0 changelog
2016-02-24 16:30:34 +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
9a4f0b48df
Added 3.1.17-rc2 changelog
2016-02-24 12:38:54 +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
Ingo Schommer
faa94d51d5
[ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers
2016-02-24 11:33:54 +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
Damian Mooyman
73ee4e5458
Merge pull request #5049 from SpiritLevel/3.1
...
DOCS 3.1 : fixing api: links
2016-02-19 14:18:37 +13:00
Damian Mooyman
af28b0a414
Added 3.2.2-rc1 changelog
2016-02-19 11:22:10 +13:00
Damian Mooyman
f32302522c
Added 3.1.17-rc1 changelog
2016-02-19 10:30:25 +13:00
Damian Mooyman
97089db8a6
Added 3.3.0-rc3 changelog
2016-02-18 17:29:18 +13:00
Ingo Schommer
893e49703d
[ss-2016-003] Hostname, IP and Protocol Spoofing through HTTP Headers
2016-02-18 17:28:54 +13:00
David Alexander
903379bde2
DOCS 3.2 : fixing api: links now that api: tag parser working
...
fixed a couple of external links
fixed a docs link
2016-02-17 18:02:38 -07:00
Robbie Averill
0811e87ecc
Typo fixes
...
* Fixed typo in `$dependencies`
* Updated "simplest example usage of the `Injector`" to specify the correct class name
2016-02-18 13:53:36 +13:00
David Alexander
febbd35b51
DOCS 3.1 : fixing api: links
...
missed one
2016-02-17 03:00:22 -07:00
Richard Rudy
87718597e8
FIX "where" method in SQLUpdate Example
...
Method should be addWhere
2016-02-15 02:27:04 -05:00
Patrick Nelson
35ce802ff6
Update 01_Caching.md
...
`'failure_callback' => ''` fails but providing `'failure_callback' => null` seems to work fine (since it expects a closure but gets a string, I think).
2016-02-10 12:59:58 -05:00
Damian Mooyman
96a905aa09
Update changelog
2016-02-09 18:07:11 +13:00
Damian Mooyman
f66e21c10d
Added 3.3.0-rc2 changelog
2016-02-09 18:02:22 +13:00
