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,566 Commits 36 Branches 527 Tags
Commit Graph

15583 Commits

Author SHA1 Message Date
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
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
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
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
Tim Hunt
7076b30972 MDL-44054 quiz_statistics fix lang string concatenation. 2014-05-29 14:44:21 +01:00
Brian King
6a97697a2a MDL-40371 Upgrade-until-22: remove obsolete _upgrade_grades functions 2014-05-29 19:43:37 +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
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
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