moodle.git
7 years agoMerge branch 'w16_MDL-45049_m27_debugging' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 21 Apr 2014 06:41:23 +0000 (14:41 +0800)]
Merge branch 'w16_MDL-45049_m27_debugging' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-45145_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 21 Apr 2014 02:51:38 +0000 (10:51 +0800)]
Merge branch 'MDL-45145_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-45171' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 21 Apr 2014 02:12:34 +0000 (10:12 +0800)]
Merge branch 'MDL-45171' of git://github.com/stronk7/moodle

7 years agoMDL-45171 log reports: fix sql for cross support
Eloy Lafuente (stronk7) [Fri, 18 Apr 2014 15:34:06 +0000 (17:34 +0200)]
MDL-45171 log reports: fix sql for cross support

Rules for cross-db support are:

- Always use the 'AS' keyword for columns.
- Never use the 'AS' keyword for tables/views.

7 years agoMerge branch 'MDL-44468_master' of git://github.com/ds125v/moodle
Dan Poltawski [Fri, 18 Apr 2014 07:27:41 +0000 (15:27 +0800)]
Merge branch 'MDL-44468_master' of git://github.com/ds125v/moodle

7 years agoMerge branch 'MDL-40716_master' of https://github.com/nadavkav/moodle
Dan Poltawski [Fri, 18 Apr 2014 07:12:21 +0000 (15:12 +0800)]
Merge branch 'MDL-40716_master' of https://github.com/nadavkav/moodle

7 years agoMerge branch 'MDL-45010-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 18 Apr 2014 06:54:54 +0000 (14:54 +0800)]
Merge branch 'MDL-45010-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch '45147-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 18 Apr 2014 06:16:23 +0000 (14:16 +0800)]
Merge branch '45147-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle
Dan Poltawski [Fri, 18 Apr 2014 06:07:53 +0000 (14:07 +0800)]
Merge branch 'MDL-44778_atto_border' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-45023-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Fri, 18 Apr 2014 05:47:10 +0000 (13:47 +0800)]
Merge branch 'MDL-45023-master' of git://github.com/jamiepratt/moodle

7 years agoMerge branch 'MDL-45110-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Fri, 18 Apr 2014 04:03:23 +0000 (12:03 +0800)]
Merge branch 'MDL-45110-master' of git://github.com/jamiepratt/moodle

7 years agoMerge branch '45123-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Fri, 18 Apr 2014 03:54:48 +0000 (11:54 +0800)]
Merge branch '45123-27' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Fri, 18 Apr 2014 03:49:39 +0000 (11:49 +0800)]
Merge branch 'MDL-44674-master' of git://github.com/andrewnicols/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js

7 years agoMerge branch 'MDL-44906-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Fri, 18 Apr 2014 03:42:36 +0000 (11:42 +0800)]
Merge branch 'MDL-44906-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-39607-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 18 Apr 2014 03:10:39 +0000 (11:10 +0800)]
Merge branch 'MDL-39607-master' of git://github.com/FMCorz/moodle

7 years agoMDL-43789: coursename disallows spaces in user bulk actions filter
Rajeev S [Wed, 9 Apr 2014 05:15:29 +0000 (10:45 +0530)]
MDL-43789: coursename disallows spaces in user bulk actions filter

Spaces and other non alphanumeric characters are disallowed in
coursename filter for user bulk actions.This prevents filtering
based upon courserole if the coursename contains spaces or other non
alphanumeric characters.

7 years agoMerge branch 'wip-MDL-43626-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:52:45 +0000 (10:52 +0800)]
Merge branch 'wip-MDL-43626-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'wip-MDL-45036-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:50:06 +0000 (10:50 +0800)]
Merge branch 'wip-MDL-45036-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'MDL-45071_master' of https://github.com/markn86/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:47:04 +0000 (10:47 +0800)]
Merge branch 'MDL-45071_master' of https://github.com/markn86/moodle

7 years agoMerge branch 'MDL-45059-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:30:12 +0000 (10:30 +0800)]
Merge branch 'MDL-45059-master' of https://github.com/sammarshallou/moodle

7 years agoMerge branch 'MDL-44990-master' of git://github.com/lameze/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:26:38 +0000 (10:26 +0800)]
Merge branch 'MDL-44990-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'MDL-45027-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:23:45 +0000 (10:23 +0800)]
Merge branch 'MDL-45027-master' of https://github.com/sammarshallou/moodle

Conflicts:
availability/yui/build/moodle-core_availability-form/moodle-core_availability-form-min.js

7 years agoMerge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Fri, 18 Apr 2014 02:05:26 +0000 (10:05 +0800)]
Merge branch 'MDL-41975-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Fri, 18 Apr 2014 01:57:21 +0000 (09:57 +0800)]
Merge branch 'wip-MDL-45154-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-45145 mod_quiz: ensure quiz cmid is set before triggering the 'attempt_deleted...
Mark Nelson [Fri, 18 Apr 2014 01:34:47 +0000 (18:34 -0700)]
MDL-45145 mod_quiz: ensure quiz cmid is set before triggering the 'attempt_deleted' event

7 years agoon-demand release 2.7beta+
Eloy Lafuente (stronk7) [Thu, 17 Apr 2014 13:49:54 +0000 (15:49 +0200)]
on-demand release 2.7beta+

7 years agoMerge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 17 Apr 2014 09:02:04 +0000 (17:02 +0800)]
Merge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-45119-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Thu, 17 Apr 2014 08:17:12 +0000 (16:17 +0800)]
Merge branch 'MDL-45119-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'w16_MDL-45144_m27_booklog' of git://github.com/skodak/moodle
Marina Glancy [Thu, 17 Apr 2014 07:57:03 +0000 (15:57 +0800)]
Merge branch 'w16_MDL-45144_m27_booklog' of git://github.com/skodak/moodle

7 years agoMDL-44990 logging: Capabilites removed from legacy and standard log.
Simey Lameze [Thu, 17 Apr 2014 03:46:25 +0000 (11:46 +0800)]
MDL-44990 logging: Capabilites removed from legacy and standard log.

7 years agoMDL-45144 describe mod_book events changes
Petr Skoda [Thu, 17 Apr 2014 07:33:30 +0000 (15:33 +0800)]
MDL-45144 describe mod_book events changes

7 years agoMerge branch 'MDL-44658' of git://github.com/danielneis/moodle
Marina Glancy [Thu, 17 Apr 2014 07:06:09 +0000 (15:06 +0800)]
Merge branch 'MDL-44658' of git://github.com/danielneis/moodle

7 years agoMDL-41101 assign: Add relateduserid to some events
Damyon Wiese [Thu, 17 Apr 2014 05:25:45 +0000 (13:25 +0800)]
MDL-41101 assign: Add relateduserid to some events

When events are acting on another users submission, it makes
sense to put the submission->userid in the relateduserid field.

7 years agoMDL-39607 theme: Update Moodle logo
Frederic Massart [Thu, 17 Apr 2014 06:33:39 +0000 (14:33 +0800)]
MDL-39607 theme: Update Moodle logo

7 years agoMDL-45144 convert book events to create_from_xxx() helpers
Petr Skoda [Thu, 17 Apr 2014 06:15:27 +0000 (14:15 +0800)]
MDL-45144 convert book events to create_from_xxx() helpers

7 years agoMDL-45154 user profiles: avoid redirection warnings
Marina Glancy [Thu, 17 Apr 2014 06:24:58 +0000 (14:24 +0800)]
MDL-45154 user profiles: avoid redirection warnings

7 years agoMDL-45144 delete duplicated legacy log entries in mod_book
Petr Skoda [Thu, 17 Apr 2014 05:30:30 +0000 (13:30 +0800)]
MDL-45144 delete duplicated legacy log entries in mod_book

The general agreement is we should trigger one event
per simple action.

This partially resolves MDL-39963.

7 years agoMDL-45119 editpdf: Do not load quick comments in read-only mode
Andrew Nicols [Wed, 16 Apr 2014 07:22:54 +0000 (15:22 +0800)]
MDL-45119 editpdf: Do not load quick comments in read-only mode

7 years agoMDL-45119 ajax: Correct use of COUNT in exception dialogue
Andrew Nicols [Wed, 16 Apr 2014 07:12:44 +0000 (15:12 +0800)]
MDL-45119 ajax: Correct use of COUNT in exception dialogue

7 years agoMDL-45119 ajax: AJAX exceptions need a String in the Link
Andrew Nicols [Wed, 16 Apr 2014 07:11:44 +0000 (15:11 +0800)]
MDL-45119 ajax: AJAX exceptions need a String in the Link

7 years agoMDL-45087 report_log: do not show anonymous actions, use indexes
Marina Glancy [Thu, 17 Apr 2014 03:39:18 +0000 (11:39 +0800)]
MDL-45087 report_log: do not show anonymous actions, use indexes

7 years agoMDL-45147 my: automate testing of block restriction
Sam Hemelryk [Thu, 17 Apr 2014 03:16:06 +0000 (15:16 +1200)]
MDL-45147 my: automate testing of block restriction

7 years agoMerge branch 'w16_MDL-41101_m27_assign' of git://github.com/skodak/moodle
Marina Glancy [Thu, 17 Apr 2014 03:20:51 +0000 (11:20 +0800)]
Merge branch 'w16_MDL-41101_m27_assign' of git://github.com/skodak/moodle

7 years agoMerge branch 'wip-mdl-45143' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Thu, 17 Apr 2014 03:04:26 +0000 (11:04 +0800)]
Merge branch 'wip-mdl-45143' of git://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-44621_master' of git://github.com/dmonllao/moodle
Marina Glancy [Thu, 17 Apr 2014 03:04:10 +0000 (11:04 +0800)]
Merge branch 'MDL-44621_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-44618_master' of git://github.com/dmonllao/moodle
Marina Glancy [Thu, 17 Apr 2014 03:03:52 +0000 (11:03 +0800)]
Merge branch 'MDL-44618_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-44617_master' of git://github.com/dmonllao/moodle
Marina Glancy [Thu, 17 Apr 2014 03:03:25 +0000 (11:03 +0800)]
Merge branch 'MDL-44617_master' of git://github.com/dmonllao/moodle

7 years agoMDL-41101 verify contextlevel in all assign events
Petr Skoda [Thu, 17 Apr 2014 03:01:18 +0000 (11:01 +0800)]
MDL-41101 verify contextlevel in all assign events

7 years agoMerge branch 'MDL-44992-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Thu, 17 Apr 2014 03:01:16 +0000 (11:01 +0800)]
Merge branch 'MDL-44992-master' of git://github.com/sammarshallou/moodle

7 years agoMDL-35373 mod_assign: Add a behat test for word count limit.
Damyon Wiese [Thu, 17 Apr 2014 02:27:07 +0000 (10:27 +0800)]
MDL-35373 mod_assign: Add a behat test for word count limit.

7 years agoMDL-41101 use snapshots for submissions and grades in assign events
Petr Škoda [Wed, 16 Apr 2014 15:39:35 +0000 (23:39 +0800)]
MDL-41101 use snapshots for submissions and grades in assign events

7 years agoMDL-35373 mod_assign Add functionality to enforce onlinetext word limit
Tony Butler [Mon, 3 Feb 2014 14:07:39 +0000 (14:07 +0000)]
MDL-35373 mod_assign Add functionality to enforce onlinetext word limit

Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
7 years agoMDL-35373 mod_assign Add form elements for assignsubmission_onlinetext word limit
Tony Butler [Thu, 30 Jan 2014 17:27:56 +0000 (17:27 +0000)]
MDL-35373 mod_assign Add form elements for assignsubmission_onlinetext word limit

Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
7 years agoMDL-41101 move assign property to the assign event base class
Petr Škoda [Wed, 16 Apr 2014 12:20:23 +0000 (20:20 +0800)]
MDL-41101 move assign property to the assign event base class

7 years agoMDL-41101 use record snapshots for user data in assign events
Petr Škoda [Wed, 16 Apr 2014 11:53:52 +0000 (19:53 +0800)]
MDL-41101 use record snapshots for user data in assign events

The problem is that event->get_user() would be very confusing
because it is mostly related user.

7 years agoMDL-41101 tidy up the phpdocs in new assign events
Petr Škoda [Wed, 16 Apr 2014 09:03:35 +0000 (17:03 +0800)]
MDL-41101 tidy up the phpdocs in new assign events

7 years agoMDL-41101 convert assign event triggers to new create_from_xxx helpers
Petr Škoda [Wed, 16 Apr 2014 05:45:07 +0000 (13:45 +0800)]
MDL-41101 convert assign event triggers to new create_from_xxx helpers

7 years agoMDL-41101 mod_assign: replaced 'save grading feedback' add_to_log call with an event
Mark Nelson [Thu, 3 Apr 2014 05:17:38 +0000 (22:17 -0700)]
MDL-41101 mod_assign: replaced 'save grading feedback' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'grade submission' add_to_log call with an event
Mark Nelson [Thu, 3 Apr 2014 04:25:06 +0000 (21:25 -0700)]
MDL-41101 mod_assign: replaced 'grade submission' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view batch set marker allocation' add_to_log call...
Mark Nelson [Fri, 28 Mar 2014 04:16:42 +0000 (21:16 -0700)]
MDL-41101 mod_assign: replaced 'view batch set marker allocation' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view batch set marking workflow state' add_to_log...
Mark Nelson [Fri, 28 Mar 2014 02:16:13 +0000 (19:16 -0700)]
MDL-41101 mod_assign: replaced 'view batch set marking workflow state' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view' add_to_log call for the submission status page...
Mark Nelson [Fri, 28 Mar 2014 00:54:04 +0000 (17:54 -0700)]
MDL-41101 mod_assign: replaced 'view' add_to_log call for the submission status page with an event

7 years agoMDL-41101 mod_assign: replaced 'view confirm submit assignment form' add_to_log call...
Mark Nelson [Thu, 27 Mar 2014 23:50:47 +0000 (16:50 -0700)]
MDL-41101 mod_assign: replaced 'view confirm submit assignment form' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'submission statement accepted' add_to_log call with...
Mark Nelson [Thu, 27 Mar 2014 01:39:56 +0000 (18:39 -0700)]
MDL-41101 mod_assign: replaced 'submission statement accepted' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view' add_to_log call for the reveal identities confi...
Mark Nelson [Thu, 27 Mar 2014 02:09:36 +0000 (19:09 -0700)]
MDL-41101 mod_assign: replaced 'view' add_to_log call for the reveal identities confirmation page with an event

7 years agoMDL-41101 mod_assign: replaced 'view submit assignment form' add_to_log call with...
Mark Nelson [Tue, 25 Mar 2014 02:32:22 +0000 (19:32 -0700)]
MDL-41101 mod_assign: replaced 'view submit assignment form' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view submission grading table' add_to_log call with...
Mark Nelson [Tue, 25 Mar 2014 02:00:35 +0000 (19:00 -0700)]
MDL-41101 mod_assign: replaced 'view submission grading table' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view grading form' add_to_log call with an event
Mark Nelson [Tue, 25 Mar 2014 00:52:00 +0000 (17:52 -0700)]
MDL-41101 mod_assign: replaced 'view grading form' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view feedback' add_to_log call with an event
Mark Nelson [Mon, 24 Mar 2014 05:10:34 +0000 (22:10 -0700)]
MDL-41101 mod_assign: replaced 'view feedback' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view submission' add_to_log call with an event
Mark Nelson [Sun, 23 Mar 2014 00:27:52 +0000 (17:27 -0700)]
MDL-41101 mod_assign: replaced 'view submission' add_to_log call with an event

7 years agoMDL-41101 mod_assign: replaced 'view all' add_to_log call with an event
Mark Nelson [Thu, 20 Mar 2014 02:27:36 +0000 (19:27 -0700)]
MDL-41101 mod_assign: replaced 'view all' add_to_log call with an event

7 years agoMDL-41101 mod_assign: introduced event base class
Mark Nelson [Sun, 23 Mar 2014 00:21:38 +0000 (17:21 -0700)]
MDL-41101 mod_assign: introduced event base class

Also performed the following -

1) Deprecated the assignment's add_to_log function (part of it's functionality exists in the base class to set the legacy log data).
2) Edited existing events to use the new base class.
3) Renamed event_test.php to events_test.php to match the rest of core.
4) Moved the event tests from locallib_test.php to events_test.php.
5) When setting legacy data use lang_string, rather than get_string, as we may not be using them if legacy log is disabled.

7 years agoMDL-41101 mod_assign: removed underscores from event string keys
Mark Nelson [Thu, 20 Mar 2014 02:44:15 +0000 (19:44 -0700)]
MDL-41101 mod_assign: removed underscores from event string keys

AMOS BEGIN
 MOV [event_all_submissions_downloaded, mod_assign],[eventallsubmissionsdownloaded, mod_assign]
 MOV [event_assessable_submitted, mod_assign],[eventassessablesubmitted, mod_assign]
 MOV [event_extension_granted, mod_assign],[eventextensiongranted, mod_assign]
 MOV [event_identities_revealed, mod_assign],[eventidentitiesrevealed, mod_assign]
 MOV [event_marker_updated, mod_assign],[eventmarkerupdated, mod_assign]
 MOV [event_statement_accepted, mod_assign],[eventstatementaccepted, mod_assign]
 MOV [event_submission_duplicated, mod_assign],[eventsubmissionduplicated, mod_assign]
 MOV [event_submission_graded, mod_assign],[eventsubmissiongraded, mod_assign]
 MOV [event_submission_locked, mod_assign],[eventsubmissionlocked, mod_assign]
 MOV [event_submission_status_updated, mod_assign],[eventsubmissionstatusupdated, mod_assign]
 MOV [event_submission_unlocked, mod_assign],[eventsubmissionunlocked, mod_assign]
 MOV [event_workflow_state_updated, mod_assign],[eventworkflowstateupdated, mod_assign]
AMOS END

7 years agoMDL-44778 core_theme: added the well and well-small class to Base
Andrew Davis [Fri, 11 Apr 2014 02:43:59 +0000 (10:43 +0800)]
MDL-44778 core_theme: added the well and well-small class to Base

7 years agoMDL-45142 report_partcipation: Fixed behat feature file name
Rajesh Taneja [Thu, 17 Apr 2014 00:47:57 +0000 (08:47 +0800)]
MDL-45142 report_partcipation: Fixed behat feature file name

7 years agoMDL-44778 editor_atto: added a border around the equation preview
Andrew Davis [Thu, 27 Mar 2014 06:11:27 +0000 (14:11 +0800)]
MDL-44778 editor_atto: added a border around the equation preview

7 years agoMerge branch 'MDL-44616_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Wed, 16 Apr 2014 20:52:07 +0000 (08:52 +1200)]
Merge branch 'MDL-44616_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'wip-MDL-45116_master' of https://github.com/kwiliarty/moodle
Sam Hemelryk [Wed, 16 Apr 2014 20:39:34 +0000 (08:39 +1200)]
Merge branch 'wip-MDL-45116_master' of https://github.com/kwiliarty/moodle

7 years agoMerge branch 'MDL-45061' of git://github.com/jleyva/moodle
Sam Hemelryk [Wed, 16 Apr 2014 20:37:26 +0000 (08:37 +1200)]
Merge branch 'MDL-45061' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-45132-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 16 Apr 2014 14:22:28 +0000 (16:22 +0200)]
Merge branch 'MDL-45132-master' of git://github.com/FMCorz/moodle

7 years agoMDL-45132 curl: Unit Tests for file uploads
Frederic Massart [Wed, 16 Apr 2014 09:29:22 +0000 (17:29 +0800)]
MDL-45132 curl: Unit Tests for file uploads

7 years agoMerge branch 'MDL-44798-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 16 Apr 2014 07:21:08 +0000 (15:21 +0800)]
Merge branch 'MDL-44798-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'MDL-44349-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Wed, 16 Apr 2014 07:11:27 +0000 (15:11 +0800)]
Merge branch 'MDL-44349-master' of https://github.com/lucisgit/moodle

7 years agoMerge branch 'MDL-44951-master' of git://github.com/jethac/moodle
Marina Glancy [Wed, 16 Apr 2014 06:44:04 +0000 (14:44 +0800)]
Merge branch 'MDL-44951-master' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-41286_master' of git://github.com/markn86/moodle
Marina Glancy [Wed, 16 Apr 2014 06:42:40 +0000 (14:42 +0800)]
Merge branch 'MDL-41286_master' of git://github.com/markn86/moodle

7 years agoMerge branch 'MDL-44758-master' of git://github.com/jethac/moodle
Marina Glancy [Wed, 16 Apr 2014 06:42:15 +0000 (14:42 +0800)]
Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'wip-mdl-44977' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 16 Apr 2014 06:34:58 +0000 (14:34 +0800)]
Merge branch 'wip-mdl-44977' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'MDL-44629-B' of https://github.com/bostelm/moodle
Damyon Wiese [Wed, 16 Apr 2014 06:23:07 +0000 (14:23 +0800)]
Merge branch 'MDL-44629-B' of https://github.com/bostelm/moodle

7 years agoMerge branch 'wip-mdl-44979' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 16 Apr 2014 05:56:37 +0000 (13:56 +0800)]
Merge branch 'wip-mdl-44979' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-41975 repository_alfresco: Updating details about Alfresco URL and timestamps
Frederic Massart [Wed, 16 Apr 2014 05:38:27 +0000 (13:38 +0800)]
MDL-41975 repository_alfresco: Updating details about Alfresco URL and timestamps

7 years agoMDL-41975 repository_alfresco: Ensure Moodle sends GMT time to Alfresco
Michael Woods [Wed, 16 Apr 2014 05:32:54 +0000 (13:32 +0800)]
MDL-41975 repository_alfresco: Ensure Moodle sends GMT time to Alfresco

7 years agoMDL-41286 report_outline: updated report to use logging api
Mark Nelson [Mon, 10 Mar 2014 01:11:53 +0000 (18:11 -0700)]
MDL-41286 report_outline: updated report to use logging api

AMOS START
 MOV [neverseen, mod_folder],[neverseen, report_outline]
 MOV [neverseen, mod_page],[neverseen, report_outline]
 MOV [neverseen, mod_resource],[neverseen, report_outline]
 MOV [neverseen, mod_url],[neverseen, report_outline]
AMOS END

7 years agoMerge branch 'MDL-45089_chat' of https://github.com/andyjdavis/moodle
Dan Poltawski [Wed, 16 Apr 2014 05:00:46 +0000 (13:00 +0800)]
Merge branch 'MDL-45089_chat' of https://github.com/andyjdavis/moodle

7 years agoMDL-44798 editor_atto: Backport a fix for HTML5Shiv
Andrew Nicols [Wed, 16 Apr 2014 02:26:40 +0000 (10:26 +0800)]
MDL-44798 editor_atto: Backport a fix for HTML5Shiv

This is a backport of the Rangy workaround for a bug in HTML5Shiv, which
breaks document.createElement by returning nodes which have parent nodes.

HTML5Shiv refuses to fix this bug so Rangy has had to work around it.

For more information see:
* https://code.google.com/p/rangy/issues/detail?id=104; and
* https://github.com/aFarkas/html5shiv/issues/64.

7 years agoMerge branch 'MDL-45081-master' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 16 Apr 2014 03:51:57 +0000 (11:51 +0800)]
Merge branch 'MDL-45081-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44295' of https://github.com/scyrma/moodle
Dan Poltawski [Wed, 16 Apr 2014 03:33:14 +0000 (11:33 +0800)]
Merge branch 'MDL-44295' of https://github.com/scyrma/moodle

7 years agoMerge branch 'MDL-43277-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 16 Apr 2014 03:12:36 +0000 (11:12 +0800)]
Merge branch 'MDL-43277-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-45123 atto_equation: improvements to ajax.php
Sam Hemelryk [Wed, 16 Apr 2014 03:12:03 +0000 (15:12 +1200)]
MDL-45123 atto_equation: improvements to ajax.php

7 years agoMerge branch 'MDL-45062' of git://github.com/jleyva/moodle
Damyon Wiese [Wed, 16 Apr 2014 02:57:46 +0000 (10:57 +0800)]
Merge branch 'MDL-45062' of git://github.com/jleyva/moodle

7 years agoMDL-45062 webservices: fix unit test for update_grades
Damyon Wiese [Wed, 16 Apr 2014 02:55:58 +0000 (10:55 +0800)]
MDL-45062 webservices: fix unit test for update_grades

This fixes the broken unit test (which exposes a fail) and
the next patch from Juan fixes the fail.