68543 Commits

Author SHA1 Message Date
Matteo Scaramuccia
ad3ade7681 MDL-29708 Fixed extra slashes in $string['storedfilenotcreated']. 2014-06-07 09:53:09 +02:00
Eloy Lafuente (stronk7)
e7ea6b9a24 weekly release 2.8dev 2014-06-05 16:58:30 +02:00
Eloy Lafuente (stronk7)
f1a23d593e Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-06-05 16:58:18 +02:00
Damyon Wiese
c9be25abb3 Merge branch 'MDL-41665_master' of https://github.com/markn86/moodle 2014-06-04 16:15:32 +08:00
Mark Nelson
e2cd4f5b95 MDL-41665 mod_scorm: fixed broken report URLs 2014-06-04 00:17:41 -07:00
Marina Glancy
b60e8bb8fa Merge branch 'MDL-18162-master-2' of git://github.com/andrewnicols/moodle 2014-06-04 12:58:03 +08:00
Andrew Nicols
df7a4d6569 MDL-45625 mod_forum: Correct typo in upgrade notes 2014-06-04 11:56:54 +08:00
Andrew Nicols
d9b196d9b6 MDL-18162 mod_forum: Correct @param type in phpdoc to use stdClass 2014-06-04 11:25:38 +08:00
Damyon Wiese
ddf831be20 Merge branch 'MDL-45568_master' of git://github.com/markn86/moodle 2014-06-04 10:20:53 +08:00
Marina Glancy
6526c48909 Merge branch 'MDL-40851-master' of git://github.com/andrewnicols/moodle 2014-06-04 10:08:10 +08:00
Marina Glancy
0313897108 Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle
Conflicts:
	lib/phpunit/bootstrap.php
2014-06-04 10:07:03 +08:00
Mark Nelson
336f1567bb MDL-45568 events: fixed the description for the 'course_module_completion_updated' event 2014-06-03 17:25:53 -07:00
Sam Hemelryk
0591c2056d Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-06-04 09:51:37 +12:00
Eloy Lafuente (stronk7)
71fa28477b Merge branch 'MDL-44620_master' of git://github.com/dmonllao/moodle 2014-06-03 18:11:28 +02:00
Andrew Nicols
052933f4ea MDL-40851 mod_forum: Final deprecation of forum_shorten_post 2014-06-03 23:15:47 +08:00
Dan Poltawski
1051166f78 Merge branch '45333-28' of git://github.com/samhemelryk/moodle 2014-06-03 15:25:59 +01:00
Dan Poltawski
ed3f8591ed Merge branch 'master_MDL-40371' of git://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/lib.php
2014-06-03 15:19:22 +01:00
Dan Poltawski
0eb40618ba Merge branch 'MDL-44054' of git://github.com/timhunt/moodle 2014-06-03 12:58:34 +01:00
Dan Poltawski
09da421d92 Merge branch '45513-28-defines' of git://github.com/samhemelryk/moodle 2014-06-03 12:20:41 +01:00
Jason Fowler
2270803ed2 MDL-42953 Themes: Fixing CSS for headers of central blocks 2014-06-03 12:13:00 +02:00
Rajesh Taneja
1bce3a70d9 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
2014-06-03 17:33:49 +08:00
Marina Glancy
3d9ea145c2 Merge branch 'MDL-41313-master' of git://github.com/andrewnicols/moodle 2014-06-03 17:32:36 +08:00
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
AMOS bot
4b6e43dca8 Automatically generated installer lang files 2014-05-30 01:24:10 +00:00
AMOS bot
b4ac089766 Automatically generated installer lang files 2014-05-30 01:24:10 +00: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
Sam Hemelryk
90395bbfa1 MDL-45333 output: navbar is now wrapped in a <nav> tag 2014-05-30 08:41:29 +12:00
Sam Hemelryk
eefb680d8e MDL-45513 cache: implemented defines for unit testing alternative caches 2014-05-30 08:41:07 +12:00
Sam Hemelryk
79a8ea653c MDL-45513 cache: added support to unit tests for alt cache stores 2014-05-30 08:41:07 +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