Skip to content
Commits on Jan 20, 2016
  1. @tractorcow

    Merge remote-tracking branch 'origin/3'

    tractorcow committed
    # Conflicts:
    #	control/Director.php
    #	control/HTTP.php
    #	core/startup/ParameterConfirmationToken.php
    #	docs/en/00_Getting_Started/01_Installation/05_Common_Problems.md
    #	docs/en/00_Getting_Started/04_Directory_Structure.md
    #	docs/en/00_Getting_Started/05_Coding_Conventions.md
    #	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
    #	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
    #	docs/en/01_Tutorials/03_Forms.md
    #	docs/en/01_Tutorials/04_Site_Search.md
    #	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
    #	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
    #	docs/en/02_Developer_Guides/13_i18n/index.md
    #	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
    #	docs/en/03_Upgrading/index.md
    #	docs/en/changelogs/index.md
    #	docs/en/howto/customize-cms-menu.md
    #	docs/en/howto/navigation-menu.md
    #	docs/en/index.md
    #	docs/en/installation/index.md
    #	docs/en/installation/windows-manual-iis-6.md
    #	docs/en/misc/contributing/code.md
    #	docs/en/misc/contributing/issues.md
    #	docs/en/misc/module-release-process.md
    #	docs/en/reference/dataobject.md
    #	docs/en/reference/execution-pipeline.md
    #	docs/en/reference/grid-field.md
    #	docs/en/reference/modeladmin.md
    #	docs/en/reference/rssfeed.md
    #	docs/en/reference/templates.md
    #	docs/en/topics/commandline.md
    #	docs/en/topics/debugging.md
    #	docs/en/topics/email.md
    #	docs/en/topics/forms.md
    #	docs/en/topics/index.md
    #	docs/en/topics/module-development.md
    #	docs/en/topics/modules.md
    #	docs/en/topics/page-type-templates.md
    #	docs/en/topics/page-types.md
    #	docs/en/topics/search.md
    #	docs/en/topics/testing/index.md
    #	docs/en/topics/testing/testing-guide-troubleshooting.md
    #	docs/en/topics/theme-development.md
    #	docs/en/tutorials/1-building-a-basic-site.md
    #	docs/en/tutorials/2-extending-a-basic-site.md
    #	docs/en/tutorials/3-forms.md
    #	docs/en/tutorials/4-site-search.md
    #	docs/en/tutorials/5-dataobject-relationship-management.md
    #	docs/en/tutorials/building-a-basic-site.md
    #	docs/en/tutorials/dataobject-relationship-management.md
    #	docs/en/tutorials/extending-a-basic-site.md
    #	docs/en/tutorials/forms.md
    #	docs/en/tutorials/index.md
    #	docs/en/tutorials/site-search.md
    #	main.php
    #	model/SQLQuery.php
    #	security/ChangePasswordForm.php
    #	security/MemberLoginForm.php
    #	tests/control/ControllerTest.php
    #	tests/core/startup/ParameterConfirmationTokenTest.php
    #	tests/model/SQLQueryTest.php
    #	tests/security/SecurityTest.php
    #	tests/view/SSViewerTest.php
    #	view/SSTemplateParser.php
    #	view/SSTemplateParser.php.inc
    #	view/SSViewer.php
Commits on Jan 13, 2016
  1. @tractorcow
Commits on Jan 6, 2016
  1. @sminnee

    MINORE: Remove training whitespace.

    sminnee committed
    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
Commits on Dec 22, 2015
  1. @tractorcow

    Merge remote-tracking branch 'origin/3.2' into 3

    tractorcow committed
    # Conflicts:
    #	admin/javascript/LeftAndMain.BatchActions.js
    #	css/UploadField.css
    #	forms/HtmlEditorField.php
Commits on Dec 15, 2015
  1. @UndefinedOffset @tractorcow
  2. @UndefinedOffset
Commits on Dec 1, 2015
  1. NEW Use Config for determining Vary header

    Marcus Nyeholt committed
    Existing implementation hardcodes the Vary header; swap to using Config layer
    instead
    
    Added test for changing the variable from config
Commits on Nov 30, 2015
  1. @tractorcow

    API Enable advanced configuration options for requirements combined f…

    tractorcow committed
    …iles
    
    API Enable relative root paths for the default Flysystem AssetAdapter
Commits on Nov 26, 2015
  1. @tractorcow

    API Replace CacheGeneratedAssetHandler with FlysystemGeneratedAssetHa…

    tractorcow committed
    …ndler
    
    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
Commits on Nov 11, 2015
  1. @sminnee

    FIX: Don’t reuse DBConnector (fixes #4735)

    sminnee committed
    Without this fix, multiple Database objects will use the same
    DBConnector object, meaning that SilverStripe can’t connect to multiple
    databases.
    
    This fix ensures that the service cache generates new DBConnector
    subclasses each time it is called.
Commits on Nov 3, 2015
  1. @tractorcow

    Merge remote-tracking branch 'origin/3'

    tractorcow committed
    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
Commits on Oct 30, 2015
  1. @tractorcow
Commits on Oct 23, 2015
  1. @tractorcow
  2. @tractorcow

    API Restore JS Minification

    tractorcow committed
    BUG Fix incorrect cache on CacheGeneratedAssetHandler
  3. @chillu

    Merge pull request #4680 from open-sausages/features/dbfile-generated…

    chillu committed
    …-files
    
    API Generated files API
Commits on Oct 22, 2015
  1. @tractorcow @chillu

    API Generated files API

    tractorcow committed with chillu
    API Refactor Requirements_Backend to use new APL
Commits on Oct 19, 2015
  1. @kinglozzer
Commits on Oct 12, 2015
  1. @tractorcow

    API Refactor of File / Folder to use DBFile

    tractorcow committed
    API Remove filesystem sync
    API to handle file manipulations
Commits on Sep 24, 2015
  1. @tractorcow
Commits on Aug 28, 2015
  1. @sminnee

    API CHANGE: Shift to Monolog for error reporting and logging

    sminnee committed
    API CHANGE: Debug::showError(), Debug::showLines(), Debug::log(), and Debug::header() removed
    NEW: Logging provided
    
    ZendLog has been removed and monolog introduced instead as a dependency.
    The “ErrorLogger” injection point is now the used as the logger that
    errors are fed into, and implements PSR-3’s Psr\Log\LoggerInterface.
    
    The SS_ERROR_LOG setting expect a Monolog Logger to be provided as the
    ErrorLogger.
Commits on Jul 20, 2015
  1. @dhensby

    Merge branch '3.1' into 3.2

    dhensby committed
    Conflicts:
    	dev/Debug.php
    	docs/en/05_Contributing/01_Code.md
    	forms/FormField.php
    	i18n/i18nTextCollector.php
    	model/DataQuery.php
Commits on Jul 8, 2015
  1. @tractorcow
Commits on Jun 13, 2015
  1. @jedateach @wilr
Commits on Jun 2, 2015
  1. @tractorcow

    Merge remote-tracking branch 'origin/3.1' into 3

    tractorcow committed
    Conflicts:
    	.scrutinizer.yml
    	admin/javascript/LeftAndMain.Panel.js
    	core/startup/ParameterConfirmationToken.php
    	dev/Debug.php
    	dev/FixtureBlueprint.php
    	docs/en/00_Getting_Started/05_Coding_Conventions.md
    	docs/en/00_Getting_Started/index.md
    	docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
    	filesystem/File.php
    	filesystem/Folder.php
    	forms/FieldList.php
    	forms/LabelField.php
    	forms/MoneyField.php
    	forms/TextField.php
    	forms/TreeDropdownField.php
    	forms/Validator.php
    	forms/gridfield/GridField.php
    	forms/gridfield/GridFieldExportButton.php
    	lang/de.yml
    	lang/fi.yml
    	model/DataObject.php
    	model/SQLQuery.php
    	parsers/ShortcodeParser.php
    	security/ChangePasswordForm.php
    	security/Security.php
    	tests/control/DirectorTest.php
    	tests/core/startup/ParameterConfirmationTokenTest.php
    	tests/dev/FixtureBlueprintTest.php
    	tests/forms/FieldListTest.php
    	tests/forms/MoneyFieldTest.php
    	tests/model/SQLQueryTest.php
    	tests/security/SecurityTest.php
Commits on May 4, 2015
  1. @kinglozzer
Commits on Apr 24, 2015
  1. @micmania1

    NEW Added Youtube's short URL.

    micmania1 committed
    At the moment using the short URL (eg. https://youtu.be/qA0T8WumxT4) defaults to http. This introduces issue when running over https.
Commits on Nov 17, 2014
  1. @tractorcow

    Merge remote-tracking branch 'origin/3.1'

    tractorcow committed
    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
Commits on Oct 9, 2014
  1. @tractorcow
Commits on Sep 25, 2014
  1. @halkyon

    Merge pull request #3287 from IgorNadj/3.1

    halkyon committed
    ENH making /dev extendable
Commits on Aug 21, 2014
  1. @halkyon

    NEW Provide a consistent way of triggering flush

    halkyon committed
    Provides an interface for classes to implement their own flush()
    functionality. This function gets called early in a request on
    all implementations of Flushable when flush=1|all is requested in the
    URL.
    
    This fix came out of an issue where Requirements combined files were not
    being cleaned up after dev/build?flush=1, due to the fact that flush
    would only occur when you called it while on a page that used those
    combined files, but not in any other contexts. This will now call flush
    on any implementors of Flushable regardless of the context of where
    flush was called.
Commits on Aug 6, 2014
  1. @igor-silverstripe
Commits on Jul 9, 2014
  1. @tractorcow

    API New Database abstraction layer. Ticket #7429

    tractorcow committed with tractorcow
    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
Commits on Feb 3, 2014
  1. @chillu

    Merge remote-tracking branch 'origin/3.1'

    chillu committed
    Conflicts:
    	_config/routes.yml
    	docs/en/topics/datamodel.md
    	forms/DropdownField.php
Commits on Jan 31, 2014
  1. @chillu

    Merge pull request #2228 from wilr/oldroutes

    chillu committed
    Remove old routes
Commits on Oct 23, 2013
  1. @chillu

    Merge remote-tracking branch 'origin/3.1'

    chillu committed
    Conflicts:
    	tests/security/MemberTest.php
Something went wrong with that request. Please try again.