Eloy Lafuente (stronk7) [Tue, 14 Aug 2012 20:45:06 +0000 (22:45 +0200)]
Merge branch 'MDL-34783-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Tue, 14 Aug 2012 07:48:19 +0000 (15:48 +0800)]
Merge branch 'master_MDL-34382_add_new_option_to_flag_modules_that_support_plagiarism_plugins' of git://github.com/kanikagoyal/moodle
Dan Poltawski [Tue, 14 Aug 2012 07:31:52 +0000 (15:31 +0800)]
MDL-34741 yui - version bump for 2in3 and upgrade.txt note
Dan Poltawski [Tue, 14 Aug 2012 07:33:10 +0000 (15:33 +0800)]
Merge branch 'w33_MDL-34741_m24_yui2in3' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 14 Aug 2012 07:29:42 +0000 (15:29 +0800)]
Merge branch 'wip-MDL-34748-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Tue, 14 Aug 2012 06:34:19 +0000 (14:34 +0800)]
Merge branch 'MDL-34563_accessibility' of git://github.com/rwijaya/moodle
Rossiani Wijaya [Tue, 14 Aug 2012 05:59:45 +0000 (13:59 +0800)]
MDL-34563 - change plural strings and removed colon for accesshide label
Aparup Banerjee [Tue, 14 Aug 2012 05:53:19 +0000 (13:53 +0800)]
Merge branch 'MDL-34565_accessibility' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 14 Aug 2012 05:28:49 +0000 (13:28 +0800)]
Merge branch 'MDL-34728' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 14 Aug 2012 05:25:25 +0000 (13:25 +0800)]
Merge branch 'MDL-34793' of git://github.com/merrill-oakland/moodle
Eric Merrill [Wed, 8 Aug 2012 18:27:19 +0000 (14:27 -0400)]
MDL-34793 mod_assign Fix rendering error that causes student view to break in some cases.
When feedback is switched on for a assignment, and the teacher enters a grade through the gradebook, the student
view would become broken, throwing a coding error. Added check that $status->grade is not empty before passing
to assign_feedback_XXX::is_empty(), as that function expects an object.
Dan Poltawski [Tue, 14 Aug 2012 04:07:59 +0000 (12:07 +0800)]
Merge branch 'MDL-34807' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 14 Aug 2012 03:58:05 +0000 (11:58 +0800)]
Merge branch 'w33_MDL-33041_m24_tinymceplugins' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 14 Aug 2012 02:55:49 +0000 (10:55 +0800)]
Merge branch 'MDL-32344_master' of git://github.com/dmonllao/moodle
David Monllao [Wed, 8 Aug 2012 07:34:37 +0000 (15:34 +0800)]
MDL-32344 blog Replacing tables for div containers
Petr Škoda [Mon, 13 Aug 2012 12:13:46 +0000 (14:13 +0200)]
MDL-33041 fix tabs in all tinymce files except those we update from upstream
The moodleimage plugin is a fork of standard advimage plugin,
the spellchecker is a fork of https://github.com/tinymce/tinymce_spellchecker_php.
Petr Škoda [Mon, 13 Aug 2012 12:02:23 +0000 (14:02 +0200)]
MDL-33041 improve our tinymce plugin loader docs
Tim Hunt [Thu, 9 Aug 2012 12:48:56 +0000 (13:48 +0100)]
MDL-34807 question bank: navigation loses place.
The symptom is that where we are now is not shown in the settings
navigation. However, the underlying cause is that question/edit.php is
doing some crazy thing of its own to build $PAGE->url, rather than using
the one returned by question_edit_setup.
Not that this patch itentionally removes the returnurl param. It was
added as part of a big change MDL-20276, which I think just got this
detail wrong. That variable is never used.
Tim Hunt [Tue, 7 Aug 2012 11:57:51 +0000 (12:57 +0100)]
MDL-34728 forms: woy for other JS to trigger disableIf update.
This was discovered while working on MDL-32705. If some JavaScript (for
example a select all/none link) changes the state of some form fields,
then the disabledIf state of other form elements does not automatically
update.
The existing form JS was so well encapsulated that this was impossible.
This change pokes a hole in the encapsulation, and provides an API
M.form.updateFormState(formid);
that other bits of JS code can call when necessary.
Rossiani Wijaya [Fri, 27 Jul 2012 10:14:26 +0000 (18:14 +0800)]
MDL-34563 accessibility compliance for data module: Add forform input text and select tag
Rossiani Wijaya [Tue, 7 Aug 2012 07:31:34 +0000 (15:31 +0800)]
MDL-34565: change to plural strings
Rossiani Wijaya [Fri, 27 Jul 2012 10:14:50 +0000 (18:14 +0800)]
MDL-34565 accessibility compliance for forum module: Add forform input text and select tag
Kanika Goyal [Mon, 13 Aug 2012 05:32:34 +0000 (11:02 +0530)]
MDL-34382: Plagiarism API - add new option to flag modules that support the use of plagiarism plugins
Dan Poltawski [Mon, 13 Aug 2012 04:30:48 +0000 (12:30 +0800)]
Merge branch 'MDL-34820' of git://github.com/lazydaisy/moodle
Marina Glancy [Mon, 13 Aug 2012 03:54:54 +0000 (11:54 +0800)]
MDL-34748 repository_filesystem: Sort files by title by default
Aparup Banerjee [Mon, 13 Aug 2012 03:03:43 +0000 (11:03 +0800)]
Merge branch 'w33_MDL-34851_m24_enrolledsince' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 13 Aug 2012 03:02:43 +0000 (11:02 +0800)]
Merge branch 'w33_MDL-34852_m24_enroledit' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 13 Aug 2012 02:44:11 +0000 (10:44 +0800)]
Merge branch 'MDL-34446-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 13 Aug 2012 02:33:09 +0000 (10:33 +0800)]
Merge branch 'MDL-34376' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 13 Aug 2012 02:20:19 +0000 (10:20 +0800)]
Merge branch 'MDL-34835_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Mon, 13 Aug 2012 02:16:03 +0000 (10:16 +0800)]
Merge branch 'MDL-34337-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Mon, 13 Aug 2012 02:10:15 +0000 (10:10 +0800)]
Merge branch 'MDL-34336-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 13 Aug 2012 02:03:33 +0000 (10:03 +0800)]
Merge branch 'MDL-34543' of git://github.com/merrill-oakland/moodle
Petr Škoda [Sun, 12 Aug 2012 12:00:22 +0000 (14:00 +0200)]
MDL-34851 show enrolment date if there is no start and end of active enrolment
This should help when enrol plugin does not set any start or end of enrolment validity.
Petr Škoda [Sun, 12 Aug 2012 12:25:18 +0000 (14:25 +0200)]
MDL-33734 remove unused session code
Credit goes to Davo Smith, thanks!
Petr Škoda [Sun, 12 Aug 2012 12:15:09 +0000 (14:15 +0200)]
MDL-34852 allow editing of manual/self enrolments times and show time enrolled
Petr Škoda [Sun, 12 Aug 2012 09:41:53 +0000 (11:41 +0200)]
MDL-34741 improve inline docs
Petr Škoda [Sun, 12 Aug 2012 09:41:25 +0000 (11:41 +0200)]
MDL-34741 remove deprecated M.yui.loader
Petr Škoda [Mon, 6 Aug 2012 21:10:08 +0000 (23:10 +0200)]
MDL-34741 use 2in3 in mod_survey
Petr Škoda [Mon, 6 Aug 2012 20:50:23 +0000 (22:50 +0200)]
MDL-34741 use 2in3 in mod_chat
Petr Škoda [Mon, 6 Aug 2012 20:48:32 +0000 (22:48 +0200)]
MDL-34741 use 2in3 in static JS
Petr Škoda [Mon, 6 Aug 2012 20:45:20 +0000 (22:45 +0200)]
MDL-34741 remove unused legacy course files code
Petr Škoda [Mon, 6 Aug 2012 20:38:10 +0000 (22:38 +0200)]
MDL-34741 use 2in3 in comments
Petr Škoda [Mon, 6 Aug 2012 20:34:54 +0000 (22:34 +0200)]
MDL-34741 remove old unused restore JS code
Petr Škoda [Mon, 6 Aug 2012 20:24:43 +0000 (22:24 +0200)]
MDL-34741 use 2in3 in mod_quiz
Petr Škoda [Mon, 6 Aug 2012 19:51:11 +0000 (21:51 +0200)]
MDL-34741 use 2in3 in question bank
Petr Škoda [Mon, 6 Aug 2012 19:23:01 +0000 (21:23 +0200)]
MDL-34741 use 2in3 in portfolio download
Petr Škoda [Mon, 6 Aug 2012 19:20:50 +0000 (21:20 +0200)]
MDL-34741 use 2in3 in report_completion
Petr Škoda [Mon, 6 Aug 2012 19:20:40 +0000 (21:20 +0200)]
MDL-34741 use 2in3 in report_progress
Petr Škoda [Mon, 6 Aug 2012 19:07:58 +0000 (21:07 +0200)]
MDL-34741 use 2in3 in tags
Petr Škoda [Mon, 6 Aug 2012 17:43:09 +0000 (19:43 +0200)]
MDL-34741 use 2in3 in forms
Petr Škoda [Mon, 6 Aug 2012 17:02:55 +0000 (19:02 +0200)]
MDL-34741 use 2in3 in groups UI
Petr Škoda [Mon, 6 Aug 2012 16:55:21 +0000 (18:55 +0200)]
MDL-34741 use 2in3 in gradebook
Petr Škoda [Mon, 6 Aug 2012 17:07:20 +0000 (19:07 +0200)]
MDL-34741 use 2in3 in mod_scorm
Petr Škoda [Mon, 6 Aug 2012 11:58:35 +0000 (13:58 +0200)]
MDL-34741 use 2in3 in mod_forum
Petr Škoda [Mon, 6 Aug 2012 11:52:39 +0000 (13:52 +0200)]
MDL-34741 use 2in3 in mod_lti
Petr Škoda [Sun, 5 Aug 2012 22:01:28 +0000 (00:01 +0200)]
MDL-34741 use 2in3 in mod_assign
Petr Škoda [Sun, 5 Aug 2012 22:00:34 +0000 (00:00 +0200)]
MDL-34741 use 2in3 in mod_assignment
Petr Škoda [Sun, 5 Aug 2012 21:55:08 +0000 (23:55 +0200)]
MDL-34741 use 2in3 in mod_wiki
Petr Škoda [Sun, 5 Aug 2012 21:49:28 +0000 (23:49 +0200)]
MDL-34741 use 2in3 in some user TreeView
Petr Škoda [Sun, 5 Aug 2012 21:46:20 +0000 (23:46 +0200)]
MDL-34741 use 2in3 in mod_imscp
Petr Škoda [Sun, 5 Aug 2012 19:37:54 +0000 (21:37 +0200)]
MDL-34741 use 2in3 in date selector form element
Petr Škoda [Sun, 5 Aug 2012 19:37:40 +0000 (21:37 +0200)]
MDL-34741 use 2in3 in file picker
Petr Škoda [Sun, 5 Aug 2012 19:31:00 +0000 (21:31 +0200)]
MDL-34741 use 2in3 in private files block
Petr Škoda [Sun, 5 Aug 2012 19:30:45 +0000 (21:30 +0200)]
MDL-34741 use 2in3 in mod_folder
Petr Škoda [Mon, 6 Aug 2012 08:21:37 +0000 (10:21 +0200)]
MDL-34741 use proper default YUI_config
Petr Škoda [Sun, 5 Aug 2012 19:30:18 +0000 (21:30 +0200)]
MDL-34714 switch to YUI 2in3
Petr Škoda [Sat, 11 Aug 2012 14:29:35 +0000 (16:29 +0200)]
MDL-33041 send only valid plugin strings to TinyMCE instances
Petr Škoda [Sat, 11 Aug 2012 14:19:37 +0000 (16:19 +0200)]
MDL-33041 cleanup the rest of tinymce plugin
Petr Škoda [Sat, 11 Aug 2012 13:55:43 +0000 (15:55 +0200)]
MDL-33041 cleanup spellchecker plugin
Petr Škoda [Sat, 11 Aug 2012 13:27:21 +0000 (15:27 +0200)]
MDL-33041 cleanup moodlenolink plugin
AMOS BEGIN
MOV [desc,tinymce_moodlenolink],[moodlenolink:desc,tinymce_moodlenolink]
AMOS END
Petr Škoda [Sat, 11 Aug 2012 13:18:04 +0000 (15:18 +0200)]
MDL-33041 cleanup moodlemedia plugin
Petr Škoda [Sat, 11 Aug 2012 09:48:01 +0000 (11:48 +0200)]
MDL-33041 cleanup moodleimage plugin
Petr Škoda [Sat, 11 Aug 2012 09:36:14 +0000 (11:36 +0200)]
MDL-33041 use standard action buttons in dragmath plugin
Petr Škoda [Sat, 11 Aug 2012 09:18:19 +0000 (11:18 +0200)]
MDL-33041 cleanup moodleemoticon plugin
AMOS BEGIN
MOV [desc,tinymce_moodleemoticon],[moodleemoticon:desc,tinymce_moodleemoticon]
AMOS END
Petr Škoda [Fri, 10 Aug 2012 17:18:33 +0000 (19:18 +0200)]
MDL-33041 cleanup dragmath plugin
AMOS BEGIN
MOV [dragmath_desc,tinymce_dragmath],[dragmath:desc,tinymce_dragmath]
MOV [dragmath_title,tinymce_dragmath],[title,tinymce_dragmath]
MOV [dragmath_javaneeded,tinymce_dragmath],[javaneeded,tinymce_dragmath]
AMOS END
Petr Škoda [Fri, 10 Aug 2012 17:07:51 +0000 (19:07 +0200)]
MDL-33041 add base TinyMCE and moodle plugin urls
We should never use ../../../.. to reference core TinyMCE or moodle TinyMCE plugins, this crate problems if we ever decide to create improved loaders.
Petr Škoda [Fri, 10 Aug 2012 17:01:01 +0000 (19:01 +0200)]
MDL-33041 always use only local media in moodle tinymce plugins
Unfortunately we can not post-process the css in out moodle tinymce plugins, that is why we need to keep the urls local.
Petr Škoda [Fri, 10 Aug 2012 15:49:35 +0000 (17:49 +0200)]
MDL-33041 import TinyMCE 3.6.0
This contains only string handling changes - finally!
Petr Škoda [Fri, 10 Aug 2012 15:09:08 +0000 (17:09 +0200)]
MDL-33041 remove another ugly TinyMCE forms hack
Petr Škoda [Fri, 10 Aug 2012 14:44:30 +0000 (16:44 +0200)]
MDL-33041 mark new TinyMCE subplugins as standard plugins
Petr Škoda [Fri, 10 Aug 2012 14:43:56 +0000 (16:43 +0200)]
MDL-33041 eliminate core TinyMCE moodlemedia hack
Petr Škoda [Fri, 10 Aug 2012 14:41:25 +0000 (16:41 +0200)]
MDL-33041 fork advimage plugin
We need to minimise TinyMCE tweaks, the advimage hacking was too big to maintain it during upstream imports, sorry.
Mary Evans [Fri, 10 Aug 2012 19:21:36 +0000 (20:21 +0100)]
MDL-34835 theme_fusion: fixed displaced navbar by extending #region-header.inside bottom margin by 70px in style/pagelayout.css
Petr Škoda [Fri, 10 Aug 2012 14:38:54 +0000 (16:38 +0200)]
MDL-33041 add missing spellchecker lang file and version info
sam marshall [Thu, 9 Aug 2012 15:58:11 +0000 (16:58 +0100)]
MDL-33041 (5) TinyMCE: Move spellchecker plugin as well
sam marshall [Wed, 16 May 2012 16:22:51 +0000 (17:22 +0100)]
MDL-33041 (4) Use new system for existing added TinyMCE plugins
AMOS BEGIN
MOV [dragmath:dragmath_desc,editor_tinymce],[dragmath_desc,tinymce_dragmath]
MOV [dragmath:dragmath_javaneeded,editor_tinymce],[dragmath_javaneeded,tinymce_dragmath]
MOV [dragmath:dragmath_title,editor_tinymce],[dragmath_title,tinymce_dragmath]
MOV [moodleemoticon:desc,editor_tinymce],[desc,tinymce_moodleemoticon]
MOV [moodlenolink:desc,editor_tinymce],[desc,tinymce_moodlenolink]
CPY [desc,tinymce_moodleemoticon],[pluginname,tinymce_moodleemoticon]
CPY [desc,tinymce_moodlenolink],[pluginname,tinymce_moodlenolink]
AMOS END
sam marshall [Wed, 16 May 2012 16:21:08 +0000 (17:21 +0100)]
MDL-33041 (3) TinyMCE: Support custom plugins
sam marshall [Wed, 16 May 2012 13:30:11 +0000 (14:30 +0100)]
MDL-33041 (2) Tidy up tinymce lib.php before starting real changes
sam marshall [Thu, 17 May 2012 16:13:26 +0000 (17:13 +0100)]
MDL-33041 (1) Add subplugin support for 'editor' plugins
sam marshall [Fri, 10 Aug 2012 11:36:17 +0000 (12:36 +0100)]
MDL-34446 Completion report: Add sideways text support to more browsers
Ankit Agarwal [Mon, 30 Jul 2012 06:03:14 +0000 (14:03 +0800)]
MDL-34336 scorm: Updating export of interaction reports as csv, to use new csv exporter class
Ankit Agarwal [Mon, 30 Jul 2012 03:43:10 +0000 (11:43 +0800)]
MDL-34337 scorm: Updating export of basic reports as csv, to use new csv exporter class
Mary Evans [Fri, 10 Aug 2012 01:23:31 +0000 (02:23 +0100)]
MDL-34820 theme_afterburner: adjusted value in style/pagelayout.css for.side-pre-only #region-pre-box
David Monllao [Tue, 24 Jul 2012 01:34:08 +0000 (09:34 +0800)]
MDL-32344 blog Adding a renderer to manage entries output
Mary Evans [Thu, 9 Aug 2012 23:54:06 +0000 (00:54 +0100)]
MDL-34820 theme_afterburner: adjusted style/pagelayout.css to add 2% to width in .side-pre-only #region-main
Eloy Lafuente (stronk7) [Thu, 9 Aug 2012 18:52:43 +0000 (20:52 +0200)]
weekly release 2.4dev
Eloy Lafuente (stronk7) [Thu, 9 Aug 2012 18:45:45 +0000 (20:45 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Tim Hunt [Thu, 9 Aug 2012 11:52:11 +0000 (12:52 +0100)]
MDL-34590 javascript-static: nuclear option in openpopup
I think we have finally tamed Chrome on all platforms. (Crosses fingers.)
Sam Hemelryk [Thu, 9 Aug 2012 01:23:18 +0000 (13:23 +1200)]
Merge branch 'MDL-34471-master' of git://github.com/ankitagarwal/moodle