tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
15,248 Commits 31 Branches 527 Tags 162 MiB
8e1ae55ff6
Commit Graph

15248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
8e1ae55ff6 API Enable single javascript files to declare that they include other files 2016-01-15 09:49:28 +13:00
Ingo Schommer
01ef4c2d05 Merge pull request #4863 from open-sausages/pulls/4.0/secure-assets 
API Asset Access Control implementation
 2016-01-13 22:24:14 +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
Ingo Schommer
f665e96b21 Merge pull request #4898 from open-sausages/pulls/4.0/npm 
Adds npm for managing client-side dependencies
 2016-01-13 13:12:29 +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
Daniel Hensby
066dff4123 Merge pull request #4890 from spekulatius/patch-1 
DOCS fixing typo
 2016-01-05 14:35:17 +03:00
Peter Thaleikis
45dc510da7 fixing typo 2016-01-06 00:33:22 +13:00
Damian Mooyman
a9efe4d253 Merge pull request #4865 from jacobbuck/empty_x_include_headers 
BUG Change Requirements::include_in_response() to not add empty 'X-Include-JS' or 'X-Include-CSS' headers
 2015-12-22 14:45:02 +13:00
Jacob Buck
b6627a2f7c BUG Change Requirements::include_in_response() to not add empty 
'X-Include-JS' or 'X-Include-CSS' headers.
 2015-12-22 13:58:07 +13:00
Sam Minnée
e67db6d95a Merge pull request #4850 from tractorcow/pulls/4.0/fix-response-errors 
BUG Fix incorrect error page handling
 2015-12-15 15:49:46 +13:00
Damian Mooyman
31888735bd BUG Fix incorrect error page handling 2015-12-15 14:49:13 +13:00
Damian Mooyman
79b86c304e Merge pull request #4839 from Ocramius/patch-1 
Dead code removal (constructor type-hints are sufficient)
 2015-12-11 13:46:44 +13:00
Marco Pivetta
ffda95334f Dead code removal (constructor type-hints are sufficient) 
Thanks to @lcobucci for making me notice this.
 2015-12-11 01:30:07 +01: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
Ingo Schommer
684684e3fe Merge pull request #4796 from open-sausages/pulls/4.0/fix-generated-files 
API Replace CacheGeneratedAssetHandler
 2015-12-01 11:47:00 +13: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
2b1e5ee071 API Enable DataList::sort to support composite field names (similar to filter) 2015-12-01 09:35:33 +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
Damian Mooyman
37957b7ee8 Merge pull request #4778 from assertchris/prevent-multiple-states-added-to-single-config 
Preventing multiple states added to single config
 2015-11-17 13:23:09 +13:00
Christopher Pitt
b8975721d3 Preventing multiple states added to single config 2015-11-17 12:53:04 +13:00
Damian Mooyman
1dfa2dc1c1 Merge pull request #4772 from assertchris/improve-php-doc-comments 
Improved PHPDoc comments
 2015-11-16 10:01:08 +13:00
Christopher Pitt
da852ceea1 Improved PHPDoc comments 2015-11-14 12:55:30 +13:00
Daniel Hensby
32eab3f5bd Merge pull request #4769 from kadimi/patch-1 
DOCS Fixing typo
 2015-11-13 13:28:16 +00:00
Nabil Kadimi
03169a429f Fix typo 2015-11-12 22:35:59 +00:00
Damian Mooyman
a93a677187 Merge pull request #4744 from scott1702/allowed-ext 
move allowed extensions into a sidebar
 2015-11-09 10:35:24 +13:00
scott1702
905ddd5b20 move allowed extensions into a sidebar 2015-11-05 19:15:48 +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
Damian Mooyman
6fd2923d3b Merge pull request #4732 from silverstripe/revert-4720-pulls/3.1/fix-js-includes 
Revert "BUG Fix duplicate files being included in case of flush"
 2015-11-02 18:40:12 +13:00
Damian Mooyman
074718fcfa Revert "BUG Fix duplicate files being included in case of flush" 2015-11-02 17:11:22 +13:00
Ingo Schommer
a1dd4651da Merge pull request #4726 from edlinklater/3-docs-jquery-delegation 
DOCS: jQuery delegation in Admin interface
 2015-11-02 10:42:59 +13:00
Ingo Schommer
fc7f574920 Merge pull request #4727 from edlinklater/3-iframe-contents 
Don't try to unbind events from inside top-level iframes
 2015-11-02 10:42:08 +13:00
Damian Mooyman
0d1bdd58b3 Merge pull request #4728 from madmatt/pulls/gridfield-list-fix 
BUGFIX: Use Object->hasMethod() instead of method_exists()
 2015-11-02 10:39:18 +13:00
madmatt
275ecfd8a9 BUGFIX: Use Object->hasMethod() instead of method_exists() 
This fixes an issue when you pass a `PaginatedList` back from `ModelAdmin::getList()`
 2015-11-01 09:10:29 +13:00
Ed Linklater
42d2e0ebbf Don't try to unbind events from inside top-level iframes 2015-11-01 06:14:30 +13:00
Ed Linklater
cacbbd75bc DOCS: jQuery delegation in Admin interface 2015-11-01 05:46:13 +13:00
Daniel Hensby
6d1d21f019 Merge pull request #4724 from tractorcow/pulls/3.2/cms-reauth-route 
BUG Add missing CMSSecurity route
 2015-10-30 17:49:34 +00:00
Sam Minnée
77b084c324 Merge pull request #4725 from tractorcow/pulls/3.2/fix-id-filter 
BUG Ensure that filters on any fixed field are scoped to the base data table
 2015-10-30 17:00:31 +00:00
Damian Mooyman
2813f94124 BUG Ensure that filters on any fixed field are scoped to the base data table 
Fixes #4700
 2015-10-30 16:26:14 +13:00
Damian Mooyman
38ca9632c4 BUG Add missing CMSSecurity route 2015-10-30 15:31:54 +13:00
Ingo Schommer
1fb6bbb422 Merge pull request #4701 from scott1702/update-upload-button 
Update asset admin toolbar
 2015-10-30 09:14:41 +13:00
Ingo Schommer
9c4443629e Merge pull request #4719 from tractorcow/pulls/3.2/fix-folder-fixtures 
BUG Fix regression from #4396 in test fixtures
 2015-10-30 09:12:08 +13:00
Daniel Hensby
587b065fc2 Merge pull request #4669 from nickspiel/patch-4 
Adding SVG to allowed file types
 2015-10-29 17:33:12 +00:00
Damian Mooyman
b857bdf209 BUG Fix duplicate files being included in case of flush 
Fixes #4553
 2015-10-29 17:48:30 +13:00
Damian Mooyman
daa86d3a4c BUG Fix regression from #4396 in test fixtures 2015-10-29 17:36:38 +13:00
Ingo Schommer
aada7a7334 Merge pull request #4716 from dm-0/patch-1 
Update 01_Code.md
 2015-10-29 12:13:34 +13:00