Damian Mooyman
|
69c9ad1428
|
Merge remote-tracking branch 'origin/3'
# Conflicts:
# admin/css/ie8.css.map
# admin/css/screen.css
# admin/css/screen.css.map
# admin/scss/_style.scss
# css/AssetUploadField.css
# css/GridField.css.map
# docs/en/02_Developer_Guides/00_Model/08_SQL_Select.md
# lang/fi.yml
|
2016-01-25 16:15:41 +13:00 |
|
Damian Mooyman
|
7c448bb4a2
|
Merge remote-tracking branch 'origin/3.2' into 3.3
# Conflicts:
# tests/model/DataObjectLazyLoadingTest.php
# tests/model/VersionedTest.yml
|
2016-01-25 14:11:37 +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
|
e6b877df27
|
Merge remote-tracking branch 'origin/3'
# Conflicts:
# control/Director.php
# control/HTTP.php
# core/startup/ParameterConfirmationToken.php
# docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
# docs/en/00_Getting_Started/04_Directory_Structure.md
# docs/en/00_Getting_Started/05_Coding_Conventions.md
# docs/en/01_Tutorials/01_Building_A_Basic_Site.md
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/01_Tutorials/04_Site_Search.md
# docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
# docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
# docs/en/02_Developer_Guides/13_i18n/index.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
# docs/en/03_Upgrading/index.md
# docs/en/changelogs/index.md
# docs/en/howto/customize-cms-menu.md
# docs/en/howto/navigation-menu.md
# docs/en/index.md
# docs/en/installation/index.md
# docs/en/installation/windows-manual-iis-6.md
# docs/en/misc/contributing/code.md
# docs/en/misc/contributing/issues.md
# docs/en/misc/module-release-process.md
# docs/en/reference/dataobject.md
# docs/en/reference/execution-pipeline.md
# docs/en/reference/grid-field.md
# docs/en/reference/modeladmin.md
# docs/en/reference/rssfeed.md
# docs/en/reference/templates.md
# docs/en/topics/commandline.md
# docs/en/topics/debugging.md
# docs/en/topics/email.md
# docs/en/topics/forms.md
# docs/en/topics/index.md
# docs/en/topics/module-development.md
# docs/en/topics/modules.md
# docs/en/topics/page-type-templates.md
# docs/en/topics/page-types.md
# docs/en/topics/search.md
# docs/en/topics/testing/index.md
# docs/en/topics/testing/testing-guide-troubleshooting.md
# docs/en/topics/theme-development.md
# docs/en/tutorials/1-building-a-basic-site.md
# docs/en/tutorials/2-extending-a-basic-site.md
# docs/en/tutorials/3-forms.md
# docs/en/tutorials/4-site-search.md
# docs/en/tutorials/5-dataobject-relationship-management.md
# docs/en/tutorials/building-a-basic-site.md
# docs/en/tutorials/dataobject-relationship-management.md
# docs/en/tutorials/extending-a-basic-site.md
# docs/en/tutorials/forms.md
# docs/en/tutorials/index.md
# docs/en/tutorials/site-search.md
# main.php
# model/SQLQuery.php
# security/ChangePasswordForm.php
# security/MemberLoginForm.php
# tests/control/ControllerTest.php
# tests/core/startup/ParameterConfirmationTokenTest.php
# tests/model/SQLQueryTest.php
# tests/security/SecurityTest.php
# tests/view/SSViewerTest.php
# view/SSTemplateParser.php
# view/SSTemplateParser.php.inc
# view/SSViewer.php
|
2016-01-20 13:16:27 +13:00 |
|
Damian Mooyman
|
5d240feaec
|
Merge remote-tracking branch 'origin/3.2' into 3.3
|
2016-01-19 15:08:24 +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 |
|
Damian Mooyman
|
8e1ae55ff6
|
API Enable single javascript files to declare that they include other files
|
2016-01-15 09:49:28 +13:00 |
|
David Alexander
|
5c99e33eb2
|
DOCS 3.1 - fixes broken internal links
|
2016-01-14 23:59:53 +13:00 |
|
Damian Mooyman
|
738e1db756
|
Update Nginx rules
Prevent disclosure of secure assets
|
2016-01-13 18:18:22 +13:00 |
|
Damian Mooyman
|
037467beae
|
API Asset Access Control implementation
|
2016-01-13 18:18:22 +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 |
|
Damian Mooyman
|
48a30909f3
|
Merge remote-tracking branch 'origin/3.2' into 3
# Conflicts:
# admin/javascript/LeftAndMain.BatchActions.js
# css/UploadField.css
# forms/HtmlEditorField.php
|
2015-12-22 14:07:52 +13:00 |
|
Hamish Friedlander
|
1eda9151a4
|
Merge pull request #4831 from open-sausages/pulls/3/fix-versioned-canview
API Create default security permission model for versioned data objects
|
2015-12-09 14:17:27 +13:00 |
|
Damian Mooyman
|
6089a7c5bd
|
API Create default security permission model for versioned data objects
|
2015-12-09 11:33:53 +13:00 |
|
Peter Thaleikis
|
7db7140a70
|
fixing example
|
2015-12-04 11:14:02 +13:00 |
|
Marcus Nyeholt
|
f7c270a3ba
|
NEW Use Config for determining Vary header
Existing implementation hardcodes the Vary header; swap to using Config layer
instead
Added test for changing the variable from config
|
2015-12-02 10:28:24 +11:00 |
|
Damian Mooyman
|
c13b5d989f
|
API Enable advanced configuration options for requirements combined files
API Enable relative root paths for the default Flysystem AssetAdapter
|
2015-12-01 11:07:13 +13:00 |
|
muskie9
|
fc3b06dbf9
|
DOCS update LinkingModes description
|
2015-11-23 14:10:47 -06: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 |
|
Daniel Hensby
|
ef35c2bb6b
|
Merge pull request #4457 from tractorcow/pulls/4.0/no-query
API Remove SQLQuery
|
2015-11-03 16:41:07 +00:00 |
|
Damian Mooyman
|
1e1a7a345c
|
Merge remote-tracking branch 'origin/3'
Conflicts:
control/Director.php
filesystem/File.php
filesystem/GD.php
filesystem/ImagickBackend.php
forms/HtmlEditorField.php
javascript/UploadField_uploadtemplate.js
model/Image.php
model/Image_Backend.php
model/fieldtypes/Enum.php
templates/AssetUploadField.ss
tests/model/ImageTest.php
tests/search/FulltextFilterTest.php
|
2015-11-03 14:23:16 +13:00 |
|
Damian Mooyman
|
c4dc10b255
|
Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
forms/DropdownField.php
tests/model/ImageTest.php
|
2015-11-03 13:06:39 +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 |
|
Ed Linklater
|
cacbbd75bc
|
DOCS: jQuery delegation in Admin interface
|
2015-11-01 05:46:13 +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 |
|
Damian Mooyman
|
d1ea74e40d
|
API Implement AssetField to edit DBFile fields
|
2015-10-23 16:57:44 +13:00 |
|
Damian Mooyman
|
3e7eecf978
|
API Remove SQLQuery
|
2015-10-23 16:26:04 +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 |
|
Damian Mooyman
|
be239896d3
|
API Refactor of File / Folder to use DBFile
API Remove filesystem sync
API to handle file manipulations
|
2015-10-13 11:57:39 +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 |
|
Damian Mooyman
|
ac27836d2b
|
API Implementation of RFC-1 Asset Abstraction
|
2015-09-24 12:57:28 +12: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
|
b552a7370f
|
Merge remote-tracking branch 'origin/3'
Conflicts:
tests/model/ImageTest.php
|
2015-09-09 15:44:47 +12:00 |
|
Damian Mooyman
|
f10785350e
|
Merge remote-tracking branch 'origin/3.2' into 3
Conflicts:
docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md
|
2015-09-09 14:50:47 +12: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 |
|