Ingo Schommer 65c1c6fd20 NOTFORMERGE Fixed merge error from r91576 ...

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@91592 467b73ca-7a2a-4603-9d3b-597d59a354a9

2011-02-02 14:17:36 +13:00

api

MINOR Changed silverstripe.com references to silverstripe.org

2011-02-02 14:17:31 +13:00

cli

Merged changes from 2.3 branch

2009-02-01 23:49:53 +00:00

conf

MINOR Changed silverstripe.com references to silverstripe.org

2011-02-02 14:17:31 +13:00

core

MINOR Whitespace change

2011-02-02 14:17:35 +13:00

css

MINOR Calendar displays underneath the time input field in IE, added padding to move the calendar out of the way (from r82988)

2009-10-21 02:34:54 +00:00

dev

MINOR Changed silverstripe.com references to silverstripe.org

2011-02-02 14:17:31 +13:00

email

API CHANGE: Renamed conflicting classes to have an "SS_" namespace, and renamed existing "SS" namespace to "SS_". The affected classes are: HTTPRequest, HTTPResponse, Query, Database, SSBacktrace, SSCli, SSDatetime, SSDatetimeTest, SSLog, SSLogTest, SSLogEmailWriter, SSLogErrorEmailFormatter, SSLogErrorFileFormatter, SSLogFileWriter and SSZendLog.

2009-10-26 03:06:31 +00:00

filesystem

ENHANCEMENT Filesystem::sync() now accepts a folderID argument, meaning you can specifically target a folder and it's children to sychronise, instead of everything (from r82840)

2009-10-21 02:33:55 +00:00

forms

FEATURE: added ability to upload images from site content pane. Merged via r9130, r91347, r91350, r91480

2011-02-02 14:17:36 +13:00

images

MINOR merged from branches/2.3

2009-01-07 23:00:54 +00:00

integration

BUGFIX: Suppressed errors in SS_HTMLValue->setContent() so it can handle malformed HTML.

2009-10-13 01:44:41 +00:00

javascript

MINOR merged in 91306 from trunk

2011-02-02 14:17:35 +13:00

lang

MINOR Changed silverstripe.com references to silverstripe.org

2011-02-02 14:17:31 +13:00

parsers

FEATURE: Added the Shortcode API (ShortcodeParser) to allow you to replace simple BBCode-like tags in a string with the results of a callback.

2009-10-11 00:06:57 +00:00

profiler

MINOR Removed unnecessary profiler_start()/profiler_stop() global methods from Profiler.php

2009-10-28 09:16:52 +00:00

search

MINOR Changed silverstripe.com references to silverstripe.org

2011-02-02 14:17:31 +13:00

security

NOTFORMERGE Fixed merge error from r91576

2011-02-02 14:17:36 +13:00

tasks

MINOR Moved Security::encryptallpasswords() to EncryptAllPasswordsTask (merged from r90948)

2011-02-02 14:17:36 +13:00

templates

BUGFIX: changed condition to display uploaded File

2011-02-02 14:17:36 +13:00

tests

NOTFORMERGE Fixed merge error from r91576

2011-02-02 14:17:36 +13:00

thirdparty

MINOR: Added .gitignore to sapphire/thirdparty for better operation when checking out from git

2009-10-11 09:56:48 +00:00

widgets

BUGFIX: When deleting a WidgetArea, delete all the widgets it contains.

2009-11-02 02:00:52 +00:00

_config.php

ENHANCEMENT Pluggable password encryption through PasswordEncryptor class (#3665) (merged from r90949)

2011-02-02 14:17:36 +13:00

.htaccess

Merged from branches/2.3

2009-04-28 23:52:15 +00:00

cli-script.php

NOTFORMERGE revert accidental commit 91456

2011-02-02 14:17:36 +13:00

main.php

MINOR: Use version_compare to test for correct PHP version.

2009-08-11 03:50:40 +00:00

main.php5

MINOR phpdoc documentation

2009-03-22 22:59:14 +00:00

Makefile

MINOR: Added flush=1 to test executor

2009-05-04 05:14:00 +00:00

sake

ENHANCEMENT: Fixed sapphire execution if you run the uninstalled sake from a foreigh directory. (from r88533)

2009-10-15 22:24:17 +00:00

silverstripe_version

fixed $

2007-12-14 04:35:28 +00:00

static-main.php

MINOR added more documentation around SiteConfig. Also wrote unit tests for permissions inheritance off it. (from r86132)

2009-10-15 21:53:15 +00:00

Description

No description provided

162 MiB

Languages

PHP 99.4%

Scheme 0.5%