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

15595 Commits

Author SHA1 Message Date
David Mudrák
56c8eaf5d2 MDL-46056 Remove invalid string definition from the workshop module 
The correct version of the string is defined above.
 2014-06-19 00:43:47 +02:00
Damyon Wiese
c48c9bf02f MDL-42835 Scorm: Fix for JS error because no nodes are selected in the toc. 2014-06-12 13:57:34 +08:00
Marina Glancy
410bb9a92c Merge branch 'MDL-20154-master' of git://github.com/merrill-oakland/moodle 2014-06-10 15:41:53 +08:00
Damyon Wiese
850833378d Merge branch 'MDL-45761-master' of https://github.com/merrill-oakland/moodle 2014-06-10 14:01:23 +08:00
Damyon Wiese
dc92753a3a Merge branch 'MDL-45767_returnInstanceid' of https://github.com/moodlerooms/moodle 2014-06-10 13:34:01 +08:00
Damyon Wiese
5262686e5f Merge branch 'MDL-45729-master' of http://github.com/damyon/moodle 2014-06-10 13:28:04 +08:00
Damyon Wiese
2d8d99ab5b Merge branch 'MDL-45763-master' of https://github.com/merrill-oakland/moodle 2014-06-10 12:42:09 +08:00
Damyon Wiese
5ba4ca894a MDL-45729 assign: Fix for assign unit tests 
Check the user in the params, not the $USER
 2014-06-10 11:39:20 +08:00
Eloy Lafuente (stronk7)
3150271c22 Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle 2014-06-10 01:16:27 +02:00
Eloy Lafuente (stronk7)
d1b183b94b Merge branch 'MDL-45804_master' of https://github.com/markn86/moodle 2014-06-10 01:14:21 +02:00
Eloy Lafuente (stronk7)
0a87b6809f Merge branch 'MDL-42835' of git://github.com/nobelium/moodle 2014-06-10 00:36:33 +02:00
Graham Bowman
09fdd221ca MDL-45729 assign: conditional submission summary 
Only show the submission summary if user has assign:submit capability.

Amended to fix some whitespace and the commit message.
 2014-06-09 22:07:15 +02:00
Eloy Lafuente (stronk7)
61e11664c8 Merge branch 'wip-MDL-44501-master' of git://github.com/abgreeve/moodle 2014-06-09 18:59:16 +02:00
Mark Nelson
6e311b5fb3 MDL-45789 mod_wiki: removed undefined "$this->other['itemid']" from the comments_viewed event description 2014-06-05 21:08:27 -07:00
Nobelium
6a761d016c MDL-42835 mod_scorm: Close tree nodes using TreeView API 2014-06-05 22:30:05 +00:00
Eric Merrill
828a4e9f6e MDL-20154 quiz: Remove unused random questions 
When a random question is removed from a quiz, and it is not
in use elsewhere, it should be deleted.
 2014-06-05 11:06:26 -04:00
Eric Merrill
98f52b7dc0 MDL-45761 assign Set inline comment format properly when plugin is empty 
If a plugin says it is empty, skip it for for building the inline
comment.

If not format was found in any plugins, set to FORMAT_HTML, which is
the default for feedback anyways.
 2014-06-05 08:56:24 -04:00
Damyon Wiese
c9be25abb3 Merge branch 'MDL-41665_master' of https://github.com/markn86/moodle 2014-06-04 16:15:32 +08:00
Adrian Greeve
f3998ce41e MDL-44501 mod_data: Only attempt to export files when a file exists. 
The error only occurs when portfolios are enabled and there is only one field which is
a file field.
 2014-06-04 15:27:50 +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
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
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
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
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
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
Mark Nelson
be8fe65404 MDL-45804 mod_workshop: fixed objecttable specified for the submission_reassessed event 2014-06-02 16:33:54 -07: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
Eric Merrill
a871a7a757 MDL-45763 question Random qtype should use '0' or '1' question text. 
Some time ago, it when from using '0' for no-subcategories to blank.
Change to properly define '0' or '1', update old questions, and make
sure to fix newly restored questions.
 2014-06-02 15:31:23 -04: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
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