mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 21:20:02 +01:00
Code Issues Projects Releases Wiki Activity
63,309 Commits 36 Branches 527 Tags
Commit Graph

14216 Commits

Author SHA1 Message Date
Adrian Greeve
146893d62f MDL-41556 - workshop: undefined constant FILE_INTERNAL message fixed. 2013-09-03 11:44:30 +08:00
Damyon Wiese
1149b5d205 MDL-41249 assign: Fix incorrect gradingform restore step 
The mapping in the previous patch was wrong - mod assign uses
the area "submissions" but the itemid is the grade->id not the submission->id.
 2013-08-28 16:29:19 +08:00
Damyon Wiese
8380bd08a8 Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle 2013-08-27 15:51:19 +08:00
Damyon Wiese
cbd91e23e9 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2013-08-27 15:29:49 +08:00
Dan Poltawski
4436225eb1 Merge branch 'MDL-40732' of git://github.com/rwijaya/moodle 2013-08-27 15:06:38 +08:00
Dan Poltawski
9a6c6d1cfd Merge branch 'MDL-38765' of git://github.com/timhunt/moodle 2013-08-27 13:51:40 +08:00
Damyon Wiese
f6c2af867f Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2013-08-27 13:16:55 +08:00
Dan Poltawski
a0df83441b Merge branch 'MDL-38505' of git://github.com/jmvedrine/moodle 2013-08-26 17:47:05 +08:00
Dan Poltawski
aa8fe63937 Merge branch 'MDL-40055-master' of git://github.com/FMCorz/moodle 2013-08-26 15:09:33 +08:00
Frederic Massart
725dfe6a54 MDL-40055 mod_assign: Wrong namespace when throwing exception 2013-08-26 14:21:34 +08:00
Frederic Massart
959a328472 MDL-40055 mod_assign: Setting level according to new event constants 2013-08-26 14:17:18 +08:00
Frederic Massart
5e8eb969e0 MDL-40055 mod_assign: get_name() uses get_string() not lang_string 2013-08-26 14:17:18 +08:00
Frederic Massart
bd2e982998 MDL-40055 mod_assign: Replace add_to_log 'grade submission' 2013-08-26 14:17:18 +08:00
Frederic Massart
9a289c3da5 MDL-40055 mod_assign: Replace add_to_log 'unlock submission' 2013-08-26 14:17:18 +08:00
Frederic Massart
6332ff7a35 MDL-40055 mod_assign: Replace add_to_log 'submit' 2013-08-26 14:17:18 +08:00
Frederic Massart
b1e52860ea MDL-40055 mod_assign: Replace add_to_log 'submission statement accepted' 2013-08-26 14:17:18 +08:00
Frederic Massart
89fbc20263 MDL-40055 mod_assign: Replace add_to_log 'submissioncopied' 2013-08-26 14:17:18 +08:00
Frederic Massart
8bb213eb60 MDL-40055 mod_assign: Replace add_to_log 'set marking workflow state' 2013-08-26 14:17:18 +08:00
Frederic Massart
e59a85ba61 MDL-40055 mod_assign: Replace add_to_log 'set marking allocation' 2013-08-26 14:17:17 +08:00
Frederic Massart
159b7f4024 MDL-40055 mod_assign: Replace add_to_log 'revert submission to draft' 2013-08-26 14:17:17 +08:00
Frederic Massart
ad10ad1415 MDL-40055 mod_assign: Replace add_to_log 'reveal identities' 2013-08-26 14:17:17 +08:00
Frederic Massart
3d1331be34 MDL-40055 mod_assign: Replace add_to_log 'lock submission' 2013-08-26 14:17:17 +08:00
Frederic Massart
76e77b05eb MDL-40055 mod_assign: Replace add_to_log 'grant extension' 2013-08-26 14:17:17 +08:00
Frederic Massart
a65b53036e MDL-40055 mod_assign: Replace add_to_log 'download all submissions' 2013-08-26 14:17:17 +08:00
Damyon Wiese
1b9db0af41 Merge branch 'mdl26_MDL-29004_wiki-fix-images-in-printer-friendly-view' of https://github.com/brki/moodle 2013-08-26 13:50:20 +08:00
Sam Hemelryk
c3d2fbf9cd MDL-40931 useragent: separated user agent functionality into a lib 
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
 2013-08-26 13:59:19 +12:00
Dan Marsden
c7e6fb6c8d MDL-35380 SCORM: improve check for imsmanifest file and consolidate into a single function. 2013-08-26 13:06:59 +12:00
Damyon Wiese
b5711fe527 MDL-41249 assign: Restore step missing gradingform mapping 
Thanks to Matthieu Raggett for the report and the solution.
 2013-08-25 21:20:53 +08:00
Jean-Michel Vedrine
efbe07b03c MDL-38505 Permit lesson to import images in question text 2013-08-23 07:54:57 +02:00
Damyon Wiese
aee8151f7d Revert "MDL-35380 SCORM: improve check for imsmanifest file and consolidate into a single function." 
This reverts commit 492407e9f734989782e6380c381cfa14a09b1b26.
 2013-08-22 14:11:18 +08:00
Damyon Wiese
9ead041cdb Revert "MDL-40931 useragent: separated user agent functionality into a lib" 
This reverts commit af62237d0e6e27df868d50848f7098f57c103f86.
This reverts commit 87a4194fdcd322d4aee5a6207b55a8da0864da94.
This reverts commit b2c66eb60c01805f26cc791966f05be52af7b406.

Conflicts:

	version.php
 2013-08-22 13:31:25 +08:00
Dan Poltawski
d7d2f263dd Merge branch 'MDL-41125-master' of git://github.com/FMCorz/moodle 2013-08-22 10:32:54 +08:00
Frederic Massart
7fb35af658 MDL-41125 forum: Missing include of repository lib 2013-08-22 09:50:05 +08:00
Tim Hunt
ad8f011755 MDL-38765 quiz view: fix duplicate message. 
The "No more attempts are allowed" message was being shown twice. I
checked back, and it has been like that since before the quiz was
converted to use a renderer. Still, it looks horrible, so changing it.
 2013-08-21 10:24:25 +01:00
Dan Marsden
3d1808c6e2 MDL-40122 SCORM: replace SCORM course format with singleactivity 2013-08-21 20:26:06 +12:00
Damyon Wiese
52ec2a60f6 Merge branch 'MDL-41191-duplicaterecords' of git://github.com/danpoltawski/moodle 2013-08-21 15:43:23 +08:00
Dan Poltawski
a9e6a73173 MDL-41191 mod_forum: avoid DISTINCT on TEXT columns 
It is not supported by all db engines
 2013-08-21 14:38:22 +08:00
Dan Poltawski
72c2c0bb09 MDL-41191 add more test data to trigger duplicate course records 2013-08-21 14:17:12 +08:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course" 
This reverts commit ab7632b74c331540c90229bf03d13aa2e6bdd9be.
 2013-08-21 13:42:30 +08:00
Damyon Wiese
90a5a4b620 Merge branch 'master_MDL-35380' of git://github.com/danmarsden/moodle 2013-08-21 11:38:37 +08:00
Sam Hemelryk
c1613ed53a Merge branch 'wip-MDL-40830-master' of git://github.com/marinaglancy/moodle 2013-08-21 13:17:37 +12:00
Sam Hemelryk
2968602ccb Merge branch 'MDL-41162' of git://github.com/timhunt/moodle 2013-08-21 12:13:34 +12:00
Sam Hemelryk
6eee89bc8f Merge branch 'MDL-39876-master' of git://github.com/sammarshallou/moodle 
Conflicts:
	course/lib.php
 2013-08-21 12:08:46 +12:00
Sam Hemelryk
f79f3c00f8 Revert "MDL-41258 Forum: Add additional unit tests for forum digest settings" 
This reverts commit 0ef6f6860debcc2a5b67fecaeb57256377436b6b.
 2013-08-21 11:03:35 +12:00
Sam Hemelryk
c5bba2fc2d Merge branch 'MDL-41258-m' of git://github.com/andrewnicols/moodle 2013-08-21 09:59:19 +12:00
Dan Poltawski
c161e4687c Merge branch 'MDL-41143-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-08-20 18:21:17 +08:00
Frederic Massart
2ecd284779 MDL-41143 mod_forum: Prevent unnessary loading of formslib 2013-08-20 17:50:07 +08:00
Damyon Wiese
89959d9ad1 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 2013-08-20 16:45:33 +08:00
Dan Poltawski
beccd9d4ff Merge branch 'MDL-39770_chat' of https://github.com/andyjdavis/moodle 2013-08-20 16:34:18 +08:00
Damyon Wiese
e2f36a71a8 Merge branch 'MDL-41191-master' of git://github.com/danpoltawski/moodle 2013-08-20 16:13:55 +08:00