Marina Glancy
8f3e0bf7a5
Merge branch 'MDL-37380-master' of git://github.com/danpoltawski/moodle
2013-12-10 15:20:22 +11:00
Marina Glancy
b3e0bd5225
Merge branch 'MDL-43199-master' of git://github.com/damyon/moodle
2013-12-10 15:15:27 +11:00
Marina Glancy
013620aad3
Merge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle
2013-12-10 11:40:54 +11:00
Sam Chaffee
262075ce02
MDL-40003 mod_assign: Fixed submission comments not being restored
2013-12-09 11:01:34 +01:00
Dan Poltawski
4ea3286758
MDL-37380 mod_data: remove unused JS functions
2013-12-06 16:27:41 +08:00
Ankit Agarwal
1f2aeda91e
MDL-43044 events: Add unit tests
2013-12-06 16:08:03 +08:00
Ankit Agarwal
45faf15dfd
MDL-43044 events: Deprecate and remove code duplication from instances_list_viewed events
2013-12-06 15:59:49 +08:00
Pavel Sokolov
a66555328b
MDL-43199 assign: fix js error when expanding comments for non editing teachers in assign grading table
2013-12-06 12:57:20 +08:00
Marina Glancy
b9c3f07ad0
MDL-40191 folder: Do not check capability in renderer
...
Capability to access the module is already checked before calling the renderer. Extra check works bad together with switching roles
2013-12-04 18:27:55 +11:00
Sam Hemelryk
db9c8f4c7d
Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle
2013-12-04 09:43:43 +13:00
Eloy Lafuente (stronk7)
3e1a05790d
Merge branch 'master-mdl33971' of https://github.com/tlock/moodle
2013-12-03 17:17:06 +01:00
Eloy Lafuente (stronk7)
6cc00494e2
Merge branch 'MDL-43079-master-v2' of https://github.com/jamiepratt/moodle
2013-12-03 15:36:25 +01:00
Damyon Wiese
a977fa7b36
Merge branch 'wip-MDL-42731-master' of git://github.com/marinaglancy/moodle
2013-12-03 17:29:39 +08:00
Damyon Wiese
23a05a1b9a
Merge branch 'MDL-42627_master' of git://github.com/dmonllao/moodle
2013-12-03 16:15:53 +08:00
Dan Poltawski
9c25a183fa
Merge branch 'master-mdl43020' of https://github.com/tlock/moodle
2013-12-03 16:08:15 +08:00
Damyon Wiese
53741d32a6
Merge branch 'MDL-42962-master' of git://github.com/ankitagarwal/moodle
2013-12-03 15:15:25 +08:00
Ankit Agarwal
e10ea84ed0
MDL-42962 events: Remove duplicate code from all course_module_viewed events
2013-12-03 14:24:32 +08:00
Sam Hemelryk
a59a423926
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
2013-12-03 11:12:34 +13:00
Marina Glancy
6dfd8325f0
MDL-42731 behat: load 'Site administration' when expanding node in non-javascript mode
2013-12-02 17:44:32 +11:00
David Monllao
e7c71c448b
MDL-42627 behat: Moving the deprecated method to behat_deprecate and updating scenarios
2013-12-02 14:13:17 +08:00
Dan Poltawski
9a7de39d7a
Merge branch 'MDL-43068' of git://github.com/timhunt/moodle
2013-12-02 11:11:07 +08:00
Eloy Lafuente (stronk7)
4942801c39
Merge branch 'MDL-42957-master' of https://github.com/jamiepratt/moodle
...
Conflicts:
question/classes/statistics/questions/calculator.php
question/classes/statistics/responses/analyser.php
2013-11-28 12:44:04 +01:00
James Pratt
7d6b28d87a
MDL-42957 (3) quiz statistics : removing assertEquals(time(), ..) tests
2013-11-28 17:57:02 +07:00
James Pratt
487e7e6602
MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause
...
Fixing some typos and adding some tests.
2013-11-28 17:13:26 +07:00
Tim Hunt
1c73df9eea
MDL-43068 course&gradebook: show/hide cm & CONTROLS_GRADE_VISIBILITY
...
Making a quiz visible on the course page, of via the settings form,
could cause the grade item to become visible in the gradebook, even
though the quiz supports FEATURE_CONTROLS_GRADE_VISIBILITY to ensure
that when the grades are hidden in the quiz settings, they do not appear
in the gradebook.
Now, if a module supports FEATURE_CONTROLS_GRADE_VISIBILITY, then
set_coursemodule_visible calls the _grade_item_update callback to update
the grade item(s).
In addition, there was a bug when saving the quiz form, where it used
the value of $cm->visible from the database, which was wrong if the
value of cm->visible had just been changed on the setting form.
2013-11-27 17:40:40 +00:00
James Pratt
34292e218d
MDL-43079 quiz statistics : fix stats graph when all grades zero
2013-11-27 17:50:05 +07:00
Sam Hemelryk
8d5a9d6ec1
Merge branch 'wip-MDL-42508-master' of git://github.com/marinaglancy/moodle
2013-11-27 12:36:02 +13:00
Tim Lock
579f849928
MDL-33971: When viewing course log entries for Quiz View Summary a number is displayed not the quiz name
2013-11-27 08:14:40 +10:30
Dan Poltawski
2bc34d6528
Merge branch 'MDL-40741_master' of git://github.com/dmonllao/moodle
2013-11-26 14:52:21 +08:00
Damyon Wiese
3a5c3b3cbf
MDL-42919 Assign: Remove no-label form hacks
2013-11-26 13:30:36 +08:00
Dan Poltawski
6ac888c5f2
Merge branch 'wip-MDL-43006-master' of git://github.com/marinaglancy/moodle
2013-11-26 13:24:02 +08:00
David Monllao
5df9e40cec
MDL-40741 behat: Changing xpaths for clean theme
...
Keeps compatibility with standard theme.
2013-11-26 11:41:13 +08:00
Sam Hemelryk
657b29e7bc
Merge branch 'MDL-43037_master' of https://github.com/markn86/moodle
2013-11-26 08:36:36 +13:00
Tim Lock
16c25753a8
MDL-43020: Fix lesson scale warnings when deleting user attempts
2013-11-25 15:08:19 +10:30
Marina Glancy
8a3a584da5
MDL-43006 behat: adding javascript tag because of behat bug
...
behat without JS does not submit the empty textarea field causing notice in the form processing
2013-11-25 14:59:28 +11:00
Dan Poltawski
83a97ce6c7
Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle
2013-11-25 11:17:47 +08:00
Tim Lock
74dd3bd6c7
MDL-43020: Fix calculation of lesson scale value warning
2013-11-25 09:31:56 +10:30
Mark Nelson
12bb281e5e
MDL-43037 mod_quiz: retrieve all name fields for the user override pages
2013-11-23 16:17:54 -08:00
Marina Glancy
6f5db6a6a8
MDL-42508 folder: add module generator
2013-11-22 18:56:48 +11:00
Marina Glancy
490dca1a6f
MDL-42508 imspcp: add module generator
2013-11-22 15:25:38 +11:00
Marina Glancy
15cca13822
MDL-42508 scorm: add module generator
2013-11-22 15:25:37 +11:00
Tim Lock
da7e5daf1e
MDL-43020: Fix calculation of lesson scale value using gradeitem grademax
2013-11-22 07:17:38 +10:30
Dan Marsden
18a34b07e6
MDL-42992 SCORM: Always allow IE to resize window
2013-11-21 10:22:42 +13:00
Dan Poltawski
2a0a33a6ee
Merge branch 'MDL-42504' of git://github.com/timhunt/moodle
2013-11-19 10:30:16 +08:00
Dan Poltawski
0cf4e15baf
Merge branch 'MDL-42181' of git://github.com/mkassaei/moodle
2013-11-19 10:04:59 +08:00
Damyon Wiese
86249e9aeb
Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle
2013-11-19 09:49:57 +08:00
Dan Marsden
eef4c4c175
MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db
2013-11-19 13:23:06 +13:00
Dan Poltawski
66a02845e9
Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle
2013-11-18 15:37:01 +08:00
Damyon Wiese
67016a4d39
Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle
2013-11-18 15:12:56 +08:00
Dan Poltawski
728f924ec1
Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/scorm/db/upgrade.php
2013-11-18 14:32:55 +08:00