mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
70,619 Commits 36 Branches 519 Tags
Commit Graph

70619 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
2c89eeeb8e Merge branch 'wip-MDL-43245-master-lang' of git://github.com/abgreeve/moodle 2014-10-24 11:48:05 +02:00
Damyon Wiese
edffadfd1c MDL-47763 Grades: Handle the case when a grade category is hidden. 
This was breaking the contribution column, which needs to know the
weights of all the categories up the tree, whether they are visible or
not.
 2014-10-24 11:48:05 +02:00
Marina Glancy
1e3dc6ed9c Merge branch 'MDL-47836-master' of git://github.com/damyon/moodle 2014-10-24 11:48:04 +02:00
Adrian Greeve
780ff300a8 MDL-43245 mod_lesson: Add string for essay grading permission. 2014-10-24 11:48:04 +02:00
Marina Glancy
b7840d4783 Merge branch 'MDL-47819-master' of git://github.com/jethac/moodle 2014-10-24 11:48:03 +02:00
Damyon Wiese
f01972d95e MDL-47836 Grades: Fix the url for the upgraded grades warning page url. 2014-10-24 11:48:03 +02:00
Dan Poltawski
ea4361b3a5 Merge branch 'MDL-47713-master-fix1' of http://github.com/damyon/moodle 2014-10-24 11:48:02 +02:00
Jetha Chan
edcca18f8d MDL-47819 user_menu: fixed showing up in popups 2014-10-24 11:48:02 +02:00
Damyon Wiese
bdb319a5b1 Merge branch 'MDL-47740' of git://github.com/timhunt/moodle 2014-10-24 11:48:01 +02:00
Damyon Wiese
a7c37934cc MDL-47713 Grades: Fix new behat test after conversion from points to % 
The contribution to course total column was changed from points to % but
this new test was submitted using points. It just needs the numbers converted
to %.
 2014-10-24 11:48:01 +02:00
Damyon Wiese
721c6d397c Merge branch 'MDL-43245' of git://github.com/jmvedrine/moodle 2014-10-24 11:48:00 +02:00
Jean-Michel Vedrine
5fc6a9e77b MDL-43245 Lesson: non editing teacher cannot grade lesson essay 2014-10-24 11:48:00 +02:00
Dan Poltawski
7a811fb63a Merge branch 'MDL-47713-master' of git://github.com/damyon/moodle 2014-10-24 11:47:59 +02:00
Damyon Wiese
96ef037856 Merge branch 'MDL-32616' of git://github.com/timhunt/moodle 2014-10-24 11:47:59 +02:00
Eloy Lafuente (stronk7)
e739fbcf27 Merge branch 'wip-MDL-47812-master2' of git://github.com/marinaglancy/moodle 2014-10-24 11:05:54 +02:00
Marina Glancy
d4a9e66130 MDL-47812 mod_lti: execute upgrade script for all DBs 2014-10-24 14:00:30 +08:00
Andrew Nicols
4a8c380abb MDL-47513 Fix RTL issues with grade report 2014-10-23 11:15:35 +08:00
Andrew Nicols
555837c5d4 MDL-47808 mod_forum: Correct maxeditingtime for unit tests 
The maxeditingtime needs to be a negative value for unit tests to ensure
that the messages are actually sent out.

Whilst fixing this I also discovered that the create_discussion part of the
generator also creates the first post.
 2014-10-23 08:43:29 +08:00
Damyon Wiese
b0c5a9c491 MDL-47713 Grades: Update all the behat tests to use % in contribution column 2014-10-22 16:20:15 +08:00
Damyon Wiese
8950e7f535 on-demand release 2.8beta+ 2014-10-22 15:06:37 +08:00
Damyon Wiese
6a196cf14d NOBUG: Fixed file access permissions 2014-10-22 15:06:36 +08:00
Damyon Wiese
2746fbe47c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-10-22 15:06:33 +08:00
Frederic Massart
6aeebc259a MDL-47637 core_grades: Outcomes must not be weighted when non aggregated 2014-10-22 14:58:17 +08:00
Damyon Wiese
718f179c22 Merge branch 'MDL-47706-master' of git://github.com/andrewnicols/moodle 2014-10-22 14:50:53 +08:00
Marina Glancy
fca97cbec4 MDL-47673 grades: unittest change caused by generator change 
Unit test was introduced in MDL-40697 when the generator for quiz activity was setting grade=0
 2014-10-22 14:14:49 +08:00
Andrew Nicols
bedcf338dc MDL-47706 gradebook: Update pageload time between changes 
Since MDL-38732 we reject changes if another change has been made more
recently. As a result, if process_data is called, and then we roll into the
next millisecond period before process_data is called again, the change is
rejected.

Different errors were seen because the millisecond rollover occurred at
different time within the test.

Different error conditions were seen because not all of the tests check for
an error from the call to process_data(), instead just checking that the
value had been updated correctly.
 2014-10-22 12:56:07 +08:00
Damyon Wiese
7a61e645c3 MDL-46527 Grades: Webservice only returns first activity grade. 2014-10-22 11:21:51 +08:00
Damyon Wiese
53f26095c6 Merge branch 'MDL-46527-master' of git://github.com/jleyva/moodle 2014-10-22 10:45:57 +08:00
Mark Nelson
8a0c649637 MDL-47153 tool_monitor: altered unit tests to pass 2014-10-21 16:00:26 -07:00
Mark Nelson
11c2bf3f73 MDL-47153 tool_monitor: added subscription_criteria_met event 2014-10-21 16:00:18 -07:00
Mark Nelson
1adb0031c0 MDL-47153 tool_monitor: added subscription_deleted event 2014-10-21 15:48:10 -07:00
Mark Nelson
229f841907 MDL-47153 tool_monitor: added subscription_created event 2014-10-21 15:48:10 -07:00
Mark Nelson
91df5f7e37 MDL-47153 tool_monitor: added rule_deleted event 2014-10-21 15:48:09 -07:00
Mark Nelson
12b9969ef9 MDL-47153 tool_monitor: added rule_updated event 2014-10-21 15:48:09 -07:00
Mark Nelson
e9da23369f MDL-47153 tool_monitor: added rule_created event 2014-10-21 14:19:16 -07:00
AMOS bot
e15766c19c Automatically generated installer lang files 2014-10-22 00:07:37 +08:00
Gareth J Barnard
a024eaa5fc MDL-47795 SCORM: SCORM report not a report. 2014-10-21 15:37:31 +01:00
Tim Hunt
cda62a3829 MDL-47791 question editing: remove permission info from above the form 
This information is not really meaningful for users, and takes up prime
real-estate, so we are removing it.
 2014-10-21 15:03:20 +01:00
Tim Hunt
a8de866712 MDL-47740 question engine: let qs update variant later if appropriate 
Variant has two purposes. First to determine which version of the
question the student will see. Hence it is used to set up the state
of the quetsion when the question is started. Then the internal state of
the question is saved in the first step.

Once that has been done, the variant number is purely informative, and
just used to break down the statistics.

In some cases (the one I have in mind is qtype_opaque) then there is a
complex randomisation process, which may lead to several inital variant
numbers acutally giving the same version of the question. In this case
it is nice if the question can update the stored variant number, to make
the statistics more meaningful.
 2014-10-21 11:43:57 +01:00
Juan Leyva
a7888487f0 MDL-46527 grades: grade_get_grades external function rewritten 2014-10-21 12:10:01 +02:00
Marina Glancy
b1b66a3d12 Merge branch 'MDL-47736_master_fix2' of git://github.com/markn86/moodle 2014-10-21 15:49:10 +08:00
Mark Nelson
7b62567e85 MDL-47736 editor_atto: added fix for IE 9 and 10 2014-10-21 00:46:35 -07:00
Marina Glancy
fb32a64efc Merge branch 'MDL-47736_master_fix' of git://github.com/markn86/moodle 2014-10-21 14:34:05 +08:00
Mark Nelson
3c15d25bcf MDL-47736 editor_atto: exclude <br> from being restored 2014-10-20 23:24:08 -07:00
Damyon Wiese
fc9150cb0e MDL-47713 Grades: Change contribution column to a percent of grademax 2014-10-21 13:50:18 +08:00
Damyon Wiese
a6396272f8 Merge branch 'wip_MDL-41593_m28_preventexecdefault' of https://github.com/skodak/moodle 2014-10-21 13:11:27 +08:00
Marina Glancy
e94925ddd2 Merge branch 'MDL-47728_master' of git://github.com/markn86/moodle 2014-10-21 11:56:31 +08:00
Damyon Wiese
a9a02e9170 MDL-20367 Grades: Allow real numbers as grade boundaries 
Patch by Huy Hoang (I just git-ified it).
 2014-10-21 11:15:39 +08:00
Marina Glancy
8b2d85406a Merge branch 'MDL-47400-master-2' of git://github.com/andrewnicols/moodle 2014-10-21 10:55:54 +08:00
Andrew Nicols
82e3440aec MDL-47400 gradereport_history: Fix string notempty test for Oracle 2014-10-21 10:48:28 +08:00