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,788 Commits 31 Branches 527 Tags 162 MiB
8518fc1425
Commit Graph

80 Commits

Author SHA1 Message Date
Damian Mooyman
3b0a9f4ba2 Merge remote-tracking branch 'origin/3' 
# Conflicts:
#	admin/javascript/LeftAndMain.Menu.js
#	control/HTTPRequest.php
#	css/GridField.css
#	css/GridField.css.map
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/06_Testing/00_Unit_Testing.md
#	docs/en/02_Developer_Guides/06_Testing/index.md
#	docs/en/02_Developer_Guides/14_Files/01_File_Management.md
#	docs/en/02_Developer_Guides/14_Files/02_Images.md
#	filesystem/Upload.php
#	javascript/HtmlEditorField.js
#	model/Image.php
#	model/connect/MySQLDatabase.php
#	model/fieldtypes/Enum.php
#	model/versioning/Versioned.php
#	scss/GridField.scss
 2016-02-25 14:51:59 +13:00
Damian Mooyman
9fed5561f4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	core/Constants.php
#	dev/DevelopmentAdmin.php
 2016-02-24 17:39:04 +13:00
Damian Mooyman
5f2d3f31d7 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	dev/DevelopmentAdmin.php
#	docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
#	lang/cs.yml
#	lang/lt.yml
 2016-02-24 17:29:06 +13:00
Michael Andrewartha
480eeb5be5 Updating links 
Updated old hosting wiki link to point to new hosting page on silverstripe.org and fixing broken links
 2016-02-09 12:16:47 +13:00
assertchris
c66f973fce Replaced obsolete mime types 2016-01-24 18:15:47 +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
Nick Spiel
8c49cff71e Fixing link to themes page 
The link to the themes page was broken.
 2015-12-22 12:30:20 +11:00
Damian Mooyman
c4710b2272 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	admin/code/GroupImportForm.php
	admin/code/MemberImportForm.php
	tests/model/DataListTest.php
 2015-09-15 13:18:47 +12:00
Damian Mooyman
d8fd64c3e2 [ss-2015-016]: Fix XSS in install.php 2015-09-08 10:08:28 +12:00
Damian Mooyman
d8e9af8af8 API New Database abstraction layer. Ticket #7429 
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
 2014-07-09 18:04:05 +12:00
Stephen Shkardoon
9b9f367e93 BUG Database config values aren't escaped 
Causes minor UI issues if you try use database configuration values that happen to have " or other values in them.
 2013-03-24 01:05:33 +13:00
Normann Lou
9aaa6b1a7b ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty. 2012-10-05 17:00:39 +13:00
Naomi Guyer
69182c21ce BUG: Installer implies empty template used in tutorial 
Have reworded the template options so that installers know that the
simple template is used for the tutorial
 2012-08-22 13:42:53 +12:00
Sean Harvey
01f8e38eee MINOR Using correct URL for tutorial in installer 2012-05-11 14:51:23 +12:00
Ingo Schommer
e929753992 MINOR Using correct $locale format in installer (regression from last commit) 2012-05-03 00:00:51 +02:00
Sean Harvey
d0984ec897 MINOR Line break after sentence of message 2012-04-17 10:53:40 +12:00
Sean Harvey
ebe75fefab MINOR Update locations to server requirements page 2012-04-15 16:29:14 +12:00
Sean Harvey
515a2ccfcc MINOR Updating old URLs in installer, show message about creating admin 
account
 2012-04-15 16:01:06 +12:00
Sean Harvey
e71b8d6215 MINOR Installer cleanups, removing references to old "command line 
installation" which is no longer supported.
MINOR Removed stray semi-colon when showing version in installer
template.
 2012-04-15 15:05:20 +12:00
Simon Welsh
3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Ingo Schommer
ca24120a5e MINOR Install screen visual tweaks, more visible disabled state on install button, conditional version number (to avoid it showing without a version), referencing new theme in install screen, using new layout in install progress screen as well 2012-04-11 16:49:31 +02:00
Paul Clarke
4f23ac1722 ENHANCEMENT Installer styling, moving away from blackcandy 2012-04-11 22:51:10 +12:00
Sam Minnee
f1579a2cdd MINOR: Corrected date in installer copyright (open.ss.org #6833) 2012-03-05 14:51:42 +13:00
Kirk Mayo
c211b7c435 Added some simple code to show the location of the loaded php.ini file when php configuration or file permision errors exist 2012-03-04 21:01:12 +13:00
Ingo Schommer
b1f27b40ce MINOR Updated image references in sapphire/ folder to local files, rather than requiring cms/ folder (copied a bunch of images files over for this) 2011-03-29 21:34:26 +13:00
Sam Minnee
fd7babe5a0 ENHANCEMENT Show "Database Configuration" section of installer requirements for reference (collapsed by default) (from r111873) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112934 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 05:03:16 +00:00
Sam Minnee
2c7d88aade MINOR: repair installer for sqlite (from r109787) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112830 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 01:26:27 +00:00
Sam Minnee
f20e83eeaf MINOR: Fix links etc, and remove www. from SS urls (from r109105) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112783 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 00:56:25 +00:00
Sam Minnee
c52dfd1e03 BUGFIX Database password input in installer should be password, so that the password is obfuscated when input (from r108432) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112746 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-19 00:33:12 +00:00
Sam Minnee
a707f925ad BUGFIX: Don't allow reinstalling without first making the user manually delete mysite/_config.php (from r108026) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112710 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-18 22:41:32 +00:00
Ingo Schommer
55f1df0f6d BUGFIX Fixed inconsistent styling of reinstall actions at the bottom of the installer, and if using IIS, warn that this will overwrite the web.config file, not .htaccess (from r105029) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112436 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-15 01:22:44 +00:00
Sam Minnee
d25e326ba0 MINOR Removed fullstop where it wasn't needed (from r101688) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112023 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 01:00:24 +00:00
Sam Minnee
c4e8624794 MINOR Tidied up the layout of the Themes area of the installer slightly - now consistent helptext as other areas (from r101687) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112022 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:59:55 +00:00
Sam Minnee
d3129b8964 MINOR Updated CMS Admin Account text to be more precise (from r101686) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112021 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:59:23 +00:00
Sam Minnee
d07297aa46 MINOR Altered wording in installer for localised interface (from r101683) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112019 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:58:55 +00:00
Sam Minnee
5aa012335a ENHANCEMENT: tidied up installer process to streamline process. Moved requirements to top and button to bottom and added visual seperation of the individual steps (from r101661) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112015 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:57:05 +00:00
Sam Minnee
bac6a9d240 ENHANCEMENT: refactored requirements section to hide successful tests (from r101381) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111998 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:45:50 +00:00
Sam Minnee
f2bbb4c605 ENHANCEMENT Added links to installation introduction text for sources of help and suggested web hosts (from r101378) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111996 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:44:01 +00:00
Sam Minnee
252321f3c7 MINOR Made reinstall message more precise by adding web.config to the files that will get overwritten (from r101341) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111994 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:43:00 +00:00
Sam Minnee
9137539ae6 ENHNACEMENT Installer no longer asks for firstname and surname for default CMS admin account, this can be changed later on and doesn't need to be entered for installation (from r101314) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111993 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:42:36 +00:00
Sam Minnee
875197b934 MINOR Moved "theme" section further down in the installer, its much less likely to be changed than the database connection and admin account fields. (from r101282) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111991 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-13 00:40:21 +00:00
Sam Minnee
46be185c65 ENHANCEMENT Improved wording and styling in installer. Added links to server requirements, themes download, tutorial. Decreased vertical space before the "install" button to make it more obvious. (from r101246) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111975 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-12 21:56:46 +00:00
Sam Minnee
deb88d1143 BUGFIX #5202 Installer now properly populates database configuration inputs from request after user clicks "Re-check requirements" (from r101087) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111584 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:45:44 +00:00
Sam Minnee
555762299d ENHANCEMENT Allowing SQLite selection in installer 
ENHANCEMENT Moved all Javascript containedin  install.php and config-form.html to install.js, and using jQuery to simplify logic
ENHANCEMENT Allow installer to attach custom form fields based on the install driver (as defined in _register_database.php) (from r101054)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111576 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:43:12 +00:00
Sam Minnee
387d34f625 MINOR Removed whitespace from "Development servers" textarea for installer (from r100978) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111553 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:27:44 +00:00
Sam Minnee
11b1367c8c MINOR Fixed "disabled" styling for database options in config-form.html (showed all as green when "use _ss_environment" was ticked (from r100965) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111549 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:26:54 +00:00
Sam Minnee
7285bbe140 ENHANCEMENT Added help text for "locale" setting in installer 
MINOR Changed <div> hierarchy in config-form.html to allow right-aligned help texts which horizontically align with their respective field sets on the left. (from r100940)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111546 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-10-04 04:24:33 +00:00
Andreas Piening
76dcb97a6f BUGFIX #5176 Javascript error in IE for the installer - use "this" instead of e.target which doesn't work (from r100866) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@108831 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-08-03 03:51:37 +00:00
Andreas Piening
0df70af13d MINOR: removed sqlite msg (from r100801) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@108805 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-08-03 01:06:41 +00:00
Ingo Schommer
5c965330c3 ENHANCEMENT you can now choose your site locale at install time (from r100769) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105645 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-05-25 04:58:00 +00:00