Damian Mooyman
bdb1a95758
API Cleanup and refactor of select fields
...
API Standardise Relation interface
2016-01-21 15:40:19 +13:00
Damian Mooyman
45c6d0284a
Minor: Update branch names
2016-01-21 14:02:42 +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
8c1cafd1a0
Merge remote-tracking branch 'origin/3.3' into 3
...
# Conflicts:
# admin/scss/_forms.scss
# admin/scss/_style.scss
# admin/scss/_tree.scss
# javascript/TreeDropdownField.js
2016-01-19 17:08:26 +13:00
Meeeeeeow
e448774150
Fixed Typo
...
Changed 'Gudes' to 'Guides'
2016-01-19 16:18:35 +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
David Alexander
45d2b57a65
DOCS 3.1 : typose and broken internal links
2016-01-15 16:39:23 +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
Christopher Joe
007e0eeb2f
DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox
2016-01-13 12:12:21 +13:00
David Craig
254b942737
Adds npm for managing client-side dependencies
...
- Includes a package.json file with build and CI scripts
- Includes shrinkwrap file for locking dependency version
- Includes Gulp for running build tasks
- Includes a 'build' task for copying library files from node_modules to thirdparty
- Includes a 'sanity' task for makes sure library files in thirdparty match what's in node_modules
- Includes updates to .travis.yml (new JS_SANITY_CHECK flag) to run the sanity task
2016-01-13 09:23:47 +13:00
Damian Mooyman
0b3b7ba134
Merge pull request #4888 from sminnee/remove-trailing-whitespace
...
MINOR: Remove trailing whitespace
2016-01-12 10:18:09 +13:00
Christopher Joe
0ac0e5a7d2
Added tutorial for installing silverstripe with Vagrant and Virtualbox
2016-01-08 15:54:05 +13:00
Sam Minnee
4aa50534d5
FIX: Fixes needed to adapt to whitespace changes.
...
API: Whitespace trimmed from custom form field templates
The introduction of trailing newlines on all template files introduced
some changes that needed to be made.
Notably, whitespace has been trimmed from rendered form field templates.
This is the minimal impact to SilverStripe developers, as it preserves
the behaviour of the default field types, but I’ve still noted as a
change.
2016-01-07 14:17:57 +13:00
Sam Minnee
3ee8f505b7
MINORE: Remove training whitespace.
...
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.
Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.
The command used was this:
for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +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
Damian Mooyman
e59595bb23
Merge pull request #4879 from gordonbanderson/patch-1
...
Documentation : Using SQLite for Testing
2016-01-06 13:49:03 +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
Ingo Schommer
70897834c9
Corrected release docs merge pipeline
2016-01-05 14:08:49 +13:00
Ingo Schommer
90837d4aa2
Release docs: Mention IRC, Behat and milestones
2016-01-05 11:27:46 +13:00
Ingo Schommer
ce1a069885
Clarify RC wording in release docs
...
An RC is technically only one of a few "pre-release" labels (alpha, beta, rc)
2016-01-05 11:27:45 +13:00
Ingo Schommer
7c3fd7de13
Note required commands in release docs
2016-01-05 11:27:45 +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
Christopher Darling
ef4a75ad43
DOCS: fixed 3.2.0 changelog DataList code sample
2015-12-23 13:13:32 +00:00
Damian Mooyman
0dfa8ca7b2
Improve release process instructions
2015-12-23 16:45:34 +13:00
Damian Mooyman
5507ce89c6
Copy upgrade notes from 3.3.0.md
2015-12-23 14:12:02 +13:00
Damian Mooyman
70bb3d92c7
Added 3.3.0-beta1 changelog
2015-12-23 13:38:55 +13: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
Damian Mooyman
55e1b66285
Merge pull request #4859 from chillu/pulls/noteworthy-contrib-docs
...
Note about changelog additions in contrib guide
2015-12-21 14:33:57 +13:00
Ingo Schommer
b97b604a05
Merge pull request #4837 from tractorcow/pulls/3.2/release-docs
...
Documentation on the release process
2015-12-21 11:55:19 +13:00
Ingo Schommer
e114548a48
Note about changelog additions in contrib guide
2015-12-21 11:52:08 +13:00
Ivo Bathke
f77bac3ab0
Update 02_Composer.md
...
gdmedia/ss-auto-git-ignore as dev requirement
2015-12-17 11:57:46 +01:00
Damian Mooyman
22d8105a56
Add changelog for 3.3.0
2015-12-10 17:48:06 +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
Damian Mooyman
903d4838bb
Documentation on the release process
2015-12-04 15:09:58 +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
Daniel Hensby
b694829084
Merge pull request #4812 from tractorcow/pulls/4.0/api-composite-sort
...
API Enable DataList::sort to support composite field names
2015-11-30 23:54:45 +00: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
Damian Mooyman
641c26299c
API Enable linear-only restriction for DataList::applyRelation
...
API Remove DataList::getRelation
2015-12-01 09:58:27 +13:00
Damian Mooyman
ce28259c5f
API Replace CacheGeneratedAssetHandler with FlysystemGeneratedAssetHandler
...
API Reduce GeneratedAssetHandler API
API Re-introduce Requirements::delete_all_combined_files();
API Re-introduce Requirements::flush()
API Combined files now uses new filenames distinguished by sha1 of sources
2015-11-26 16:12:05 +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
Damian Mooyman
624e3fde6a
Merge pull request #4708 from muskie9/patch-7
...
DOCS update framework and cms milestone links
2015-11-20 12:43:11 +13:00
Damian Mooyman
84667e5aa6
Merge pull request #4693 from camfindlay/patch-33
...
DOCS Upgrading information about 3.2.0 and the additional modules req…
2015-11-20 11:13:36 +13:00
Nic
2e5c56f1d0
DOCS update framework and cms milestone links
2015-11-19 11:34:01 -06:00
Cam Findlay
9672cd3994
DOCS SilverStripe core RFC process, template and archive links to past RFCs.
2015-11-19 16:05:49 +13:00
Damian Mooyman
43e4eb129a
Merge pull request #4771 from camfindlay/patch-36
...
DOCS Update conflict resolution help in code of conduct
2015-11-17 10:04:40 +13:00
Damian Mooyman
302c741b07
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
control/HTTP.php
forms/Form.php
tests/view/SSViewerTest.php
2015-11-16 16:50:40 +13:00
Damian Mooyman
0178fa5a18
Added 3.2.1 changelog
2015-11-16 16:17:10 +13:00
Damian Mooyman
2e6469956f
Add 3.1.16-rc1 changelog
2015-11-16 15:20:30 +13:00
Damian Mooyman
615b2d5563
Added 3.1.16 changelog
2015-11-16 15:16:49 +13:00
Cam Findlay
e5e4a55fe0
DOCS Update conflict resolution help in code of conduct
...
Original link was 404.
2015-11-14 09:42:12 +13:00
Damian Mooyman
c19420f545
Add 3.2.1-rc2 changelog
2015-11-13 15:32:09 +13:00
Damian Mooyman
49acc0d468
Added 3.2.1-rc2 changelog
2015-11-13 15:27:08 +13:00
Hamish Friedlander
b61d6dcd57
[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
2015-11-13 15:20:09 +13:00
Nabil Kadimi
03169a429f
Fix typo
2015-11-12 22:35:59 +00:00
Damian Mooyman
245e0aae2f
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
2015-11-11 17:50:02 +13:00
Damian Mooyman
1c1c0a23bd
Added 3.2.1-rc1 changelog
2015-11-11 17:10:41 +13:00
Damian Mooyman
bc1b2893ac
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
2015-11-11 16:56:19 +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
Damian Kissick
0197b46001
Update 01_Code.md
...
Corrected 'submiting' spelling
2015-10-28 21:28:45 +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
Damian Mooyman
e17a49f8a5
API Restore JS Minification
...
BUG Fix incorrect cache on CacheGeneratedAssetHandler
2015-10-23 14:14:38 +13:00
David Alexander
e88032a7aa
DOCS : spelling
2015-10-23 13:49:03 +13:00
Ingo Schommer
f252cfad20
Merge pull request #4680 from open-sausages/features/dbfile-generated-files
...
API Generated files API
2015-10-23 13:19:56 +13:00
Damian Mooyman
f9892c628c
API Generated files API
...
API Refactor Requirements_Backend to use new APL
2015-10-23 10:07:48 +13:00
Ingo Schommer
7d17068062
Increase minimum required PHP version to 5.5
...
See mailinglist discussion at https://groups.google.com/forum/#!topic/silverstripe-dev/7mVvhNNeNps
2015-10-22 23:11:16 +13:00
Cam Findlay
0fa8335bc0
DOCS Upgrading information about 3.2.0 and the additional modules required (reports & siteconfig)
...
Based on a community question about upgrading their site manually, they followed the instructions but were not aware of the additional modules now required.
2015-10-22 09:13:57 +13:00
Loz Calver
977642daa9
Remove Spyc YAML library
...
Also had to fix some fixture files - none of the YAML spec versions actually support tabs anyway
2015-10-19 17:07:34 +01: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
d884c859d1
BUG Fix file link tracking for new asset abstraction
2015-10-15 12:15:00 +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
Damian Mooyman
cc4d92e91a
Merge remote-tracking branch 'origin/3.2.0' into 3.2
2015-10-12 09:18:01 +13:00
Damian Mooyman
0092792568
Added 3.2.0 changelog
2015-10-12 08:44:34 +13:00
Damian Mooyman
a679680c0d
Update changelogs to include PDO upgrade instructions
2015-10-07 16:11:42 +13:00
Hamish Friedlander
b03ae843ca
Update core contributors docs to include Jono Menz
2015-10-07 14:35:29 +13:00
Damian Mooyman
557c4211fa
Update changelog
2015-10-07 09:51:24 +13:00
Damian Mooyman
4af684f2f3
Added 3.2.0-rc2 changelog
2015-10-06 18:49:35 +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
scott1702
33f181f72a
Update changelog to include removal of CMSFileAddController
...
Fix error in drag/drop functionality
2015-09-29 09:58:01 +13:00
