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,554 Commits 31 Branches 527 Tags 162 MiB
4d907b5b1d
Commit Graph

67 Commits

Author SHA1 Message Date
Mateusz
ed04972c3c Fixed permission checks for /dev/build action 2016-01-13 14:05:14 +01: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
Stevie Mayhew
0d94cf15a5 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
Damian Mooyman
0b1f297873 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
 2014-11-18 12:45:54 +13:00
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Igor Nadj
b3d52de531 ENH making /dev extendable 2014-08-06 16:29:52 +12:00
Damian Mooyman
d9bc352271 Path resolution cleanup 
[ref: CWPBUG-158]
 2014-05-05 14:52:41 +12:00
Damian Mooyman
640d5beb44 BUG fix missing permission for dev/build/defaults 2013-11-08 11:09:46 +13:00
Ingo Schommer
91f6039eed Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	control/Director.php
 2013-11-05 10:15:40 +01:00
Ingo Schommer
65b4407337 FIX "Draft" stage to fix dev/build, Versioned docs (fixes #2619) 2013-11-03 21:27:26 +01:00
Ingo Schommer
afe06661ef Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/templates/Includes/LeftAndMain_Menu.ss
	admin/templates/Includes/ModelAdmin_ImportSpec.ss
	admin/templates/Includes/ModelAdmin_Tools.ss
	admin/templates/LeftAndMain.ss
	admin/templates/ModelSidebar.ss
	i18n/i18n.php
	templates/ComplexTableField.ss
	templates/ComplexTableField_popup.ss
	templates/FileIFrameField_iframe.ss
	templates/Includes/GridFieldItemEditView.ss
	templates/Includes/TableListField_PageControls.ss
	templates/RelationComplexTableField.ss
	templates/TableField.ss
	templates/TableListField.ss
 2013-08-07 17:14:47 +02:00
Ingo Schommer
c0f5007d57 Create folder if required in dev/generatesecuretoken 2013-08-07 16:59:18 +02:00
Ingo Schommer
3b02d22989 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	dev/CsvBulkLoader.php
 2013-05-09 10:34:20 +02:00
Ingo Schommer
ced199b877 Direct writing of "Security.token" through dev/generatesecuretoken 2013-05-09 10:31:49 +02:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317) 
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
 2013-03-24 17:20:53 +01:00
Ingo Schommer
2e1a5081fa API Remove dev/tests/startsession etc, use new "testsession" module 
Removed commands: startsession, endsession, sessionloadyml, setdb, emptydb.
See https://github.com/silverstripe-labs/silverstripe-testsession
 2012-12-19 16:05:37 +01:00
Ingo Schommer
d13c53fda6 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	tests/model/DataQueryTest.php
 2012-12-14 10:57:28 +01:00
Ingo Schommer
f41f307118 Fixed spacing 2012-12-14 00:09:30 +01:00
Ingo Schommer
c6b1d4aa6b API Storing alternative DB name in cookie rather than session 
Session is not initialized by the time we need to use
the setting in DB::connect(). Cookie values get initialized
automatically for each request.

Tightened name format validation to ensure it can only
be used for temporary databases, rather than switching
the browser session to a different production database.

Encrypting token for secure cookie usage.
Added dev/generatesecuretoken to generate this token.
Not storing in YML config directly because of web access issues.
 2012-12-13 23:21:48 +01:00
Simon Welsh
b0121b541c Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13:00
Ingo Schommer
56f7ce1dcf Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
 2012-10-03 16:16:19 +02:00
Sam Minnee
1f7fc1f76a FIX Remove instances of lines longer than 120c 
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit.  This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
 2012-09-30 17:18:13 +13:00
Sean Harvey
2654290848 Merge pull request #811 from wilr/removestatic 
API: Remove static main and dev/buildcache
 2012-09-24 19:12:35 -07:00
Will Rossiter
e72114dad7 API: Remove static main and dev/buildcache 
Files moved to a separate module (silverstripe-static).
 2012-09-21 19:56:56 +12:00
Ingo Schommer
e2f073f38a Method visibility according to coding conventions 2012-09-20 10:46:59 +02:00
Will Rossiter
0910a651d5 FIX: restore and update style for DevelopmentAdmin. 2012-06-29 16:52:36 +12:00
Sean Harvey
77c2365b87 MINOR Replacing deprecated static function calls to Director with 
current Controller instance replacements.
 2012-05-23 21:50:02 +12:00
Mateusz Uzdowski
e262a29193 ENHANCEMENT: move code introspection functions to the silverstripe-codeviz module 2012-04-17 14:45:26 +12:00
Simon Welsh
f07258f3cf MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Ingo Schommer
40d73127ae MINOR Using late static binding instead of Object::create() calls 2012-04-04 17:10:31 +02:00
Sam Minnee
7fbb919ce8 API CHANGE: Introduce DataModel object, as a representation of the project's entire data model, and tie it to $this->model an all DataObjects, Controllers, and RequestHandlers for easy non-static access. 
API CHANGE: Add DataList::newObject(), which creates a new object on that DataList.
API CHANGE: RequestHandler::handleRequest() now needs to handle a $model argument, if you override it.
 2011-05-01 17:33:02 +12:00
Carlos Barberis
184e8bd852 ENHANCEMENT: Added allowed actions to core classes 2011-02-14 11:14:51 +13:00
Will Rossiter
815e9efd94 APICHANGE: removed page comments from core. Please see the github.com account for page comments functionality 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114821 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-12-11 05:43:08 +00:00
Ingo Schommer
f63751893b BUGFIX Allowing dev/build in "live" mode when Security::database_is_ready() returns FALSE (typically happens when an existing SilverStripe project is upgraded and database columns in Member/Permission/Group have been added) (fixes #4957) 
MINOR Using Object::create() in DevelopmentAdmin to make objects mockable
ENHANCEMENT Added Security::$force_database_is_ready to mock database_is_ready() state
ENHANCEMENT Added permission check exception in TaskRunner and DatabaseAdmin if SapphireTest::is_running_test() returns TRUE (necessary for DevelopmentAdminTest) (from r107415)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112588 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 03:43:30 +00:00
Ingo Schommer
7eaca248e2 MINOR Removed db/build legacy wording in DevelopmentAdmin (fixes #5676) (from r106083) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112517 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 02:56:21 +00:00
Ingo Schommer
d50097e905 FEATURE: Add dev/build/defaults to call requireDefaultRecords (from r104093) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112334 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-14 23:57:02 +00:00
Sam Minnee
e41c7eeede BUGFIX Allow DatabaseAdmin to run dev/build in live mode when not Security::is_database_ready(), and avoid broken login due to broken db queries (selecting unknown columns before dev/build) (see #4957) (from r100924) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111543 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:21:45 +00:00
Ingo Schommer
a138531808 ENHANCEMENT: Removed dev/reset, instead encouraging the use of dev/tests/startsession for tests. 
ENHANCEMENT: Let people use dev/tests/startsession without a fixture, instead calling requireDefaultRecords (from r98080)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102575 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 01:55:09 +00:00
Ingo Schommer
8ce43e46ff MINOR Partially reverted accidental commit from r97920 (unconditionally requiring ADMIN login via BasicAuth in DevelopmentAdmin) (from r98079) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102574 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 01:53:42 +00:00
Ingo Schommer
7c84bb984e MINOR: Preserve theme settings in tests (from r97920) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102555 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-13 01:44:45 +00:00
Ingo Schommer
29ea7e0b98 BUGFIX Use BASE_PATH and BASE_URL instead of data from $_SERVER. 
API CHANGE: Determine default BASE_PATH/BASE_URL from the __FILE__ content, so that the script that initiated the Sapphire process doesn't matter.  This means that index.php doesn't need to manipulate those variables. (from r97731)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102528 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 23:15:04 +00:00
Sam Minnee
4252067f0c MINOR Changed silverstripe.com references to silverstripe.org 
MINOR Fixed broken wiki links (#4672) (from r90886)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@90957 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-06 03:35:07 +00:00
Ingo Schommer
0cf75cfc65 MINOR Unified permission control for i18nTextCollectorTask, TaskRunner, TestRunner, ModelViewer, DevelopmentAdmin, TestViewer, MigrateTranslatableTask 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86005 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-10 01:49:56 +00:00
Ingo Schommer
7a27726d00 MINOR Removed alpha stage ModuleManager into new "modulemanager" module. Was never released, and won't be suitable for 2.4. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@86000 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-09-10 01:34:20 +00:00
Sam Minnee
2bbe7dc87d BUGFIX #3991: Added missing link to dev/buildcache in dev/ homepage 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80252 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-28 02:54:01 +00:00
Sam Minnee
bcbe95b825 BUGFIX: Ignore deprecation errors for improved PHP 5.3 support. 
BUGFIX: Fix behaviour of FILE_TO_URL_MAPPING on Windows.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80131 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-26 02:46:14 +00:00
Sam Minnee
610232f19c MINOR: Fixed newlines and set svn:eol-style to native 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79478 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-17 23:14:40 +00:00
Sean Harvey
6c754d29e9 Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79438 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-06-17 11:36:49 +00:00