Daniel Hensby
a0812f987a
Merge 3.1 into 3.2
...
Conflicts:
admin/javascript/LeftAndMain.js
control/HTTPRequest.php
docs/en/00_Getting_Started/00_Server_Requirements.md
2016-04-26 00:09:33 +01:00
Michael Strong
1f820b0b1c
DOCS allowed_actions access control ( #5333 )
2016-04-18 17:49:30 +12:00
Patrick Nelson
49e6d701e5
Removal of FlushGeneratedImagesTask was not documented.
...
This task appears to have been superseded by a new task called `RegenerateCachedImagesTask` but it was not documented, so `FlushGeneratedImagesTask` simply appeared to have vanished. This will update the documentation to reflect this change for both v3.2 and v3.3 (separate PR).
2016-04-05 15:09:46 -07:00
Damian Mooyman
b8e7f9a934
Standardise spelling of "customise"
...
Fixes #3988
2016-03-30 13:17:28 +13:00
Daniel Hensby
b8c8875303
DOCS Explicitly noting lack of PHP 7 support
2016-03-01 10:14:14 +00:00
Damian Mooyman
22c0025d47
Improve documentation on documentation
2016-03-01 12:18:11 +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
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
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
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
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
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
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
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
DouG
87a674a460
Correct minor typo
...
had the word "fun" rather than "run"
2016-02-01 16:25:17 +13:00
Myles Beardsmore
b0057c77f0
Removed PlayerCsvBulkLoader as importer
...
Removed PlayerCsvBulkLoader as model importer class and replaced it with CsvBulkLoader instead.
2016-01-25 15:26:25 +13:00
Daniel Hensby
f131b0d91e
Merge pull request #4961 from silverstripe/tractorcow-patch-1
...
DOCS Update branch names
2016-01-22 18:20:15 +00:00
Damian Mooyman
bf8bf5e4d5
BUG Prevent Versioned::doRollbackTo from creating incorrect versions on subclasses of Versioned DataObjects
...
Document correct configuration of Versioned DataObjects
Fixes #4936
2016-01-22 15:35:58 +13:00
Damian Mooyman
cca7129385
BUG Revert lost documentation
...
Resolves some regressions from #3735
2016-01-22 11:45:00 +13:00
Damian Mooyman
45c6d0284a
Minor: Update branch names
2016-01-21 14:02:42 +13:00
Meeeeeeow
e448774150
Fixed Typo
...
Changed 'Gudes' to 'Guides'
2016-01-19 16:18:35 +13:00
Damian Mooyman
46cbe809ac
Merge remote-tracking branch 'origin/3.1' into 3.2
...
# Conflicts:
# 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/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
# docs/en/03_Upgrading/index.md
# docs/en/05_Contributing/01_Code.md
# forms/TreeMultiselectField.php
# security/Permission.php
2016-01-19 14:00:19 +13:00
David Alexander
45d2b57a65
DOCS 3.1 : typose and broken internal links
2016-01-15 16:39:23 +13:00
