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
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 Kissick
0197b46001
Update 01_Code.md
...
Corrected 'submiting' spelling
2015-10-28 21:28:45 +13:00
Damian Mooyman
09210efbc0
Merge remote-tracking branch 'origin/3'
...
Conflicts:
composer.json
control/Session.php
docs/en/05_Contributing/01_Code.md
docs/en/05_Contributing/02_Release_Process.md
forms/FormField.php
model/DataQuery.php
model/Image.php
model/queries/SQLConditionalExpression.php
view/SSViewer.php
view/ViewableData.php
2015-07-31 15:49:35 +12:00
Daniel Hensby
ca8d0f2818
Merge branch '3.1' into 3.2
...
Conflicts:
dev/Debug.php
docs/en/05_Contributing/01_Code.md
forms/FormField.php
i18n/i18nTextCollector.php
model/DataQuery.php
2015-07-20 10:48:01 +01:00
Ingo Schommer
aef8073037
Fixed cms architecture link
2015-07-07 19:40:12 +12:00
Jonathon Menz
a39c2bd473
DOCS Contributing code cleanup
...
Fixed a few typos and formatting issues, and made git workflow diagram easier to read by hyperlinking it to itself. Also included a few lines from 3.2 branch.
2015-06-28 13:19:04 -07:00
David Alexander
c4583d4fb9
Update 01_Code.md
...
Updated link.
2015-06-21 12:23:40 +12:00
Ingo Schommer
72a284c9b8
Merge remote-tracking branch 'origin/3'
...
Conflicts:
core/Constants.php
docs/en/05_Contributing/01_Code.md
tests/model/SQLQueryTest.php
2015-04-09 16:26:16 +12:00
Damian Mooyman
319b96b48b
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/05_Contributing/01_Code.md
forms/TreeDropdownField.php
model/DataObject.php
security/Member.php
tests/model/DataObjectTest.php
2015-03-11 11:40:06 +13:00
Daniel Hensby
028a80b153
DOCS Adding GitHub labels
2015-03-03 17:24:02 +00:00
Fred Condo
82ed86f6cd
DOCS: correct broken links
...
- Correct internal links between documentation pages
- Delete defunct links to documentation removed during documentation reorganization
- Restore testing glossary
- Verify by crawling site locally
2015-02-27 16:09:15 -08:00
Daniel Hensby
6ea8baa017
DOCS Updating contributing version
2015-02-07 14:38:59 +00:00
Daniel Hensby
e906f48d8d
DOCS Updating contributing version
2015-02-07 14:36:21 +00:00
Daniel Hensby
74ec7e413f
DOCS Updating contributing version
2015-02-07 14:33:12 +00:00
Will Rossiter
6c5ddaf054
Restructure of the docs markdown source files into more logical taxonomy
2014-12-17 15:48:35 +13:00
Will Rossiter
8e8c5d716d
Restructure of the docs markdown source files into more logical taxonomy
2014-12-16 11:01:12 +13:00
Will Rossiter
e9d88dd8ee
Restructure of the docs markdown source files into more logical taxonomy.
...
Rebased on 3.1
2014-12-15 09:12:44 +13:00
