Commit graph

1503 commits

Author SHA1 Message Date
Damyon Wiese
adca7326d8 MDL-43842: Import atto back into core 2014-03-26 09:59:34 +08:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
Dan Poltawski
7de1b42f55 Merge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle 2014-01-08 14:32:57 +08:00
Marina Glancy
c6cd067f14 MDL-43606 tinymce_managefiles: bump version
to allow smooth upgrade from contributed plugin in 2.5
2014-01-08 13:58:41 +08:00
Petr Škoda
f540cfe99e MDL-43196 do not load file management for guests and when not managing files 2013-12-27 11:11:55 +08:00
Eloy Lafuente (stronk7)
ebc77165a4 Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle 2013-12-10 23:29:06 +01:00
Damyon Wiese
519449c528 MDL-42625 TinyMCE: Hook into API to track the progress of the init script 2013-12-06 13:10:24 +08:00
David Monllao
d1e55a47be MDL-42625 behat: Step definitions + related changes in features
In general aiming for compatibility with multiple browsers,
firefox, chrome and phantomjs to be more specific.

* Removing hardcoded waits
* Adding @_alert, @_switch_window and @_switch_frame tags,
  to label actions that different drivers have problems with.
* Adding missing @_files_upload and @_only_local tags to features that
  uploads files.
* Fixing a few wait for page ready what specified miliseconds.
* New methods to ensure elements (usual selectors), sections and editors
  are ready to interact with
* Changing the select an option implementation to deal with the different
  drivers implementations when listening to JS events.
2013-12-06 13:10:24 +08:00
Marina Glancy
f1d7254954 MDL-43150 tinymce_managefiles: fixed unattractive background 2013-12-02 12:01:27 +11:00
Damyon Wiese
18962add08 Merge branch 'wip-MDL-40850-master' of git://github.com/marinaglancy/moodle 2013-11-26 09:29:44 +08:00
Marina Glancy
1f897a72f3 MDL-40850 editor: Manage files popup correctly sets the course/cm context 2013-11-21 11:55:20 +11:00
Damyon Wiese
b170380a8e MDL-42930 Release upgrade line: Fix ordering for tinymce 2013-11-20 11:47:35 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Damyon Wiese
d8383b247e MDL-42887 Forms: Collapse all field elements below their labels on screens less than 1180px
Includes css fixes to make the question type edit screens look OK with this change.
2013-11-15 13:40:27 +08:00
Jason Fowler
0b11609944 MDL-42684 TinyMCE: Correct widths on screens with narrow fieldsets 2013-11-12 14:10:01 +08:00
Jason Fowler
d37ec4b6a7 MDL-42684 TinyMCE: Including details of patch in moodle-readme.txt 2013-11-08 12:57:46 +08:00
Jason Fowler
762a29690e MDL-42684 TinyMCE: make tinymce start at full width 2013-11-08 12:57:46 +08:00
Jason Fowler
46f763ed4a MDL-42660 TinyMCE: Ensure upgrade is only performed when possible
Conflicts:

	lib/editor/tinymce/db/upgrade.php
2013-11-08 09:49:02 +08:00
Jason Fowler
2106d4b351 MDL-42660 TinyMCE: Shuffle icons in default toolbar layout 2013-11-07 12:15:11 +08:00
Jason Fowler
525d094a47 MDL-42660 Filepicker: Fix padding etc on filepicker/manager toolbars
Conflicts:

	theme/bootstrapbase/style/moodle.css
2013-11-07 12:15:11 +08:00
Jason Fowler
f897dbcb24 MDL-42660 TinyMCE: Fix padding etc to make TinyMCE work better on small screens 2013-11-07 12:15:11 +08:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Damyon Wiese
a123eb58b1 MDL-42102 TinyMCE: Toolbar wrapping < 480px.
Prevent wrap plugin from wrapping toolbars shorter than 5 buttons.
2013-11-01 10:08:52 +08:00
Marina Glancy
bbb430bf5e Merge branch 'MDL-41624' of git://github.com/jmvedrine/moodle 2013-11-01 08:59:31 +08:00
Dan Poltawski
b674a3f6f2 MDL-42102 ie9 SVG fixes 2013-11-01 08:59:31 +08:00
Dan Poltawski
e394484179 Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
2013-11-01 08:59:27 +08:00
Barbara Ramiro
ca4e42cfa3 MDL-42102 TinyMCE: Update icons 2013-11-01 08:57:41 +08:00
Andrew Nicols
6492c72ac4 MDL-42012 TinyMCE: Remove black background on foreground color picker 2013-11-01 08:57:40 +08:00
Jason Fowler
4c86dd513a MDL-42102 TinyMCE: Fixing dropdown positioning 2013-11-01 08:57:39 +08:00
Barbara Ramiro
6ce5fd3556 MDL-42102 TinyMCE: Correct additional icons 2013-11-01 08:55:30 +08:00
Barbara Ramiro
dee6073da2 MDL-42102 tinymce: improved icons 2013-11-01 08:55:29 +08:00
Damyon Wiese
575d38d099 ie9 svg compatibility fixes 2013-11-01 08:55:29 +08:00
Jean-Michel Vedrine
6713708261 MDL-41624 DragMath crashes Firefox 2013-10-30 17:55:34 +01:00
Jason Fowler
90792eff8b MDL-42102 TinyMCE - Matching toolbar UI from other areas of Moodle 2013-10-29 16:54:13 +08:00
Barbara Ramiro
5bfa35589e MDL-42102 tinymce: new icons 2013-10-29 16:54:05 +08:00
Dan Poltawski
576abe8f39 Merge branch 'MDL-42407-master' of git://github.com/phalacee/moodle 2013-10-29 15:08:13 +08:00
Jason Fowler
1389bcd7e6 MDL-42407 Filepicker: generate a smarter zIndex for the filepicker 2013-10-29 14:55:46 +08:00
Andrew Nicols
1607ead74d MDL-42481 Editor: Temporarily unhide the editor to calculate its size 2013-10-24 11:11:11 +08:00
Damyon Wiese
775a32c9b8 MDL-42459 Atto: Bye bye - see you in the plugins db! 2013-10-22 12:01:56 +08:00
Petr Škoda
b2858b916a MDL-42148 new overview of 3rd party libraries
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
2013-10-16 14:48:29 +08:00
Damyon Wiese
835a006b07 Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle 2013-10-10 14:04:47 +08:00
Jason Fowler
97b251a352 MDL-42091 Atto - fixing on click indication 2013-10-10 13:47:10 +08:00
Damyon Wiese
80d5b253e2 Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle 2013-10-10 09:11:25 +08:00
Jason Fowler
8bcd5ddeab MDL-42091 atto - fixing on hover and active states of buttons 2013-10-10 09:05:47 +08:00
Damyon Wiese
103ba42d84 MDL-41993 Atto: Always clean/update the textarea when the content is changed 2013-10-09 11:08:06 +08:00
Eloy Lafuente (stronk7)
7e9dadfd99 Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2013-10-09 01:48:45 +02:00
Damyon Wiese
cbe5a022f1 MDL-41993 Atto: Strip yui ids from generated HTML. 2013-10-08 09:32:18 +08:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
2013-10-07 13:10:36 +02:00
Sam Hemelryk
cf8943779e NOBUG: Fixed file access permissions 2013-10-04 15:43:58 +13:00
Sam Hemelryk
322ca2fc66 Merge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2013-10-03 16:03:22 +13:00