Mark Nelson [Mon, 9 Jun 2014 22:58:14 +0000 (15:58 -0700)]
MDL-45803 mod_quiz: removed usage of the function quiz_fire_attempt_started_event
Mark Nelson [Tue, 3 Jun 2014 21:16:54 +0000 (14:16 -0700)]
MDL-45803 mod_quiz: prevented the attempt_started event from being triggered twice
Mark Nelson [Tue, 3 Jun 2014 21:15:12 +0000 (14:15 -0700)]
MDL-45803 mod_quiz: added attempt snapshot for the attempt and preview started events
Eloy Lafuente (stronk7) [Thu, 5 Jun 2014 14:58:30 +0000 (16:58 +0200)]
weekly release 2.8dev
Eloy Lafuente (stronk7) [Thu, 5 Jun 2014 14:58:18 +0000 (16:58 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Damyon Wiese [Wed, 4 Jun 2014 08:15:32 +0000 (16:15 +0800)]
Merge branch 'MDL-41665_master' of https://github.com/markn86/moodle
Mark Nelson [Wed, 4 Jun 2014 06:56:43 +0000 (23:56 -0700)]
MDL-41665 mod_scorm: fixed broken report URLs
Marina Glancy [Wed, 4 Jun 2014 04:58:03 +0000 (12:58 +0800)]
Merge branch 'MDL-18162-master-2' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 4 Jun 2014 03:56:54 +0000 (11:56 +0800)]
MDL-45625 mod_forum: Correct typo in upgrade notes
Andrew Nicols [Wed, 4 Jun 2014 03:25:38 +0000 (11:25 +0800)]
MDL-18162 mod_forum: Correct @param type in phpdoc to use stdClass
Damyon Wiese [Wed, 4 Jun 2014 02:20:53 +0000 (10:20 +0800)]
Merge branch 'MDL-45568_master' of git://github.com/markn86/moodle
Marina Glancy [Wed, 4 Jun 2014 02:08:10 +0000 (10:08 +0800)]
Merge branch 'MDL-40851-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 4 Jun 2014 02:07:03 +0000 (10:07 +0800)]
Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle
Conflicts:
lib/phpunit/bootstrap.php
Mark Nelson [Thu, 15 May 2014 21:58:55 +0000 (14:58 -0700)]
MDL-45568 events: fixed the description for the 'course_module_completion_updated' event
Sam Hemelryk [Tue, 3 Jun 2014 21:51:37 +0000 (09:51 +1200)]
Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Tue, 3 Jun 2014 16:11:28 +0000 (18:11 +0200)]
Merge branch 'MDL-44620_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 20 May 2014 04:29:17 +0000 (12:29 +0800)]
MDL-40851 mod_forum: Final deprecation of forum_shorten_post
Dan Poltawski [Tue, 3 Jun 2014 14:25:59 +0000 (15:25 +0100)]
Merge branch '45333-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 3 Jun 2014 14:19:22 +0000 (15:19 +0100)]
Merge branch 'master_MDL-40371' of git://github.com/danmarsden/moodle
Conflicts:
mod/scorm/lib.php
Dan Poltawski [Tue, 3 Jun 2014 11:58:34 +0000 (12:58 +0100)]
Merge branch 'MDL-44054' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 3 Jun 2014 11:20:41 +0000 (12:20 +0100)]
Merge branch '45513-28-defines' of git://github.com/samhemelryk/moodle
Jason Fowler [Thu, 15 May 2014 07:27:51 +0000 (15:27 +0800)]
MDL-42953 Themes: Fixing CSS for headers of central blocks
Rajesh Taneja [Fri, 16 May 2014 06:19:58 +0000 (14:19 +0800)]
MDL-44839 admin: Moved all system executable paths to config
AMOS BEGIN
MOV ['gspath','assignfeedback_editpdf'],['pathtogs','admin']
MOV ['gspath_help','assignfeedback_editpdf'],['pathtogs_help','admin']
AMOS END
Marina Glancy [Tue, 3 Jun 2014 09:32:36 +0000 (17:32 +0800)]
Merge branch 'MDL-41313-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 3 Jun 2014 08:58:05 +0000 (16:58 +0800)]
Merge branch 'MDL-45592_master' of git://github.com/grabs/moodle
Damyon Wiese [Tue, 3 Jun 2014 07:12:52 +0000 (15:12 +0800)]
Merge branch 'MDL-45627-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 3 Jun 2014 07:00:27 +0000 (15:00 +0800)]
Merge branch 'MDL-45630_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 3 Jun 2014 06:52:33 +0000 (14:52 +0800)]
Merge branch 'MDL-45658_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 3 Jun 2014 06:37:55 +0000 (14:37 +0800)]
Merge branch 'MDL-45677_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 3 Jun 2014 05:16:22 +0000 (13:16 +0800)]
Merge branch 'MDL-41665' of git://github.com/nobelium/moodle
Gregory Faller [Tue, 27 May 2014 01:42:14 +0000 (11:12 +0930)]
MDL-44098: Late submissions with extension calculate period of lateness incorrectly
Damyon Wiese [Tue, 3 Jun 2014 03:57:22 +0000 (11:57 +0800)]
Merge branch 'MDL-45781' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 3 Jun 2014 03:00:26 +0000 (15:00 +1200)]
Merge branch 'MDL-18162-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jun 2014 00:20:48 +0000 (02:20 +0200)]
Merge branch 'master_MDL-45726' of https://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 2 Jun 2014 22:18:58 +0000 (10:18 +1200)]
Merge branch 'master_MDL-45212' of git://github.com/totara/moodle
Sam Hemelryk [Mon, 2 Jun 2014 22:15:56 +0000 (10:15 +1200)]
MDL-45625: fixed whitespace
Sam Hemelryk [Mon, 2 Jun 2014 21:05:38 +0000 (09:05 +1200)]
Merge branch 'MDL-45625-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 2 Jun 2014 21:02:11 +0000 (09:02 +1200)]
Merge branch 'MDL-41708-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 2 Jun 2014 20:57:31 +0000 (08:57 +1200)]
Merge branch 'MDL-33763-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jun 2014 16:19:52 +0000 (18:19 +0200)]
Merge branch 'MDL-35514_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jun 2014 14:33:39 +0000 (16:33 +0200)]
Merge branch 'MDL-44902_LTI_Addtions' of https://github.com/moodlerooms/moodle
Conflicts:
mod/lti/version.php
Eloy Lafuente (stronk7) [Mon, 2 Jun 2014 09:53:33 +0000 (11:53 +0200)]
Merge branch 'MDL-34737-master' of git://github.com/andrewnicols/moodle
Mark Nelson [Tue, 20 May 2014 06:05:50 +0000 (23:05 -0700)]
MDL-45630 events: removed unnecessary 'the' from event descriptions
Tim Hunt [Fri, 30 May 2014 15:20:19 +0000 (16:20 +0100)]
MDL-45781 quiz autosave: detect and report when the session is lost.
and also other errors.
AMOS bot [Fri, 30 May 2014 01:24:10 +0000 (01:24 +0000)]
Automatically generated installer lang files
AMOS bot [Fri, 30 May 2014 01:24:10 +0000 (01:24 +0000)]
Automatically generated installer lang files
Nobelium [Thu, 29 May 2014 21:54:00 +0000 (21:54 +0000)]
MDL-41665 scorm : Rewriting using html_writer
Ciaran Irvine [Thu, 29 May 2014 06:54:36 +0000 (18:54 +1200)]
MDL-45726 SCORM: Correct check for forcenewattempt
Sam Hemelryk [Wed, 14 May 2014 20:39:16 +0000 (08:39 +1200)]
MDL-45333 output: navbar is now wrapped in a <nav> tag
Sam Hemelryk [Mon, 19 May 2014 00:00:59 +0000 (12:00 +1200)]
MDL-45513 cache: implemented defines for unit testing alternative caches
Sam Hemelryk [Sun, 11 May 2014 20:38:43 +0000 (08:38 +1200)]
MDL-45513 cache: added support to unit tests for alt cache stores
Andreas Grabs [Fri, 16 May 2014 16:31:26 +0000 (18:31 +0200)]
MDL-45592 mod_feedback - unwanted linebreak after import or duplicating a feedback
Tim Hunt [Fri, 9 May 2014 14:54:32 +0000 (15:54 +0100)]
MDL-44054 quiz_statistics fix lang string concatenation.
Eloy Lafuente (stronk7) [Thu, 29 May 2014 10:52:03 +0000 (12:52 +0200)]
weekly on-sync release 2.8dev
Eloy Lafuente (stronk7) [Thu, 29 May 2014 10:51:58 +0000 (12:51 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Brian King [Fri, 28 Jun 2013 09:10:16 +0000 (11:10 +0200)]
MDL-40371 Upgrade-until-22: remove obsolete _upgrade_grades functions
Damyon Wiese [Thu, 29 May 2014 04:10:19 +0000 (12:10 +0800)]
MDL-45654 Cron: Fix for unit test that was causing integer overflow in 32 bit php
Sam Hemelryk [Thu, 29 May 2014 02:27:56 +0000 (14:27 +1200)]
Merge branch 'wip-mdl-45698' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 29 May 2014 01:45:55 +0000 (09:45 +0800)]
MDL-45698 behat: Fixed behat and symfony versions
Rajesh Taneja [Wed, 28 May 2014 09:17:27 +0000 (17:17 +0800)]
MDL-45698 behat: Added extra setting, to avoid timout issue
Sam Hemelryk [Wed, 28 May 2014 23:21:05 +0000 (11:21 +1200)]
MDL-45654 cron: fixed dataprovider timestamp issue
Sam Hemelryk [Wed, 28 May 2014 20:12:32 +0000 (08:12 +1200)]
Merge branch 'wip-mdl-45565' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 28 May 2014 01:21:42 +0000 (09:21 +0800)]
MDL-18162 mod_forum: Correct phpdoc for forum_clean_search_terms
Eloy Lafuente (stronk7) [Tue, 27 May 2014 23:13:42 +0000 (01:13 +0200)]
MDL-45503 upgrade: add v2.7.0 sep lines
Dan Poltawski [Tue, 27 May 2014 06:49:58 +0000 (07:49 +0100)]
Merge branch 'MDL-45544-master' of git://github.com/lameze/moodle
Rajesh Taneja [Tue, 27 May 2014 01:43:52 +0000 (09:43 +0800)]
MDL-45565 phpunit: Changed testsuite_name, so as to avoid class collision
Dan Poltawski [Mon, 26 May 2014 11:02:40 +0000 (12:02 +0100)]
Merge branch 'MDL-45676_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 26 May 2014 10:58:50 +0000 (11:58 +0100)]
Merge branch 'MDL-45675_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 26 May 2014 10:23:59 +0000 (11:23 +0100)]
Merge branch 'MDL-45682-master' of git://github.com/andrewnicols/moodle
Rajesh Taneja [Mon, 26 May 2014 02:44:24 +0000 (10:44 +0800)]
MDL-45565 core_message: Reset internal users in phpunit
Marina Glancy [Mon, 26 May 2014 06:40:56 +0000 (14:40 +0800)]
Merge branch 'MDL-45661-master' of git://github.com/damyon/moodle
Marina Glancy [Mon, 26 May 2014 06:40:48 +0000 (14:40 +0800)]
Merge branch 'MDL-44482-master' of git://github.com/jethac/moodle
Jetha Chan [Fri, 23 May 2014 07:59:14 +0000 (15:59 +0800)]
MDL-44482 mod_lti: use localized dates
Fixed an issue where LTI external tools had creation datestamps of NaN/NaN/NaN under particular non-English languages.
Simey Lameze [Wed, 21 May 2014 02:11:12 +0000 (10:11 +0800)]
MDL-45544 events: Add event user_profile_viewed trigger to user/profile.php.
Damyon Wiese [Mon, 26 May 2014 04:46:29 +0000 (12:46 +0800)]
Merge branch 'wip-MDL-45688-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Thu, 22 May 2014 06:33:49 +0000 (14:33 +0800)]
MDL-45661 Assign: Clean bad data from DB after MDL-42526
Damyon Wiese [Mon, 26 May 2014 04:04:42 +0000 (12:04 +0800)]
Merge branch '45499-28' of git://github.com/samhemelryk/moodle
Andrew Nicols [Mon, 26 May 2014 04:02:02 +0000 (12:02 +0800)]
MDL-45682 editor_atto: Ensure that the current editor is active when saving selections
Marina Glancy [Mon, 26 May 2014 03:58:50 +0000 (11:58 +0800)]
Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle
Marina Glancy [Mon, 26 May 2014 03:58:43 +0000 (11:58 +0800)]
Merge branch 'MDL-44014-master' of git://github.com/andrewnicols/moodle
Ankit Agarwal [Mon, 26 May 2014 02:39:57 +0000 (10:39 +0800)]
MDL-33763 notes: Fix issue with incorrect node highlighting in the nav tree
Mark Nelson [Mon, 26 May 2014 02:28:07 +0000 (19:28 -0700)]
MDL-45675 mod_data: initialise options as an empty array to avoid error when there are none
Sam Hemelryk [Mon, 26 May 2014 01:59:08 +0000 (13:59 +1200)]
Merge branch 'MDL-45650_master' of https://github.com/markn86/moodle
Sam Hemelryk [Mon, 26 May 2014 01:23:02 +0000 (13:23 +1200)]
Merge branch 'MDL-45192_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Sun, 25 May 2014 23:52:32 +0000 (11:52 +1200)]
Merge branch 'MDL-45660' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 25 May 2014 22:55:11 +0000 (10:55 +1200)]
Merge branch 'MDL-45686' of git://github.com/jmvedrine/moodle
Sam Hemelryk [Sun, 25 May 2014 22:36:11 +0000 (10:36 +1200)]
Merge branch 'MDL-45635-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 25 May 2014 21:58:48 +0000 (09:58 +1200)]
Merge branch 'master_MDL-45623' of git://github.com/totara/moodle
Sam Hemelryk [Sun, 25 May 2014 21:53:41 +0000 (09:53 +1200)]
Merge branch 'MDL-45607_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 25 May 2014 21:02:39 +0000 (09:02 +1200)]
Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 20 May 2014 21:11:39 +0000 (09:11 +1200)]
MDL-45499 admin: fixed error when displaying page settings
Sam Hemelryk [Sun, 25 May 2014 20:58:03 +0000 (08:58 +1200)]
Merge branch 'MDL-45654-master' of https://github.com/rtcn2/moodle
Jean-Michel Vedrine [Fri, 23 May 2014 21:08:36 +0000 (23:08 +0200)]
MDL-45686 qtype_multichoice get_num_selected_choices return wrong result
Marina Glancy [Sat, 24 May 2014 10:30:28 +0000 (18:30 +0800)]
MDL-45688 added missing library requirement
Rajesh Taneja [Fri, 23 May 2014 03:12:32 +0000 (11:12 +0800)]
MDL-45565 core_message: Added unit tests.
Andrew Nicols [Fri, 23 May 2014 08:01:48 +0000 (16:01 +0800)]
MDL-45635 javascript: Make core dialogue translatable
Mark Nelson [Fri, 23 May 2014 05:16:57 +0000 (22:16 -0700)]
MDL-45677 mod_assign: removed treatment of an array as an object
Mark Nelson [Fri, 23 May 2014 04:57:42 +0000 (21:57 -0700)]
MDL-45676 mod_data: added missing additional name fields
Rajesh Taneja [Mon, 19 May 2014 03:59:32 +0000 (11:59 +0800)]
MDL-45565 core_message: Fixed strangers array
Strangers get mixed with noreply user and support user,
if noreply/support users real user.
To avoid duplication use userid as array index. Also,
avoid fetching data again for noreply and support users,
if they are real users, then data is already feteched.
AMOS bot [Fri, 23 May 2014 00:52:40 +0000 (00:52 +0000)]
Automatically generated installer lang files
