68510 Commits

Author SHA1 Message Date
Damyon Wiese
d47bd7962b Merge branch 'MDL-45592_master' of git://github.com/grabs/moodle 2014-06-03 16:58:05 +08:00
Damyon Wiese
45e02c9a73 Merge branch 'MDL-45627-master' of git://github.com/andrewnicols/moodle 2014-06-03 15:12:52 +08:00
Damyon Wiese
96c9b2feb3 Merge branch 'MDL-45630_master' of https://github.com/markn86/moodle 2014-06-03 15:00:27 +08:00
Damyon Wiese
0fe6999ace Merge branch 'MDL-45658_master' of https://github.com/markn86/moodle 2014-06-03 14:52:33 +08:00
Damyon Wiese
5d759c9563 Merge branch 'MDL-45677_master' of https://github.com/markn86/moodle 2014-06-03 14:37:55 +08:00
Damyon Wiese
5bbcdbeb96 Merge branch 'MDL-41665' of git://github.com/nobelium/moodle 2014-06-03 13:16:22 +08:00
Gregory Faller
556483d47d MDL-44098: Late submissions with extension calculate period of lateness incorrectly 2014-06-03 12:40:36 +08:00
Damyon Wiese
c792d01c78 Merge branch 'MDL-45781' of git://github.com/timhunt/moodle 2014-06-03 11:57:22 +08:00
Sam Hemelryk
7ca6b26d8f Merge branch 'MDL-18162-master' of git://github.com/andrewnicols/moodle 2014-06-03 15:00:26 +12:00
Eloy Lafuente (stronk7)
bd29ed2770 Merge branch 'master_MDL-45726' of https://github.com/danmarsden/moodle 2014-06-03 02:20:48 +02:00
Sam Hemelryk
24df080cdc Merge branch 'master_MDL-45212' of git://github.com/totara/moodle 2014-06-03 10:18:58 +12:00
Sam Hemelryk
984dd8b75c MDL-45625: fixed whitespace 2014-06-03 10:15:56 +12:00
Sam Hemelryk
8c68421e3d Merge branch 'MDL-45625-master' of git://github.com/andrewnicols/moodle 2014-06-03 09:05:38 +12:00
Sam Hemelryk
f36ccdbb40 Merge branch 'MDL-41708-master' of git://github.com/andrewnicols/moodle 2014-06-03 09:02:11 +12:00
Sam Hemelryk
58e70de193 Merge branch 'MDL-33763-master' of git://github.com/ankitagarwal/moodle 2014-06-03 08:57:31 +12:00
Eloy Lafuente (stronk7)
4df54b06f1 Merge branch 'MDL-35514_master' of https://github.com/markn86/moodle 2014-06-02 18:19:52 +02:00
Eloy Lafuente (stronk7)
5c7d164ff4 Merge branch 'MDL-44902_LTI_Addtions' of https://github.com/moodlerooms/moodle
Conflicts:
	mod/lti/version.php
2014-06-02 16:33:39 +02:00
Eloy Lafuente (stronk7)
17c9a3ccbf Merge branch 'MDL-34737-master' of git://github.com/andrewnicols/moodle 2014-06-02 11:53:33 +02:00
Mark Nelson
1ea5f1e2d3 MDL-45630 events: removed unnecessary 'the' from event descriptions 2014-05-31 15:27:11 -07:00
Tim Hunt
67014b5d23 MDL-45781 quiz autosave: detect and report when the session is lost.
and also other errors.
2014-05-30 16:26:23 +01:00
Nobelium
27b8872cb3 MDL-41665 scorm : Rewriting using html_writer 2014-05-29 21:54:00 +00:00
Ciaran Irvine
005141f3d0 MDL-45726 SCORM: Correct check for forcenewattempt 2014-05-30 09:48:16 +12:00
Andreas Grabs
c2ebf60636 MDL-45592 mod_feedback - unwanted linebreak after import or duplicating a feedback 2014-05-29 17:16:26 +02:00
Eloy Lafuente (stronk7)
8e478c99d3 weekly on-sync release 2.8dev 2014-05-29 12:52:03 +02:00
Eloy Lafuente (stronk7)
607c34de11 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-05-29 12:51:58 +02:00
Damyon Wiese
3f86b023ef MDL-45654 Cron: Fix for unit test that was causing integer overflow in 32 bit php 2014-05-29 12:10:19 +08:00
Sam Hemelryk
f65427b660 Merge branch 'wip-mdl-45698' of https://github.com/rajeshtaneja/moodle 2014-05-29 14:27:56 +12:00
Rajesh Taneja
0a69b98018 MDL-45698 behat: Fixed behat and symfony versions 2014-05-29 09:45:55 +08:00
Rajesh Taneja
a9e2d4c03a MDL-45698 behat: Added extra setting, to avoid timout issue 2014-05-29 09:44:03 +08:00
Sam Hemelryk
20f29d2c89 MDL-45654 cron: fixed dataprovider timestamp issue 2014-05-29 11:53:36 +12:00
Sam Hemelryk
69ab6b4713 Merge branch 'wip-mdl-45565' of https://github.com/rajeshtaneja/moodle 2014-05-29 08:12:32 +12:00
Andrew Nicols
3a4ff0a899 MDL-18162 mod_forum: Correct phpdoc for forum_clean_search_terms 2014-05-28 09:35:48 +08:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Dan Poltawski
a64528d88c Merge branch 'MDL-45544-master' of git://github.com/lameze/moodle 2014-05-27 07:49:58 +01:00
Rajesh Taneja
3c4b599d9b MDL-45565 phpunit: Changed testsuite_name, so as to avoid class collision 2014-05-27 09:43:52 +08:00
Dan Poltawski
1ce76b900b Merge branch 'MDL-45676_master' of https://github.com/markn86/moodle 2014-05-26 12:02:40 +01:00
Dan Poltawski
c6e3d67934 Merge branch 'MDL-45675_master' of https://github.com/markn86/moodle 2014-05-26 11:58:50 +01:00
Dan Poltawski
6ca4f19a9f Merge branch 'MDL-45682-master' of git://github.com/andrewnicols/moodle 2014-05-26 11:23:59 +01:00
Rajesh Taneja
6b8e46ad04 MDL-45565 core_message: Reset internal users in phpunit 2014-05-26 15:42:12 +08:00
Marina Glancy
87c1a30b1f Merge branch 'MDL-45661-master' of git://github.com/damyon/moodle 2014-05-26 14:40:56 +08:00
Marina Glancy
8a564deb07 Merge branch 'MDL-44482-master' of git://github.com/jethac/moodle 2014-05-26 14:40:48 +08:00
Jetha Chan
101ec5fd3b 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.
2014-05-26 14:03:02 +08:00
Simey Lameze
b0ad512f95 MDL-45544 events: Add event user_profile_viewed trigger to user/profile.php. 2014-05-26 12:51:40 +08:00
Damyon Wiese
ea1cd97ec7 Merge branch 'wip-MDL-45688-master' of git://github.com/marinaglancy/moodle 2014-05-26 12:46:29 +08:00
Damyon Wiese
4e2bf2381f MDL-45661 Assign: Clean bad data from DB after MDL-42526 2014-05-26 12:36:21 +08:00
Damyon Wiese
2562653a27 Merge branch '45499-28' of git://github.com/samhemelryk/moodle 2014-05-26 12:04:42 +08:00
Andrew Nicols
362659725b MDL-45682 editor_atto: Ensure that the current editor is active when saving selections 2014-05-26 12:02:02 +08:00
Marina Glancy
9e41209bba Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle 2014-05-26 11:58:50 +08:00
Marina Glancy
0251be5bcc Merge branch 'MDL-44014-master' of git://github.com/andrewnicols/moodle 2014-05-26 11:58:43 +08:00
Ankit Agarwal
963402c2ba MDL-33763 notes: Fix issue with incorrect node highlighting in the nav tree 2014-05-26 10:40:10 +08:00