tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 15:39:40 +02:00
Code Issues Projects Releases Wiki Activity
11,615 Commits 29 Branches 516 Tags 147 MiB
2160fb8000
Commit Graph

30 Commits

Author SHA1 Message Date
Ingo Schommer
2160fb8000 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.js
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
	tests/control/ControllerTest.php
 2013-06-19 14:03:43 +02:00
Ingo Schommer
c5a7193896 Environment Config: SS_DATABASE_MEMORY 2013-06-19 13:42:28 +02:00
Ingo Schommer
a303a39d71 Allow SS_DATABASE_NAME in _ss_environment.php configuration 
Makes setups which are completely driven by that file a bit easier
to automate, particularly if the same codebase is deployed
multiple times (e.g. to a staging and live instance)
 2013-04-22 14:14:32 +02:00
Ingo Schommer
faa3e58468 Allow SS_DATABASE_NAME in _ss_environment.php configuration 
Makes setups which are completely driven by that file a bit easier
to automate, particularly if the same codebase is deployed
multiple times (e.g. to a staging and live instance)
 2013-04-22 14:11:37 +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
Simon Welsh
7c11118e2b Allow setting the database port in _ss_environment 2013-03-19 10:51:16 +13:00
Sam Minnee
c3a3ff4438 NEW: Added Email::send_all_emails_from() setting. 2013-01-29 18:03:30 +01:00
Sam Minnee
5e6f5f9f7e NEW: Allow configuration of send_all_emails_to, ccs_all_emails_to, and bcc_all_emails_to via the config system. 2013-01-29 18:03:27 +01:00
Simon Welsh
fc5dd2994c Add codesniffer that ensures indentation is with tabs. 2012-12-12 00:12:11 +13: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
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
Fred Condo
ab976a9df5 BUGFIX, API CHANGE: Enable setting the DB timezone from the environment. 
- It was possible to set the database time zone from $databaseConfig, but not if you were using ConfigureFromEnv.
- Introduces a new constant, SS_DATABASE_TIMEZONE
 2012-03-11 12:53:01 -07:00
Hugues Lamy
c2d3da636d Change path directory in comment 2011-04-26 23:45:34 -04:00
Geoff Munn
a5fff6deab ENHANCEMENT: new schema constant supported, used by Postgres at the moment 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114184 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-11-25 03:50:11 +00:00
Sam Minnee
6c3bcc356d MINOR Fixed spelling mistake in ConfigureFromEnv class documentation (from r102045) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112059 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:28:54 +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
Ingo Schommer
40899c3bfb BUGFIX: Don't rely on the current working directory for any file access; use BASE_PATH. (from r97728) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102527 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-12 23:14:36 +00:00
Sean Harvey
46bbdb1e38 BUGFIX #4762 Replace Debug::log_errors_to() in ConfigureFromEnv to use SS_Log instead. Thanks simon_w! (from r93673) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93767 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-27 01:45:50 +00:00
Sam Minnee
0bb067eddf BUGFIX: Made use of new BasicAuth::protect_entire_site() consistent. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91658 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-15 23:43:30 +00:00
Sam Minnee
2db7a1d001 API CHANGE: Replaced BasicAuth::enable() with BasicAuth::protect_entire_site() 
API CHANGE: BasicAuth::requireLogin() no longer has an option to automatically log you in.  You can call logIn() on the object returned, instead.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91603 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-15 21:24:58 +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
Sam Minnee
1bcb5a6fc7 Basic authentication now (back) in configurefromenv.php (from r82551) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88637 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-12 03:37:44 +00:00
Sam Minnee
eeff813be2 API CHANGE: Added SS_DATABASE_CLASS as an option for _ss_environment.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77890 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-26 23:45:54 +00:00
Sam Minnee
40efda148a ENHANCEMENT: Added option for putting integers into SS_DATABASE_CHOOSE_NAME in _ss_environment.php, so that a parent/grandparent folder name can be used as the database name. 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77261 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-05-19 22:16:06 +00:00
Andrew O'Neil
635e2c3df6 Merged from 2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@72453 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-04 03:44:11 +00:00
Sam Minnee
3d9532db83 Merged branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@66108 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-11-18 01:48:37 +00:00
Sam Minnee
5988ca478f API CHANGE: Allow the definition of SS_ERROR_LOG in _ss_environment.php to set up Debug::log_errors_to(). 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60376 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-08-11 04:41:54 +00:00
Sam Minnee
603f1e6996 Added SS_DEFAULT_ADMIN_USERNAME/PASSWORD defines to conf/ConfigureFromEnv.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@49301 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-10 22:58:58 +00:00
Sam Minnee
12607e78b0 Added sapphire/conf/ConfigureFromEnv.php for making use of _ss_environment.php 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48352 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-21 08:01:30 +00:00