Ingo Schommer
7ae75c1a89
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
forms/HtmlEditorField.php
2013-08-16 13:37:44 +02:00
Jeremy Bridson
cf75166d83
MINOR: ISSUE-19 CWP Accessibility fixes - Added macron to Māori toggle button for translations on the CWP demo site.
2013-08-12 15:39:00 +12:00
Hamish Friedlander
d44024b1cf
Merge branch 'origin/3.1'
2013-07-24 13:29:55 +12:00
Arno Poot
aa6da4ee4e
Fixed CountryDropDownField showing East Germany
2013-07-23 19:13:11 +02:00
carlos barberis
47147eb3df
API: delete simplepie from framework thirdparty
2013-07-01 09:41:57 +02:00
Ingo Schommer
4aafe47fbb
OEmbed resize on correct attrs ( fixes #1950 )
2013-05-25 01:26:34 +02:00
Zauberfisch
5008070df1
Hacked Zend_Locale to allow lc_XX locale
2013-05-11 19:42:48 +01:00
Ingo Schommer
0e5b099287
FIX Unquoted shortcodes weren't parsed ( fixes #680 )
...
Since that used to be the default shortcode notation
for our core "insert media" functionality, its important
to have this fixed and keep supporting "legacy" content
created with 3.0.
2013-04-26 01:00:13 +02:00
Hamish Friedlander
53128c5d2f
Make ShortcodeParser use HTMLValue for HTML parsing
2013-03-14 12:49:03 +13:00
Ingo Schommer
bea1b9002d
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
control/HTTP.php
2013-02-26 13:28:35 +01:00
Simon Elvery
384f173a7f
Add zh-CN and zh-TW locale files for jQuery UI datepicker.
2013-02-25 16:54:27 +10:00
Hamish Friedlander
5bbf94d2f4
FIX HTML5 parser not tracking context correctly
2013-02-20 10:57:06 +13:00
Ingo Schommer
a86e4ee00c
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/injector/InjectorTest.php
tests/travis/before_script
2013-02-18 14:15:42 +01:00
Ingo Schommer
89f963c468
Merge pull request #1191 from ARNHOE/patch-1
...
Create nl.js for ssbuttons
2013-02-18 02:26:33 -08:00
ARNHOE
7e88e67621
Create nl.js
2013-02-18 02:20:50 -08:00
ARNHOE
70d20ada3a
Create nl.js
2013-02-18 02:20:02 -08:00
Hamish Friedlander
2335c074b3
NEW Make shortcode parser more clever about placement
...
Shortcodes have traditionally had a problem that they are inside <p> tags,
but generate block level elements. This breaks HTML compliance.
This makes the shortcode parser now mutate the DOM based on the "class" attribute on
the shortcode to insert the generated block level element at the right place in the DOM
- for "left" and "right" elements it puts them just before the block level
element they are inside
- for "leftAlone" and "center" elements it splits the DOM around the shortcode.
The trade off is that shortcodes are no longer "text level" features. They need
knowledge of the HTML they are in to perform this transformation, so they can
only be used in (valid) HTML
2013-02-18 10:49:52 +13:00
Hamish Friedlander
4681673896
FIX TinyMCE context menu displaying default dialogs instead of our one
2013-01-31 16:39:00 +13:00
Ingo Schommer
fa84c2d705
Merge remote-tracking branch 'origin/3.0'
2012-12-10 17:50:43 +01:00
Ingo Schommer
ab260d4913
Upgraded jQuery UI from 1.9.1 to 1.9.2 ( fixes #8062 )
2012-12-04 16:05:48 +01:00
Sean Harvey
6ce6f9a2c1
Merge branch '3.0'
2012-11-26 17:17:41 +13:00
Sean Harvey
220d317f27
Upgrading TinyMCE dependency from 3.5.7 to 3.5.8
...
This also fixes 78ab9d3bf6
which strips HTML data attributes
from the editor contents.
See changelog here:
http://www.tinymce.com/develop/changelog/index.php?type=tinymce
2012-11-26 15:13:48 +13:00
Sean Harvey
6a868e79e1
Removing deprecated prototype/behaviour libraries
2012-11-16 11:37:56 +13:00
Sean Harvey
77337ae58c
Removing deprecated TableListField and subclasses
...
These have been moved to a module called "legacytablefields"
located at https://github.com/silverstripe-labs/legacytablefields
2012-11-16 11:04:28 +13:00
Ingo Schommer
ff39f9ad38
Upgrade jQuery UI to 1.9
...
- Fixed jQuery.tabs remote tabs loading behaviour (see http://forum.jquery.com/topic/tabs-api-redesign )
2012-11-06 19:45:56 +01:00
Martin D.
e30029ba1f
Update thirdparty/jquery-ui/datepicker/i18n/jquery.ui.datepicker-en.js
...
Syntax error on line 22.
2012-10-30 12:17:41 -03:00
martimiz
5186bada17
FIX DateField Calendar - make dates with day- and monthnames validate
...
In locales other than en_US, as a result of missing jQuery locale
files, the DatePicker defaulted to English whenever day and monthnames
were used, breaking validation. Needed to change official locale files
before adding, because Zend_Date and jQuery day/monthnames not matching
again breaks validation.
Removed hard setting the names to uppercase, breaking validation for
other locales
Changed order in convert_iso_to_jquery_format(), to prevent EEE(E)
settings from being overwritten
Added a check for existing locale files, and made DatePicker fallback
to ISO yyy-MM-dd if a missing locale file would otherwise break
validation.
Added documentation for the DateField
2012-10-12 10:16:35 +02: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
Frank Mullenger
a602ba5941
BUGFIX: Old version of SimpleTest does not recognise input fields of
...
type 'email'.
2012-09-28 12:07:54 +12:00
Sean Harvey
8806fd18c5
MINOR Upgrading TinyMCE dependency from 3.5.6 to 3.5.7
2012-09-24 15:05:50 +12:00
Sean Harvey
b075fa29c5
Have tiny_mce_gzip.php use local silverstripe-cache folder if available
...
This is a fix for ticket #7670 . Some hosting situations don't
allow write access to the system temp path. tiny_mce_gzip.php is currently
using sys_get_temp_dir() by default, and not using a local silverstripe-cache
folder that may exist in the SilverStripe project.
This change moves the getTempFolder() function into a common file, and
includes that in core/Core.php, as well as thirdparty/tinymce/tiny_mce_gzip.php
so both locations share the same code to work out the temp path.
2012-09-19 16:43:17 +12:00
Sean Harvey
758b4fd173
Upgrading TinyMCE dependency to 3.5.6, and updating language packs.
2012-09-14 15:26:17 +12:00
Ingo Schommer
8a5a4ffd73
BUG TinyMCE UI shows placeholders in mi_NZ ( fixes #7797 )
2012-09-11 14:31:34 +02:00
jean
85ab39b280
FIX 7832 Lang files for ss macron plugin - correct path to "langs", not "lang"
...
MINOR Use consistent ed.getLang method
2012-08-31 11:57:44 +12:00
Hamish Friedlander
915ae1a966
Upgrade entwine to latest
...
Fixes issue where inspector used document.write
2012-08-20 11:26:11 +12:00
Ingo Schommer
7170eb7dc9
Localized parts of TinyMCE into Te Reo
2012-08-13 00:15:36 +02:00
Ingo Schommer
857afc4ee7
Localization for custom TinyMCE ssmacron module
2012-08-13 00:15:36 +02:00
Ingo Schommer
64357a4522
Merge branch '3.0'
...
Conflicts:
admin/css/screen.css
admin/scss/_forms.scss
docs/en/changelogs/3.0.0.md
2012-07-05 18:01:09 +02:00
Ingo Schommer
9ce0c9a483
Relative include path for RailsYAML PHPUnit tests
...
Avoids problems when PHPUnit includes this test through autodiscovery. This is the case when running PHPUnit
with a specific path argument, which overrules phpunit.xml.dist
(e.g. "phpunit sapphire/").
2012-07-05 12:14:56 +02:00
Ingo Schommer
45a14951a3
Revert "MINOR Updated sfYaml parser dependency to 2.0.14, use it in ConfigManifest and i18nTextCollector"
...
This reverts commit 3a01c2ab2e
.
Conflicts:
core/manifest/ConfigManifest.php
i18n/i18nTextCollector.php
2012-06-21 21:11:48 +02:00
Ingo Schommer
3a01c2ab2e
MINOR Updated sfYaml parser dependency to 2.0.14, use it in ConfigManifest and i18nTextCollector
...
Changed class loading to new file structure, moved dependency to framework/thirdparty,
rather than relying on "second level" dependencies through Zend_Translate_RailsYAML.
To be replaced by a composer dependency (+ proper autoloading) once in place.
2012-06-20 14:06:21 +02:00
Sean Harvey
0ef825301d
MINOR Upgrade TinyMCE dependency from 3.5.1.1 to 3.5.3
2012-06-20 22:34:39 +12:00
Ingo Schommer
7ba759e77b
MINOR Fixed jQuery.jstree men leaks on 'dnd' and 'context menu' plugins, by removing globally bound event handlers (see #7258 )
2012-06-15 01:19:20 +02:00
Ingo Schommer
fa900f70d5
MINOR jQuery UI tabs memory leak (see ##7258)
...
Events with closed in DOM elements get bound to window on tab initialisation,
and never unbound. Will be fixed with jQuery UI 1.9
2012-06-15 01:19:19 +02:00
Hamish Friedlander
bbd1bb7495
API CHANGE: Upgrade jquery entwine
2012-06-15 01:17:55 +02:00
Hamish Friedlander
8177c93c92
BUGFIX: Fix thirdparty library jquery-cookie referencing $ outside a closure, which wont work in noConflict mode
2012-06-15 01:16:49 +02:00
Naomi Guyer
7523f98e04
BUGFIXES: File Uploads
...
* Add arrows back to edit-all toggle button
* Don't show dimensions if the item being inserted doesn't have them.
* Set pop-up windows to be a percentage of the window height for better
use of space
* Fix broken fieldholdersmall styling within files edit
* Add placeholder if no preview
*Take out minFileSize so upload will work on Android phones
2012-06-08 18:40:33 +02:00
Ingo Schommer
ad6b7a40ee
BUGFIX Add Maori locale data (mi, mi_NZ) from CLDR 1.9 to avoid Zend_Locale complaining ( fixes #7386 )
2012-05-29 13:47:24 +02:00
Sean Harvey
9b9bd23820
MINOR Upgrade TinyMCE dependency to 3.5.1.1
2012-05-28 21:42:15 +12:00
Mateusz Uzdowski
d8fdda79be
BUGFIX: Add comments and fix IE problems (class is a reserver JS word).
2012-05-25 09:31:15 +12:00
Simon Welsh
bb29ff3611
FEATURE: Allow adding media to the CMS using oEmbed
2012-05-24 17:00:21 +12:00
Hamish Friedlander
7b8e25467e
MINOR: Update jquery.entwine to latest version. Brings speed improvements in onmatch, and an inspector.
2012-05-14 16:34:18 +12:00
Stig Lindqvist
dffae1a2e7
API CHANGE: Do not rely on a specific OS mime type detection, use PHP finfo
...
This also removes the $global_mimetypes that was generating weird errors when both HTTP and Mailer classes tried to modify and use it.
Support of finfo should be straightforward since PHP 5.3 includes that module that default
2012-05-11 11:34:07 +12:00
Ingo Schommer
8b4afc01a7
Merge pull request #426 from halkyon/jquery_upgrade
...
MINOR Upgrade jQuery dependency to 1.7.2
2012-05-10 02:49:41 -07:00
Sean Harvey
c9900b7df2
MINOR Upgrade jQuery UI dependency to 1.8.20
2012-05-10 16:39:50 +12:00
Sean Harvey
1e8a89db8f
MINOR Upgrade jQuery dependency to 1.7.2
2012-05-10 16:21:11 +12:00
Sean Harvey
c507efcfad
MINOR Updated TinyMCE dependency from 3.4.6 to 3.5
2012-05-08 16:29:43 +12:00
Sam Minnee
8eb0814d04
BUGFIX: Put all php file inclusions/exclusions into a single file, because some servers don't seem to allow reenabling of file access in a subdirection .htaccess file.
2012-05-03 13:13:51 +12:00
Simon Welsh
82ca56df25
MINOR Remove .svn folder
2012-04-20 09:54:58 +12:00
Sam Minnee
cc7a012139
BUGFIX: Use the copy of symfony-yaml bundled with Zend_Translate to prevent class conflicts. Remove now-unnecessary symonfy-yaml thirdparty lib.
2012-04-18 09:34:57 +12:00
Sean Harvey
f3137e5b2b
BUGFIX Fixed regression where image and link popups don't open
2012-04-17 15:13:55 +12:00
Sean Harvey
5813a94851
MINOR Cleaning up spaces and replace with tabs
2012-04-17 14:44:13 +12:00
Will Rossiter
7a4392ca03
Merge pull request #324 from halkyon/installer_fixes
...
MINOR: Fix install not loading because of Zend/Translate.php dependency in i18n.php
2012-04-16 16:34:53 -07:00
Sean Harvey
e6007c2637
MINOR Removed redundant system temp path discovery in tiny_mce_gzip,
...
juse use sys_get_temp_dir() instead which is always available.
2012-04-17 10:53:40 +12:00
Simon Welsh
df08c2fadf
API-CHANGE Move tinymce plugins in thirdparty
2012-04-16 12:25:49 +02:00
Ingo Schommer
ef5e6394d6
MINOR Don't break on empty YAML files
2012-04-15 20:43:32 +02:00
Ingo Schommer
c649fa3acf
MINOR Workaround for duplicate require_once calls of same class in two locations (SS core and Zend_Translate_RailsYAML)
2012-04-15 18:46:04 +02:00
Ingo Schommer
9e95ba0045
BUGFIX Disable performance intensive Zend_Locale::isLocale() valiations in Zend_Translate_Adapter, which is only used for i18n class in SilverStripe core, so a controlled environment where valid locales are assumed
2012-04-15 17:17:16 +02:00
Ingo Schommer
bd23a07bba
API CHANGE Using Zend_Translate with YAML translation files, replacing the $lang global and PHP files in the /lang folders.
2012-04-15 17:17:15 +02:00
Ingo Schommer
a3e74bb2ef
MINOR Added Zend_Translate dependency (v1.11.11)
2012-04-15 17:17:14 +02:00
Ingo Schommer
3342c84abe
MINOR Added zend_translate_railsyaml dependency
2012-04-15 17:17:14 +02:00
Simon Welsh
3a6341a251
API-CHANGE sapphire folder can now be renamed.
2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814
MINOR Add newline to end of files without one
2012-04-15 10:50:19 +12:00
Hamish Friedlander
fc5592ef17
MINOR: PHP-PEG is now triple licensed under BSD, MPL and GPL by request
2012-04-13 15:33:12 +12:00
Hamish Friedlander
7ae9f8af84
BUGFIX: match_function had been partially refactored to take $value as an argument rather than from the instance variable, but that hadnt been completed, causing problems with E_STRICT. This completes that refactoring.
2012-04-13 15:33:12 +12:00
Sean Harvey
0dd4d4386e
BUGFIX php-peg E_STRICT fixes
2012-04-12 14:58:21 +12:00
Sean Harvey
972dfee5c3
MINOR Fixing E_STRICT compliance in simpletest
2012-04-12 12:06:47 +12:00
Ingo Schommer
6a10ed19c1
MINOR Added TinyMCE language pack
2012-04-11 18:05:29 +02:00
Andrew O'Neil
501c8f3f31
MINOR: Fix E_STRICT notices in php-peg
2012-04-11 14:40:27 +12:00
Sean Harvey
4b2326cb66
MINOR Fixed use of split which is deprecated
2012-04-10 22:19:17 +12:00
Sean Harvey
dbc4be3e94
API CHANGE Removed Services_JSON library, as we use the built-in json functions instead.
2012-03-31 13:20:19 +13:00
Sean Harvey
cf014dc56d
MINOR Replaced use of deprecated split() with preg_split() and fixed use of "&new Class()" which is deprecated in PHP 5.3
...
ENHANCEMENT E_DEPRECATED and E_USER_DEPRECATED are now handled as notice level errors in Debug.
2012-03-27 23:16:52 +13:00
Sean Harvey
fea3a4eea0
MINOR Removed useless .DS_Store files
2012-03-20 20:41:10 +13:00
Ingo Schommer
eecca9b73a
MINOR Removed unnecessary tests from symfony-yaml dependency (which also fixes phpunit binary execution)
2012-03-14 12:05:06 +01:00
Hamish Friedlander
7125cd4f27
ENHANCEMENT: Piston in symfony yaml library
2012-03-09 18:13:56 +13:00
Sean Harvey
8de7b745fc
BUGFIX TinyMCE cache shouldn't be shared between projects. Add SCRIPT_NAME when generating a hash for the cache filename
2012-03-03 17:11:43 +13:00
Ingo Schommer
3659c63afe
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
Ingo Schommer
5bf79f8146
BUGFIX Removed tinymce-advcode plugin which breaks with new TinyMCE and newer browsers. Both the plugin and the underlying 'codepress' engine are unmaintained. Fall back to standard (non-highlighted) TinyMCE <textarea> editing ( fixes #6779 )
2012-02-11 01:08:04 +01:00
Ingo Schommer
d912da4ed5
MINOR Upgraded Zend framework dependency from 1.11.6 to 1.11.11
2012-02-10 23:10:29 +01:00
Felipe Skroski
f4c140bcf4
MINOR Cleaner tree icons
2012-02-03 15:27:33 +01:00
Ingo Schommer
c0d187071a
ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField
2012-02-03 01:00:08 +01:00
Ingo Schommer
5ec6aa532c
ENHANCEMENT GZipped/combined file loading for TinyMCE, which reduces number of HTTP requests in the standard CMS by a third (and decreases file size due to loading pre-compressed files by default)
2012-01-06 15:34:32 +01:00
Ingo Schommer
39dd90de54
MINOR Fixed relative dialog.html reference in tinymce-advcode (it assumes to be in main TinyMCE folder structure)
2012-01-05 00:41:41 +01:00
Ingo Schommer
e5e7511245
MINOR Patching prototype.js connection closing to avoid JS errors (see pull request #106 )
2011-12-17 01:39:56 +01:00
Ingo Schommer
e20304276f
MINOR Remove php-peg third party PHPUnit tests to avoid them being executed in default phpunit binary test runs (which auto-discover tests ignoring _manifest_exclude).
2011-12-04 13:37:05 +01:00
Ingo Schommer
d020e656a1
MINOR Updated TinyMCE dependency from 3.1 to 3.4.6
2011-10-29 13:27:11 +02:00
Ingo Schommer
7b38fcfd2e
MINOR Updated jQuery UI from 1.8.10 to 1.8.16
2011-10-04 13:16:56 +02:00
Ingo Schommer
5db7f3891b
MINOR Updated jQuery from 1.5 to 1.6.4
2011-10-04 13:16:56 +02:00
Ingo Schommer
2aa28c0902
BUGFIX Disabling add_sheet() on jstree, as its horribly slow
2011-10-04 13:16:56 +02:00
Ingo Schommer
cae7791d14
Allowing success and error callbacks in refresh()
2011-10-04 13:16:56 +02:00
Ingo Schommer
135cb1cc94
BUGFIX Checking for node existence in get_text() for jquery.jstree.js
2011-10-04 13:16:55 +02:00
Ingo Schommer
4b1b7d4ec7
MINOR Moved jstree piston origin to github (need to reapply patches)
2011-10-04 13:16:55 +02:00
Ingo Schommer
ce8e72cf0e
MINOR Removing executable flag from all files (thanks miiihi)
2011-09-18 22:04:02 +02:00
Ingo Schommer
e40d3d45c0
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
Ingo Schommer
9434f87cb9
API CHANGE Updated Zend framework dependency from 1.8.1 to 1.11.6. Includes changes to the underlying CLDR locale data, which changes the default en_US date format from 'MM/dd/yyyy' to a less ambiguous 'MMM d, y' (before: '01/31/2011', after: 'Dec 1, 2011')
2011-05-30 21:30:04 +12:00
Ingo Schommer
340f2ce5e8
MINOR Updated jquery-entwine
2011-05-12 21:39:41 +12:00
Ingo Schommer
7bee470209
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
Ingo Schommer
0f7175f1f7
BUGFIX Disabling add_sheet() on jstree, as its horribly slow
2011-04-24 11:46:48 +12:00
phalkunz
2e71dea3b6
MINOR: Upgrade tinymce to version 3.4.1
2011-04-05 11:42:57 +12: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
Ingo Schommer
77fa855cda
Allowing success and error callbacks in refresh()
2011-03-22 18:15:08 +13:00
Ingo Schommer
99099e8838
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
Ingo Schommer
fb502d7fc8
MINOR Added jasmine-jstd-adapter dependency
2011-03-22 18:05:43 +13:00
Ingo Schommer
89a0b1b281
BUGFIX Added getAllResponseHeaders() to jasmine-ajax to get jQuery 1.5 compatibility
2011-03-22 18:05:42 +13:00
Ingo Schommer
1fca5c5089
Fixed infinite loops in onmatch() and onunmatch() when using $.entwine.synchronous_mode() with DOM manipulations in these methods. Allowing $.entwine.synchronous_mode() to be turned off again
2011-03-22 18:05:22 +13:00
Ingo Schommer
a00ccead8f
BUGFIX Checking for node existence in get_text() for jquery.jstree.js
2011-03-22 17:59:36 +13:00
Ingo Schommer
b5d2e10d41
MINOR Added sapphire/thirdparty/jasmine for javascript testing
2011-03-22 17:59:36 +13:00
Ingo Schommer
a306ccb7ef
MINOR Updated sapphire/thirdparty/jstree from 1.0rc1 to trunk
2011-03-22 17:59:35 +13:00
Ingo Schommer
c9c794a75b
MINOR Removed thirdparty/calendar (falsely readded through 2.4 merge)
2011-03-16 13:31:51 +13:00
Hamish Friedlander
f5b867a35d
Merge branch 'ssviewer-rewrite'
2011-03-10 17:52:10 +13:00
Hamish Friedlander
fdf81c80cb
MINOR: Pull in latest changes from thirdparty tool php-peg
2011-03-10 15:04:01 +13:00
Julian Seidenberg
0bb424e2a2
API-CHANGE: updated jsmin to point at new github repo for the project
2011-02-24 18:10:58 +13:00
Julian Seidenberg
eee5f3e266
API-CHANGE: updated jquery-validate to new version compatible with jQuery 1.4.2+
2011-02-24 18:07:18 +13:00
Julian Seidenberg
04eb5f2cbf
API-CHANGE: updated livequery to new version that is compatible with jQuery 1.4+
2011-02-24 17:56:03 +13:00
Julian Seidenberg
beb75371fa
BUGFIX: update jquery form to latest version
2011-02-24 17:47:34 +13:00
Julian Seidenberg
00b0bc1751
API-CHANGE: updated jquery-ui to version 1.8.10
2011-02-24 11:08:39 +13:00
Julian Seidenberg
b2cdb4be66
API-CHANGE: updated jquery ui themes to 1.8.10
2011-02-24 11:06:19 +13:00
Julian Seidenberg
69e5fdd1a6
API-CHANGE: updated jQuery to version 1.5. Removed deprecated jquery-packed.js file and obsolete readme which pointed to wrong code repository.
2011-02-24 10:21:54 +13:00
Julian Seidenberg
deb31b3bb4
API-CHANGE: updated jquery entwine to new version that is compatible with jQuery 1.5
2011-02-24 10:11:41 +13:00
Sam Minnee
1e0c4ae8d1
Merge branch '2.4'
...
Conflicts:
cache/Cache.php
cli/CliController.php
core/Convert.php
core/Core.php
core/ManifestBuilder.php
core/Object.php
core/SSViewer.php
core/control/ContentController.php
core/control/ContentNegotiator.php
core/control/FormResponse.php
core/control/RequestHandler.php
core/control/SilverStripeNavigatorItem.php
core/i18n.php
core/i18nTextCollector.php
core/model/DataObjectSet.php
core/model/Hierarchy.php
core/model/Image.php
core/model/MySQLDatabase.php
core/model/SiteConfig.php
core/model/SiteTree.php
core/model/Translatable.php
core/model/VirtualPage.php
dev/Debug.php
dev/SapphireTest.php
dev/TestRunner.php
dev/YamlFixture.php
dev/install/MySQLDatabaseConfigurationHelper.php
docs/en/installation/from-source.md
docs/en/topics/themes.md
docs/en/tutorials/4-site-search.md
email/Mailer.php
filesystem/File.php
filesystem/Folder.php
forms/ComplexTableField.php
forms/CurrencyField.php
forms/DateField.php
forms/FieldSet.php
forms/FileField.php
forms/FileIFrameField.php
forms/HtmlEditorConfig.php
forms/HtmlEditorField.php
forms/SelectionGroup.php
forms/SimpleImageField.php
forms/TabSet.php
forms/TableField.php
forms/TableListField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
integration/Geoip.php
javascript/SelectionGroup.js
javascript/TreeSelectorField.js
javascript/UpdateURL.js
javascript/core/jquery.ondemand.js
javascript/tiny_mce_improvements.js
javascript/tree/tree.js
lang/en_US.php
search/ContentControllerSearchExtension.php
security/Group.php
security/Member.php
security/PermissionCheckboxSetField.php
security/PermissionRole.php
security/Security.php
static-main.php
templates/RelationComplexTableField.ss
templates/TableListField.ss
tests/ConvertTest.php
tests/DataObjectSetTest.php
tests/DataObjectTest.php
tests/DataObjectTest.yml
tests/RequestHandlingTest.php
tests/SSViewerTest.php
tests/SiteTreePermissionsTest.php
tests/SiteTreeTest.php
tests/TransactionTest.php
tests/api/RestfulServiceTest.php
tests/control/DirectorTest.php
tests/control/ModelAsControllerTest.php
tests/fieldtypes/WidgetAreaEditorTest.php
tests/forms/CurrencyFieldTest.php
tests/forms/FormTest.php
tests/model/DatabaseTest.php
tests/model/ImageTest.php
tests/search/ContentControllerSearchExtensionTest.php
tests/security/MemberAuthenticatorTest.php
thirdparty/.gitignore
thirdparty/behaviour/behaviour.js
thirdparty/firebug-lite/firebug.js
thirdparty/firebug-lite/firebugx.js
thirdparty/jquery-form/jquery.form.js
thirdparty/jquery-livequery/jquery.livequery.js
thirdparty/jquery-livequery/test/jquery.js
thirdparty/jquery-livequery/test/test.html
thirdparty/jquery-livequery/test/test2.html
thirdparty/jquery-metadata/META.json
thirdparty/jquery-metadata/README
thirdparty/jquery-metadata/jquery.metadata.js
thirdparty/jquery-metadata/test/index.html
thirdparty/jquery-metadata/test/jquery.js
thirdparty/jquery-metadata/test/test.js
thirdparty/jquery-metadata/test/testrunner.js
thirdparty/jquery-metadata/test/testsuite.css
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
thirdparty/jquery-ui-themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_2e83ff_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_454545_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_888888_256x240.png
thirdparty/jquery-ui-themes/smoothness/images/ui-icons_cd0a0a_256x240.png
thirdparty/jquery-ui/i18n/jquery-ui-i18n.js
thirdparty/jquery-ui/i18n/ui.datepicker-ar.js
thirdparty/jquery-ui/i18n/ui.datepicker-bg.js
thirdparty/jquery-ui/i18n/ui.datepicker-ca.js
thirdparty/jquery-ui/i18n/ui.datepicker-cs.js
thirdparty/jquery-ui/i18n/ui.datepicker-da.js
thirdparty/jquery-ui/i18n/ui.datepicker-de.js
thirdparty/jquery-ui/i18n/ui.datepicker-el.js
thirdparty/jquery-ui/i18n/ui.datepicker-eo.js
thirdparty/jquery-ui/i18n/ui.datepicker-es.js
thirdparty/jquery-ui/i18n/ui.datepicker-fa.js
thirdparty/jquery-ui/i18n/ui.datepicker-fi.js
thirdparty/jquery-ui/i18n/ui.datepicker-fr.js
thirdparty/jquery-ui/i18n/ui.datepicker-he.js
thirdparty/jquery-ui/i18n/ui.datepicker-hr.js
thirdparty/jquery-ui/i18n/ui.datepicker-hu.js
thirdparty/jquery-ui/i18n/ui.datepicker-hy.js
thirdparty/jquery-ui/i18n/ui.datepicker-id.js
thirdparty/jquery-ui/i18n/ui.datepicker-is.js
thirdparty/jquery-ui/i18n/ui.datepicker-it.js
thirdparty/jquery-ui/i18n/ui.datepicker-ja.js
thirdparty/jquery-ui/i18n/ui.datepicker-ko.js
thirdparty/jquery-ui/i18n/ui.datepicker-lt.js
thirdparty/jquery-ui/i18n/ui.datepicker-lv.js
thirdparty/jquery-ui/i18n/ui.datepicker-ms.js
thirdparty/jquery-ui/i18n/ui.datepicker-nl.js
thirdparty/jquery-ui/i18n/ui.datepicker-no.js
thirdparty/jquery-ui/i18n/ui.datepicker-pl.js
thirdparty/jquery-ui/i18n/ui.datepicker-pt-BR.js
thirdparty/jquery-ui/i18n/ui.datepicker-ro.js
thirdparty/jquery-ui/i18n/ui.datepicker-ru.js
thirdparty/jquery-ui/i18n/ui.datepicker-sk.js
thirdparty/jquery-ui/i18n/ui.datepicker-sl.js
thirdparty/jquery-ui/i18n/ui.datepicker-sq.js
thirdparty/jquery-ui/i18n/ui.datepicker-sr-SR.js
thirdparty/jquery-ui/i18n/ui.datepicker-sr.js
thirdparty/jquery-ui/i18n/ui.datepicker-sv.js
thirdparty/jquery-ui/i18n/ui.datepicker-th.js
thirdparty/jquery-ui/i18n/ui.datepicker-tr.js
thirdparty/jquery-ui/i18n/ui.datepicker-uk.js
thirdparty/jquery-ui/i18n/ui.datepicker-zh-CN.js
thirdparty/jquery-ui/i18n/ui.datepicker-zh-TW.js
thirdparty/jquery/jquery.js
thirdparty/jsmin/.piston.yml
thirdparty/jsmin/jsmin.php
thirdparty/prototype/prototype.js
thirdparty/scriptaculous/dragdrop.js
thirdparty/simplepie/.piston.yml
thirdparty/spyc/.piston.yml
thirdparty/spyc/README
thirdparty/spyc/php4/spyc.php4
thirdparty/spyc/php4/test.php4
thirdparty/spyc/spyc.php
thirdparty/spyc/spyc.yaml
thirdparty/tinymce-advcode/dialog.html
thirdparty/tinymce-advcode/editor_plugin_src.js
thirdparty/tinymce-advcode/js/dialog.js
thirdparty/tinymce/langs/en.js
thirdparty/tinymce/plugins/advhr/langs/en_dlg.js
thirdparty/tinymce/plugins/advhr/rule.htm
thirdparty/tinymce/plugins/advimage/image.htm
thirdparty/tinymce/plugins/advimage/langs/en_dlg.js
thirdparty/tinymce/plugins/advlink/langs/en_dlg.js
thirdparty/tinymce/plugins/advlink/link.htm
thirdparty/tinymce/plugins/emotions/emotions.htm
thirdparty/tinymce/plugins/emotions/langs/en_dlg.js
thirdparty/tinymce/plugins/example/dialog.htm
thirdparty/tinymce/plugins/fullpage/fullpage.htm
thirdparty/tinymce/plugins/fullpage/langs/en_dlg.js
thirdparty/tinymce/plugins/fullscreen/fullscreen.htm
thirdparty/tinymce/plugins/inlinepopups/template.htm
thirdparty/tinymce/plugins/media/langs/en_dlg.js
thirdparty/tinymce/plugins/media/media.htm
thirdparty/tinymce/plugins/paste/js/pasteword.js
thirdparty/tinymce/plugins/paste/langs/en_dlg.js
thirdparty/tinymce/plugins/paste/pastetext.htm
thirdparty/tinymce/plugins/paste/pasteword.htm
thirdparty/tinymce/plugins/searchreplace/langs/en_dlg.js
thirdparty/tinymce/plugins/searchreplace/searchreplace.htm
thirdparty/tinymce/plugins/spellchecker/editor_plugin.js
thirdparty/tinymce/plugins/spellchecker/editor_plugin_src.js
thirdparty/tinymce/plugins/style/langs/en_dlg.js
thirdparty/tinymce/plugins/style/props.htm
thirdparty/tinymce/plugins/table/cell.htm
thirdparty/tinymce/plugins/table/langs/en_dlg.js
thirdparty/tinymce/plugins/table/merge_cells.htm
thirdparty/tinymce/plugins/table/row.htm
thirdparty/tinymce/plugins/table/table.htm
thirdparty/tinymce/plugins/template/langs/en_dlg.js
thirdparty/tinymce/plugins/template/template.htm
thirdparty/tinymce/plugins/xhtmlxtras/abbr.htm
thirdparty/tinymce/plugins/xhtmlxtras/acronym.htm
thirdparty/tinymce/plugins/xhtmlxtras/attributes.htm
thirdparty/tinymce/plugins/xhtmlxtras/cite.htm
thirdparty/tinymce/plugins/xhtmlxtras/del.htm
thirdparty/tinymce/plugins/xhtmlxtras/ins.htm
thirdparty/tinymce/plugins/xhtmlxtras/langs/en_dlg.js
thirdparty/tinymce/themes/advanced/about.htm
thirdparty/tinymce/themes/advanced/anchor.htm
thirdparty/tinymce/themes/advanced/charmap.htm
thirdparty/tinymce/themes/advanced/color_picker.htm
thirdparty/tinymce/themes/advanced/image.htm
thirdparty/tinymce/themes/advanced/langs/en.js
thirdparty/tinymce/themes/advanced/langs/en_dlg.js
thirdparty/tinymce/themes/advanced/link.htm
thirdparty/tinymce/themes/advanced/source_editor.htm
thirdparty/tinymce/themes/simple/langs/en.js
thirdparty/tinymce/tiny_mce.js
thirdparty/tinymce/tiny_mce_src.js
widgets/Widget.php
2011-02-14 18:47:53 +13:00
Hamish Friedlander
33d102d674
ENHANCEMENT: Piston in php-peg library
2011-02-14 14:58:57 +13:00
Ingo Schommer
d7a7fb325c
BUGFIX More common defaults for en_US.xml used by Zend_DateFormat (and DateField/DatetimeField), with less error prone numerical format replacing the Zend default of shortened month names ( fixes #6071 , thanks dalesaurus)
...
BUGFIX Correct locale mapping in DateField_View_JQuery for "en_US" and "en_NZ"
MINOR Fixed form validation message in DateField to include actual date format, rather than a hardcoded value
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@111843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:55 +13:00
Sam Minnee
96294391e0
MINOR: Fix links etc, and remove www. from SS urls
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@109105 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:46 +13:00
Ingo Schommer
3c7cd295a7
MINOR Added behaviour.js README (moved from http://doc.silverstripe.org/javascript )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104114 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:20 +13:00
Ingo Schommer
97b40fbca6
MINOR Removed unnecessary sapphire/thirdparty/.gitignore, as the directory doesnt contain svn:externals any longer ( fixes #5334 )
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@102071 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:19:11 +13:00
Ingo Schommer
2dffb95e83
MINOR Using Behaviour.register instead of jquery.livequery in TabSet.php/tabstrip.js (already replaced with jQuery.entwine in next release, we try to reduce the dependencies to jquery plugins)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100885 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:55 +13:00
Ingo Schommer
3705809ce6
BUGFIX Fixed jQuery.ondemand.js script to work with prototype.js (will probably need to be merged back to trunk for legacy purposes)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100853 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:55 +13:00
Ingo Schommer
c53e76e6bf
ENHANCEMENT Only defining document.getElementsByClassName() in prototype.js if no native implementation exists (which speeds up the CMS). Ported from 'jquery13' module, thanks Hamish
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100849 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:54 +13:00
Ingo Schommer
b33c37c745
BUGFIX Fixed variable declaration order in tabstrip.js (necessary due to changed jquery.livequery behaviour
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100848 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:54 +13:00
Ingo Schommer
a61f4ed475
ENHANCEMENT Updated jquery.livequery from v1.0.2 to v1.1.1 (located in sapphire/thirdparty/jquery-livequery/
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100847 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:54 +13:00
Ingo Schommer
ac8e75b2a6
ENHANCEMENT Updated jquery.metadata from ~v.1.0 to v2.1 (located in sapphire/thirdparty/jquery-metadata
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100846 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:54 +13:00
Ingo Schommer
d494c1eec5
ENHANCEMENT Updated jQuery.form library from v2.08 to v2.40 (located in sapphire/thirdparty/jquery-form
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100845 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:54 +13:00
Ingo Schommer
9847032914
ENHANCEMENT Updated jQuery library from v1.2.6 to v1.4.2 (located in sapphire/thirdparty/jquery/
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100844 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:54 +13:00
Ingo Schommer
fef8ea6edc
MINOR Added jQuery UI license files
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:54 +13:00
Ingo Schommer
26b52dd772
API CHANGE Upgraded jQuery UI from v1.6rc1 (r687) to v1.8rc3. This release prefixes all *.js and *.css files with 'jquery', so ui.core.js is now called jquery.ui.core.js.
...
API CHANGE Upgraded jQuery UI themes from v1.6rc1 to v1.8rc3. Removed 'flora' and 'default' themes, replaced with the 'base' and 'smoothness' themes found in the default distribution
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100842 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:53 +13:00
Normann Lou
138e8c5df4
BUGFIX: add 'var' to local variable 'constructor' inside of function definition which break IE8 (8.0.6001.18702 +)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100519 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:48 +13:00
Sam Minnee
41f6774002
BUGFIX #2022 : Fixed CMS dropdowns in Opera.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99960 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:43 +13:00
Ingo Schommer
a0eb199eee
MINOR Reverted r99843 - we're not modifying thirdparty dependencies
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99957 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:43 +13:00
Andrew O'Neil
d2f4b6e071
BUGFIX: Respect SilverStripe's cache folder
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99843 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:42 +13:00
Sam Minnee
ed7b0c4a8c
BUGFIX: Fixed bug in r99552
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@99613 467b73ca-7a2a-4603-9d3b-597d59a354a9
2011-02-02 14:18:39 +13:00