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