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
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
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
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
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
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
5c99e33eb2
DOCS 3.1 - fixes broken internal links
2016-01-14 23:59:53 +13:00
Damian Mooyman
3c55608075
Merge pull request #4892 from camfindlay/patch-37
...
DOCS FIX typo for i18n
2016-01-06 15:18:51 +13:00
Peter Thaleikis
4366000a9f
fixing examples
...
PSR-2 style for examples
2016-01-06 12:28:26 +13:00
Cam Findlay
7b77380df5
DOCS FIX typo for i18n
...
Was causing a number of 404 crawl errors.
2016-01-06 09:11:23 +13:00
Gordon Anderson
f61cedc03c
Update to 00_Unit_Testing
...
Additional section with instructions on running tests using in memory SQLite,
2015-12-30 13:29:32 +07:00
Damian Mooyman
d63441623a
Merge pull request #4612 from johndalangin/patch-4
...
Added cookie_secure configuration directive
2015-12-22 16:36:05 +13:00
Peter Thaleikis
7db7140a70
fixing example
2015-12-04 11:14:02 +13:00
Daniel Hensby
572945a2fd
Merge pull request #4704 from spekulatius/patch-1
...
fixing syntax error
2015-11-23 14:18:50 +00:00
Hamish Friedlander
b61d6dcd57
[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
2015-11-13 15:20:09 +13:00
Daniel Hensby
583cbdd77f
Merge pull request #4756 from camfindlay/patch-34
...
DOCS Suggest a tool to help people generate their change logs for mod…
2015-11-10 07:50:11 +00:00
Cam Findlay
218049f5c0
DOCS Suggesting a convention for CMS user documentation so CMS users don't get lost in dev docs.
2015-11-10 11:59:38 +13:00
Cam Findlay
c7b2f88d4e
DOCS Suggest a tool to help people generate their change logs for modules.
2015-11-10 11:50:53 +13:00
Damian Mooyman
e07f80014c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
lang/cs.yml
lang/sk.yml
2015-11-03 11:10:46 +13:00
Michael Parkhill
e44f22c6b2
Fix broken link to DataObject api
2015-10-28 11:52:35 +13:00
Christopher Darling
a1e343629b
DOCS: correct config setting for custom editor.css
...
see a964e7636e/admin/code/LeftAndMain.php (L287-L308)
2015-10-26 11:02:47 +00:00
Peter Thaleikis
791c52c6bd
fixing syntax error
2015-10-25 22:41:13 +13:00
David Alexander
e88032a7aa
DOCS : spelling
2015-10-23 13:49:03 +13:00
Cam Findlay
a555817d6f
DOCS Module standard 1.0
...
Adding the module standard to 3.2+ docs.
2015-10-19 11:44:31 +13:00
Daniel Hensby
fa878b1e1f
Merge pull request #4642 from hailwood/patch-1
...
DOCS Remove extra set of li's
2015-10-03 10:28:50 +01:00
Matthew Hailwood
5e68512e1c
Remove extra set of li's
2015-09-30 14:19:20 +13:00
Liam Whittle
71a2ef1350
fixed minor GridField initialization syntax.
2015-09-29 18:51:08 -04:00
Peter Thaleikis
7ca97cd86d
Update 01_Extensions.md
...
adding missing space
2015-09-20 15:15:54 +12:00
johndalangin
23d0f51592
Added cookie_secure configuration directive
...
Seeing that cookie_secure is not yet added to the documentation, I took the liberty to add it myself.
Thanks and hope this helps!
2015-09-17 15:53:58 +08:00
Damian Mooyman
309ac0d196
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
.travis.yml
admin/code/CMSProfileController.php
admin/tests/LeftAndMainTest.php
control/HTTP.php
security/Permission.php
tests/forms/FormTest.php
tests/model/ArrayListTest.php
tests/security/PermissionTest.php
2015-09-09 14:35:29 +12:00
johndalangin
1b661c9f17
Typo Correction
2015-09-07 17:08:49 +08:00
Matthias Schelling
f43c528a0d
fixed typo in shortcode docs
2015-09-03 14:46:42 +02:00
Sean Harvey
03d2fc73c5
Add warning on flush not being run automatically by unit test commands.
2015-08-28 13:00:22 +12:00
Daniel Hensby
209bb94319
DOCS Adding docs for special Permission cases
2015-08-26 23:32:07 +01:00
Damian Mooyman
1686c83826
Revert #3425 #3396 to restore deprecated functionality
...
Fixes #4514
2015-08-24 11:26:25 +12:00
Daniel Hensby
a8ab5a468d
Merge branch '3.1' into 3.2
...
Conflicts:
admin/code/LeftAndMain.php
composer.json
2015-08-17 11:43:28 +01:00
David Alexander
44680d175c
Spelling
2015-08-05 21:34:35 +12:00
Cam Findlay
ea16aca74b
DOCS create() makes objects not classes.
...
Thanks to Matthew at Cabbage Tree Creative for reporting.
2015-08-03 12:50:24 +12:00
