mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
67,196 Commits 36 Branches 519 Tags
Commit Graph

67196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederic Massart
42e7766789 MDL-43968 editor_atto: Copying latest TinyMCE icons to core pix/e 2014-03-26 09:59:36 +08:00
Frederic Massart
60a051d471 MDL-44064 editor_atto: Do not die when a plugin is missing 2014-03-26 09:59:36 +08:00
Damyon Wiese
34f5867a11 MDL-43990 Atto: Add a function for changing the formatting of the selected block. 2014-03-26 09:59:36 +08:00
Damyon Wiese
0fa78b80b4 MDL-43861 Atto: Fix for toolbar menu repaint bug in chrome. 2014-03-26 09:59:36 +08:00
Rossiani Wijaya
534cf7b730 MDL-43861: Atto Plugins: create new plugin for font and background colors 2014-03-26 09:59:36 +08:00
Damyon Wiese
0012a94601 MDL-44003 Atto: Set type="button" on atto toolbar buttons. 
To prevent them accidentally becoming the default submit buttons for the form.
 2014-03-26 09:59:36 +08:00
Frederic Massart
d19cf39edb MDL-44003 editor_atto: Identify the submit buttons in plugins 2014-03-26 09:59:36 +08:00
Frederic Massart
6e3220c053 MDL-43862 atto_managefiles: New plugin to manage files 
AMOS BEGIN
 CPY [hasmissingfiles,tinymce_managefiles],[hasmissingfiles,atto_managefiles]
 CPY [deleteselected,tinymce_managefiles],[deleteselected,atto_managefiles]
 CPY [unusedfilesdesc,tinymce_managefiles],[unusedfilesdesc,atto_managefiles]
 CPY [unusedfilesheader,tinymce_managefiles],[unusedfilesheader,atto_managefiles]
AMOS END
 2014-03-26 09:59:35 +08:00
Frederic Massart
224a9a51ad MDL-43859 atto_smiley: New plugin to insert smileys 2014-03-26 09:59:35 +08:00
Damyon Wiese
0ec6a46ad1 MDL-43869 Atto: Fix broken repositories. 
The previous change on this issue accidentally fixed a selector,
so the repository API was recieving a valid node instead of null.
This means that it calls it's undocumented and dodgy callbacks on the node,
which are really calls directly to the TinyMCE API (just well buried).

But - by not setting the editor_target property, the api will not do
the secret handshakes.
 2014-03-26 09:59:35 +08:00
Frederic Massart
c7829b26e1 MDL-43858 atto_charmap: New plugin to insert special characters 2014-03-26 09:59:35 +08:00
Damyon Wiese
48bdf86f31 MDL-43869 Atto: Add functions to get the nodes from the elementids. 
If plugins try and do this themselves with Y.one, they will fall foul of the
qtype essay page bug which uses : in the id for form elements.

This is an alternative solution, to escaping the ids, which seemed unreliable for older
version of ie.
 2014-03-26 09:59:35 +08:00
Frederic Massart
45698f7714 MDL-43950 editor_atto: Add arguments to plugin callback params_for_js 2014-03-26 09:59:35 +08:00
Damyon Wiese
d088a835d1 MDL-43857: Auto clean tag bloat from word/openoffice/googledocs 
The cleanup rules are pulled from both testing of live docs, and the
jquery clean plugin. I tested with googledocs, libreoffice, word 2003
and word 2013.
 2014-03-26 09:59:35 +08:00
Damyon Wiese
b269f635f6 MDL-43869 Atto: id escaping so Atto works with when there is : in the id. 
(Quiz)
Also includes fixes for Atto when the repositories should not be displayed.
 2014-03-26 09:59:34 +08:00
Damyon Wiese
55c0403c6c MDL-43853 Atto: Performance. Turbocharge the loader. 
Rewrite the atto plugin loader so that:

A) We have a real settings.php page and can edit the toolbar.
B) All plugins are loaded at the same time (not serially)
C) All plugins share the YUI sandbox (more performance boost).

I had to change the loading API for this - but there are not non-core uses yet,
this is the best time to break it.
 2014-03-26 09:59:34 +08:00
Damyon Wiese
f1e6953b36 MDL-43842 Atto: Remove licence and README.txt 2014-03-26 09:59:34 +08:00
Damyon Wiese
3df7cfc59a MDL-43842 Atto: Move pix-icons into core pix folder. 2014-03-26 09:59:34 +08:00
Damyon Wiese
adca7326d8 MDL-43842: Import atto back into core 2014-03-26 09:59:34 +08:00
Sam Hemelryk
46c627cf05 Merge branch 'MDL-44690-master' of git://github.com/jamiepratt/moodle 2014-03-26 13:25:51 +13:00
Sam Hemelryk
bfb6e97eae Merge branch 'MDL-43784-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/classes/plugin_manager.php
	lib/db/upgrade.php
 2014-03-26 11:33:47 +13:00
Sam Hemelryk
dcb43ad7ff Merge branch 'MDL-44364-master-more' of git://github.com/FMCorz/moodle 2014-03-26 11:18:07 +13:00
Dan Poltawski
1696ee8050 Merge branch 'wip-MDL-44686-master' of git://github.com/marinaglancy/moodle 2014-03-26 05:15:50 +08:00
Eloy Lafuente (stronk7)
eb4606aeb0 Merge branch 'wip-MDL-41285-master' of git://github.com/marinaglancy/moodle 2014-03-25 21:53:38 +01:00
Eloy Lafuente (stronk7)
767a5a08d9 Merge branch 'MDL-37418_master' of git://github.com/ds125v/moodle 2014-03-25 21:37:26 +01:00
Eloy Lafuente (stronk7)
c56e0192ef Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle 2014-03-25 21:03:44 +01:00
Marina Glancy
66113ef0ef Merge branch 'wip-mdl-43681' of git://github.com/rajeshtaneja/moodle 2014-03-25 18:08:40 +08:00
Marina Glancy
daf7b64ef7 Merge branch 'w13_MDL-44107_m27_canview' of git://github.com/skodak/moodle 2014-03-25 17:10:27 +08:00
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Rajesh Taneja
c865dacccc MDL-43681 report_log: check related user before displaying 
Related user id can be noreply user which is not in
database.
 2014-03-25 16:50:13 +08:00
Marina Glancy
0029497ca5 Merge branch 'w13_MDL-44732_m27_clitask' of git://github.com/skodak/moodle 2014-03-25 16:49:14 +08:00
Marina Glancy
da1a0bc3a9 Merge branch 'MDL-44597-master' of git://github.com/andrewnicols/moodle 2014-03-25 16:49:01 +08:00
Marina Glancy
e34003004e MDL-42588 scorm: revert accidental change of variable module back to plugin 2014-03-25 16:43:24 +08:00
Marina Glancy
d43556a63f Merge branch 'mdl44573-master' of git://github.com/tlock/moodle 2014-03-25 16:20:37 +08:00
Marina Glancy
c5ff2a76e1 Merge branch 'MDL-42575-master' of git://github.com/jethac/moodle 2014-03-25 16:19:33 +08:00
Marina Glancy
e9e3431ad9 Merge branch 'MDL-40915-master' of git://github.com/ankitagarwal/moodle 2014-03-25 16:18:28 +08:00
Jetha Chan
197407cabe MDL-42588 mod_scorm: display activity name 
Added option to display or hide activity name on SCORM player.
 2014-03-25 16:17:00 +08:00
James Pratt
49dda8fe6e MDL-44690 core_questions : amending unit tests 
to use more human friendly format for submitted question type data.
 2014-03-25 14:37:51 +07:00
Petr Škoda
9e00d46b9c MDL-44510 add extra PEAR PHPUnit info to upgrade.txt 2014-03-25 15:22:22 +08:00
Petr Škoda
15f009e1a2 MDL-44107 add debugging to deprecated event::can_view() 2014-03-25 14:53:17 +08:00
Marina Glancy
2bcb6dbeb0 Merge branch 'MDL-44665' of git://github.com/timhunt/moodle 2014-03-25 14:28:55 +08:00
Marina Glancy
3f4a4daa03 Merge branch 'MDL-44704_master' of git://github.com/markn86/moodle 2014-03-25 14:28:10 +08:00
Marina Glancy
390f3c6ade Merge branch 'MDL-44682' of git://github.com/timhunt/moodle 2014-03-25 14:27:42 +08:00
Marina Glancy
dd043de942 Merge branch 'w13_MDL-44106_m27_requestorig' of git://github.com/skodak/moodle 2014-03-25 14:15:19 +08:00
Marina Glancy
19b4e34941 Merge branch 'w13_MDL-41284_m27_stats' of git://github.com/skodak/moodle 2014-03-25 14:06:41 +08:00
Marina Glancy
f316de8a7f MDL-44316 core_tag: correction to the default value 2014-03-25 14:05:06 +08:00
Marina Glancy
81e50a3661 Merge branch 'MDL-44316_master' of git://github.com/markn86/moodle 2014-03-25 14:03:06 +08:00
Sam Hemelryk
f94bde7250 Merge branch 'w13_MDL-44368_m27_actfilter' of https://github.com/skodak/moodle 2014-03-25 16:23:10 +13:00
Sam Hemelryk
11862768ce Merge branch 'wip-MDL-40059-master' of git://github.com/marinaglancy/moodle 2014-03-25 16:11:10 +13:00
Sam Hemelryk
027d10d67f Merge branch 'MDL-44075-master-v3' of git://github.com/jamiepratt/moodle 2014-03-25 15:06:44 +13:00