Damian Mooyman dff65867cc Merge remote-tracking branch 'origin/3.1' into 3 ...

Conflicts:
	control/HTTP.php
	control/HTTPResponse.php
	docs/en/05_Contributing/01_Code.md
	forms/CompositeField.php
	forms/FormAction.php
	forms/FormField.php
	forms/InlineFormAction.php
	forms/NumericField.php
	forms/TreeDropdownField.php
	forms/TreeMultiselectField.php
	templates/forms/TreeDropdownField.ss
	tests/core/CoreTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataDifferencerTest.php

2015-02-20 10:17:19 +13:00

..

firebug-lite

MINOR Added sapphire/thirdparty/firebug-lite (from r92496)

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

greybox

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

jasmine

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

jasmine-ajax

BUGFIX Passing through ignoreMethodDoesntExist parameter in jasmine.js, so we can use it in jasmine-ajax and avoid "xhr has already been spied upon" errors when executing tests through JSTestDriver (submitted patch to both projects)

2011-03-22 18:05:43 +13:00

jasmine-dom

MINOR Removed useless .DS_Store files

2012-03-20 20:41:10 +13:00

jasmine-jquery

MINOR Added sapphire/thirdparty/jasmine for javascript testing

2011-03-22 17:59:36 +13:00

jasmine-jstd-adapter

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

javascript-loadimage

ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField

2012-02-03 01:00:08 +01:00

javascript-templates

ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField

2012-02-03 01:00:08 +01:00

jquery

MINOR Upgrade jQuery dependency to 1.7.2

2012-05-10 16:21:11 +12:00

jquery-cookie

BUGFIX: Fix thirdparty library jquery-cookie referencing $ outside a closure, which wont work in noConflict mode

2012-06-15 01:16:49 +02:00

jquery-effen

MINOR Moved jsparty/jquery/plugins/effen to sapphire/thirdparty/jquery-effen

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

jquery-entwine

Re-added entwine src/ in order to use inspector in dev mode

2013-08-30 10:12:50 +02:00

jquery-fileupload

BUGFIXES: File Uploads

2012-06-08 18:40:33 +02:00

jquery-form

MINOR Updated jquery.form.js plugin, and re-added it to standard includes (its handy for clearing out forms, and consistently getting form field values)

2012-03-02 13:42:15 +01:00

jquery-live-extension

MINOR Added jquery live extensions, necessary for 'change' event in jquery.concrete

2009-11-21 02:32:36 +00:00

jquery-livequery

API-CHANGE: updated livequery to new version that is compatible with jQuery 1.4+

2011-02-24 17:56:03 +13:00

jquery-metadata

MINOR Updated jquery-metadata to v2.1 (removed piston as the release is not contained in the canonical git repo)

2011-04-24 11:46:50 +12:00

jquery-query

ENHANCEMENT $('.cms-preview').block()/unblock() for blocking preview window when unavailable. Fixed duplicate addition of GET parameters in preview with new jQuery.query library for parameter parsing.

2011-08-12 14:28:22 +02:00

jquery-selector

MINOR Using jquery.concrete and jquery.selector on github through piston dependency management

2009-11-21 02:31:55 +00:00

jquery-ui

Add zh-CN and zh-TW locale files for jQuery UI datepicker.

2013-02-25 16:54:27 +10:00

jquery-ui-themes/smoothness

Upgraded jQuery UI from 1.9.1 to 1.9.2 (fixes #8062)

2012-12-04 16:05:48 +01:00

jquery-validate

Removed demo folder

2014-04-29 12:51:47 +12:00

jsmin

MINOR Add newline to end of files without one

2012-04-15 10:50:19 +12:00

json-js

MINOR Added json-js library to provide a cross-browser JSON implementation. We need this for jquery.layout.state.js at the moment.

2009-11-21 02:30:27 +00:00

jstree

FIX Memory leaks in jstree drag & drop

2013-08-20 16:07:54 +12:00

php-peg

MINOR: PHP-PEG is now triple licensed under BSD, MPL and GPL by request

2012-04-13 15:33:12 +12:00

simpletest

BUGFIX: Old version of SimpleTest does not recognise input fields of

2012-09-28 12:07:54 +12:00

spyc

MINOR Add newline to end of files without one

2012-04-15 10:50:19 +12:00

tabstrip

Upgrade jQuery UI to 1.9

2012-11-06 19:45:56 +01:00

tinymce

Changed cache_dir to respect TEMP_FOLDER

2015-02-12 15:21:55 +01:00

tinymce_ssbuttons

OEmbed resize on correct attrs (fixes #1950)

2013-05-25 01:26:34 +02:00

tinymce_ssmacron

Create nl.js

2013-02-18 02:20:50 -08:00

tinymce-spellchecker

MINOR Add newline to end of files without one

2012-04-15 10:50:19 +12:00

Zend

Use php.internal_encoding instead of iconv.internal_encoding in PHP 5.6+

2014-05-24 11:35:19 +10:00

zend_translate_railsyaml

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

_manifest_exclude

Made all sapphire/thirdparty classes _manifest_exclude'd

2008-08-17 01:08:10 +00:00