mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-29 03:52:33 +01:00
Code Issues Projects Releases Wiki Activity
68,722 Commits 36 Branches 527 Tags
Commit Graph

15635 Commits

Author SHA1 Message Date
Marina Glancy
3f0a5f287a Merge branch 'MDL-45257-master-2nd' of git://github.com/FMCorz/moodle 2014-04-30 10:05:11 +08:00
Krister Viirsaar
c6ac68eead MDL-42635 lesson: Fixed error message 2014-04-30 09:51:10 +08:00
Tim Hunt
3180508949 MDL-45273 quiz: Fix codechecker issues. 2014-04-29 11:57:01 +01:00
Tim Hunt
9b38aca0ce MDL-45321 quiz upgrade: make it more tolerant to old bad data. 2014-04-29 11:41:16 +01:00
Tim Hunt
8a347d8011 MDL-45273 only create the quiz settings if necessary. 2014-04-29 11:16:49 +01:00
Tim Hunt
9ec7a71661 MDL-45273 remove the need for quiz settings.php to include locallib.php. 2014-04-29 11:16:44 +01:00
Tim Hunt
de4cd1e047 MDL-45273 quiz: move admin settings into classes folder. 2014-04-29 11:16:39 +01:00
David Monllao
d2e6b3b26b MDL-44614 behat: Added missing @_file_upload 2014-04-29 09:55:47 +07:00
Frederic Massart
abf3a51e29 MDL-45257 mod_assign: Removing wonky feedback_updated event 2014-04-28 15:13:55 +08:00
Marina Glancy
f6db769eb2 Merge branch 'MDL-44614_master' of git://github.com/dmonllao/moodle 2014-04-28 13:03:39 +08:00
David Monllao
23102c3e2e MDL-44614 behat: Automate MDLQA-61 
In an Offline activity assignment, a teacher can
grade and give comments on an assignment completed
offline.
 2014-04-28 10:01:01 +07:00
David Monllao
6f9f05a06e MDL-44614 behat: Automate MDLQA-60 
A teacher can provide feedback
comments and files for an assignment.
 2014-04-28 10:00:41 +07:00
Marina Glancy
3a0edd1fcd Merge branch 'MDL-45052-master' of git://github.com/ankitagarwal/moodle 2014-04-28 10:44:36 +08:00
Ankit Agarwal
c4652889f1 MDL-45052 events: Cleanup db/events.php 2014-04-28 10:33:18 +08:00
Sam Hemelryk
934cedc46e Merge branch 'mdl45232' of https://github.com/tlevi/moodle 2014-04-28 14:23:33 +12:00
Sam Hemelryk
6ce786cbe7 Merge branch 'MDL-45164_master' of git://github.com/dmonllao/moodle 2014-04-28 14:09:27 +12:00
David Monllao
2353a68fa8 MDL-45164 behat: Add a wait to avoid random failures 
It may fail in fast systems as the JS animation
to remove the delete comment may be slower than
the following steps where we check that the element
is not there anymore.
 2014-04-27 07:44:15 +07:00
Sam Hemelryk
5852a965ca Merge branch 'MDL-44928-master' of git://github.com/xow/moodle 2014-04-24 11:37:34 +12:00
Sam Hemelryk
a544822bd8 Merge branch 'MDL-45186-master' of git://github.com/FMCorz/moodle 2014-04-24 11:01:33 +12:00
Dan Poltawski
54de59e70a Merge branch 'MDL-45075-master' of git://github.com/andrewnicols/moodle 2014-04-23 16:13:08 +08:00
Andrew Nicols
7bb7de44cf MDL-45075 mod_forum: Add unit tests for forum subscription on forum creation 2014-04-23 16:07:50 +08:00
John Okely
f548bc4de5 MDL-44928 mod_forum: Add unit tests for urls in mod_forum events 2014-04-23 15:59:26 +08:00
John Okely
2b7781d662 MDL-44928 mod_forum: Fix urls in log entries for forum events 2014-04-23 15:54:15 +08:00
Marina Glancy
3ebfb87878 Merge branch 'w17_MDL-45219_m27_addtolog' of git://github.com/skodak/moodle 2014-04-23 15:25:01 +08:00
Dan Poltawski
0a4fa71345 Merge branch 'MDL-45194-master' of git://github.com/FMCorz/moodle 2014-04-23 13:29:20 +08:00
Petr Skoda
a991a1dd23 MDL-45219 add \mod\chat\course_module_viewed event 2014-04-23 11:53:35 +08:00
Petr Skoda
2f3c20b245 MDL-45219 remove old assignment course instance list 2014-04-23 11:53:35 +08:00
Tony Levi
368e04dc7a MDL-45232: mod_data: Simultaneously added entries do not sort correctly 
This was picked up by behat on a fast machine, when using shorter polling interval.
 2014-04-23 12:41:43 +09:30
Frederic Massart
5730debbb9 MDL-45194 assign_feedback: Cache was never set and used in is_enabled 2014-04-22 15:32:25 +08:00
Frederic Massart
90f9e30b3b MDL-45186 mod_quiz: Some RTL improvements on quiz edit page 2014-04-22 12:27:34 +08:00
Marina Glancy
04b0ce956d Merge branch 'MDL-43673' of git://github.com/stronk7/moodle 2014-04-22 12:27:13 +08:00
Andrew Nicols
8e6775d8f9 MDL-45075 mod_forum: Move user subscription to an observer 
The forum subscription function is called in some cases on forum creation
(specifically the case of an automatically subscribed forum).

Since the forum subscription requires both the course_module instance, and
the context these must both be present when subscribing users to the forum,
however these are not fully set up until after the forum has been created.

By moving the subscription to a subscriber, we are able to hook into the
module creation event after the course_module and context have been linked
to the forum instance.
 2014-04-22 11:50:52 +08:00
Simon Coggins
e205a159e3 MDL-45212 scorm: Disable sorting on unsortable columns in SCORM reports 2014-04-22 14:11:52 +12:00
Dan Poltawski
eec3795270 Merge branch 'MDL-45145_master' of https://github.com/markn86/moodle 2014-04-21 10:51:38 +08:00
Dan Poltawski
3497702ae5 Merge branch 'MDL-45010-master' of git://github.com/FMCorz/moodle 2014-04-18 14:54:54 +08:00
Dan Poltawski
ac13361b77 Merge branch 'MDL-45023-master' of git://github.com/jamiepratt/moodle 2014-04-18 13:47:10 +08:00
Dan Poltawski
f658717108 Merge branch 'MDL-45110-master' of git://github.com/jamiepratt/moodle 2014-04-18 12:03:23 +08:00
Dan Poltawski
a6d4ba1d97 Merge branch 'wip-MDL-43626-master' of git://github.com/abgreeve/moodle 2014-04-18 10:52:45 +08:00
Dan Poltawski
a94b4c6e55 Merge branch 'MDL-45071_master' of https://github.com/markn86/moodle 2014-04-18 10:47:04 +08:00
Mark Nelson
a97a7585ff MDL-45145 mod_quiz: ensure quiz cmid is set before triggering the 'attempt_deleted' event 2014-04-17 18:44:58 -07:00
Dan Poltawski
63476b0f6f Merge branch 'MDL-44619_master' of git://github.com/dmonllao/moodle 2014-04-17 17:02:04 +08:00
Damyon Wiese
186f092ee8 Merge branch 'MDL-45119-master' of git://github.com/andrewnicols/moodle 2014-04-17 16:17:12 +08:00
Marina Glancy
c18c7869fa Merge branch 'w16_MDL-45144_m27_booklog' of git://github.com/skodak/moodle 2014-04-17 15:57:03 +08:00
Petr Skoda
c95f956851 MDL-45144 describe mod_book events changes 2014-04-17 15:35:03 +08:00
Damyon Wiese
5cfa441ba7 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.
 2014-04-17 15:05:24 +08:00
Petr Skoda
ef2a9ece71 MDL-45144 convert book events to create_from_xxx() helpers 2014-04-17 14:29:31 +08:00
Petr Skoda
98cb244de1 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.
 2014-04-17 13:30:30 +08:00
Andrew Nicols
8ae76e1388 MDL-45119 editpdf: Do not load quick comments in read-only mode 2014-04-17 11:43:51 +08:00
Marina Glancy
0b10dfce9d Merge branch 'w16_MDL-41101_m27_assign' of git://github.com/skodak/moodle 2014-04-17 11:20:51 +08:00
Marina Glancy
2d6221b2ae Merge branch 'MDL-44621_master' of git://github.com/dmonllao/moodle 2014-04-17 11:04:10 +08:00