Commit graph

15324 commits

Author SHA1 Message Date
Marina Glancy
d2097020b4 MDL-44524 feedback: fix bug in sql under oracle
Thanks to Rob King"
2014-03-18 12:00:14 +08:00
Jetha Chan
74ecabb8aa MDL-42588 mod_scorm: display activity name
Added option to display or hide activity name on SCORM player.
2014-03-18 11:42:19 +08:00
Sam Hemelryk
c98edede85 Merge branch 'MDL-44505' of https://github.com/bostelm/moodle 2014-03-18 15:00:24 +13:00
Tim Lock
754e2efd0f MDL-44669: mod/assign: fix batchoperations JS when using select all checkboxes. 2014-03-18 11:09:57 +10:30
Marina Glancy
e65825830f Merge branch 'MDL-44588' of git://github.com/timhunt/moodle 2014-03-17 18:18:36 +08:00
Tim Lock
6b7aa837c9 MDL-44573: Remove HTML tags in outputs column in offline grading worksheet 2014-03-17 12:43:41 +10:30
Nobelium
b4f71f0c10 MDL-41216 scorm: style.css now follows block format 2014-03-15 11:00:58 +00:00
Nobelium
76e9e1028f MDL-43341 SCORM Report: spacer.gif must be managed with $OUTPUT->spacer 2014-03-14 22:16:07 +00:00
Henning Bostelmann
013e85bbcc MDL-44505 mod_forum: Make mailing subject a configurable language string 2014-03-14 11:39:15 +00:00
Tim Hunt
2f83d71ccc MDL-44534 also fix the mod_quiz behat tests.
They had duplicated code. I refactored.
2014-03-13 18:33:27 +01:00
Marina Glancy
b7d1cfca84 MDL-44337 behat grammer improvements, see MDL-43236 2014-03-13 18:33:24 +01:00
Sam Hemelryk
63afbaa6be Merge branch 'master_MDL-37733' of git://github.com/danmarsden/moodle 2014-03-13 18:33:23 +01:00
Eloy Lafuente (stronk7)
478baf8334 Merge branch 'wip-MDL-32699-master' of git://github.com/marinaglancy/moodle 2014-03-13 18:33:20 +01:00
Dan Poltawski
a8aa086bf9 Merge branch 'wip-MDL-44337-master' of git://github.com/marinaglancy/moodle 2014-03-13 18:31:49 +01:00
Tim Hunt
fb4ae869e5 MDL-44588 quiz: fix crazy variable called $this. 2014-03-12 18:20:45 +00:00
Dan Poltawski
234f953c44 Merge branch 'MDL-41855' of git://github.com/nobelium/moodle 2014-03-11 12:59:23 +08:00
Dan Poltawski
b027184f10 Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-03-11 12:42:27 +08:00
Dan Poltawski
8674c5e415 Merge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle 2014-03-11 12:35:57 +08:00
David Monllao
6a0f3c4869 MDL-43236 behat: Fixing missing changes
All "" "" should exists and "" "" should not exists
must be converted to the ones using exist rather than exists.
2014-03-11 10:07:25 +08:00
Sam Hemelryk
1aefc90960 Merge branch 'wip-MDL-40721-master' of git://github.com/marinaglancy/moodle 2014-03-11 14:22:33 +13:00
Sam Hemelryk
2710ad2b52 Merge branch 'MDL-43721-master' of git://github.com/damyon/moodle 2014-03-11 09:19:44 +13:00
Sam Hemelryk
1fef3f6aac Merge branch 'wip-MDL-44471-master' of git://github.com/marinaglancy/moodle 2014-03-11 08:51:36 +13:00
Nobelium
39af2f4171 MDL-41855 SCORM form : Auto update frequency option under File manager
Placing the Auto update frequency option underneath the File manager in /mod/scorm/mod_form.php
This changes the postion of the auto update freq option both while creating a new scorm object and while editing the scorm object.
2014-03-10 14:03:33 +00:00
Dan Poltawski
4e1aad54b8 Merge branch 'wip-mdl-44017' of https://github.com/rajeshtaneja/moodle 2014-03-10 15:13:43 +08:00
Dan Poltawski
7f42ee92eb Merge branch 'MDL-44440_master' of git://github.com/dmonllao/moodle 2014-03-10 13:45:26 +08:00
Niclas Tollstorff
7f9759c25c MDL-37733 SCORM: Correct check for force new attempt 2014-03-08 21:22:38 +13:00
Dan Marsden
6573b07780 MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close. 2014-03-08 21:04:31 +13:00
James Pratt
185aae5dbe MDL-44497 quiz responses report : error when no attempts 2014-03-07 17:24:13 +07:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
Rajesh Taneja
e1b16f9773 MDL-44017 Events: Deprecated content_viewed event
Replaced content_viewed event with appropriate events and deprecated
content_viewed event
2014-03-07 15:16:10 +08:00
David Monllao
370e88d4fe MDL-44440 behat: Other fixes to make clean work properly
- Update the step to follow links inside a treeview
  to work also when JS is disabled.
- Make regions accept header and footer.
- Change some locators refering to non-clean compatible
  regions.
- Restricting click to the table row in forum tracking
  because seems to conflict with the navigation bar when
  using narrow window sizes.
2014-03-07 14:27:52 +08:00
Marina Glancy
c7a8cef65e MDL-44471 Revert "MDL-42238 mod_wiki: Alternate name sql update to wiki_print_recent_activity"
This reverts commit 6d3d9bd927.
2014-03-07 09:56:29 +08:00
Marina Glancy
99fe2357e6 MDL-44337 glossary: behat test for glossary categories 2014-03-07 09:56:06 +08:00
Marina Glancy
2f8d26346f MDL-40721 wiki: missing page->set_url() when restoring wiki 2014-03-07 09:38:15 +08:00
Marina Glancy
846f6886f0 MDL-32699 wiki: only edit capability is required to restore wiki revision 2014-03-07 09:36:57 +08:00
Damyon Wiese
c46db93c28 MDL-43721 Assign + groups: Improve performance of assign grading table
Add a function to the groups lib to filter a list of users down
to the ones who can see the module. Required because calling
groups_course_module_visible() for a list of users is too slow
and we shouldn't spread group logic outside of grouplib.php.

Using it in the assign grading table reduces DB queries from 6198/1 to 256/3.

This is 12secs down to 2.5secs.
2014-03-06 15:50:13 +08:00
Damyon Wiese
a9e634afa6 MDL-43721 Assign: Static cache for plugin is_enabled and is_visible because they get used alot 2014-03-06 15:15:57 +08:00
Damyon Wiese
d09cfab660 Merge branch 'wip-MDL-44403-master' of git://github.com/marinaglancy/moodle 2014-03-06 09:21:24 +08:00
Eloy Lafuente (stronk7)
170c87d808 Merge branch 'MDL-44425-en_fix' of git://github.com/mudrd8mz/moodle 2014-03-06 00:35:28 +01:00
Helen Foster
fcca760ae7 MDL-44425 Merge English strings from the en_fix language pack 2014-03-05 13:29:32 +01:00
Dan Poltawski
93881b8011 Merge branch 'MDL-44319-master' of git://github.com/damyon/moodle 2014-03-05 14:21:28 +08:00
Dan Poltawski
ac8d049b47 Merge branch 'wip-MDL-44287-master' of git://github.com/marinaglancy/moodle 2014-03-05 14:18:21 +08:00
Dan Poltawski
08b47e6178 Merge branch 'MDL-43930-master-fix1' of git://github.com/damyon/moodle 2014-03-05 14:13:23 +08:00
Dan Poltawski
a59b2e18d8 Merge branch '44180-27' of git://github.com/samhemelryk/moodle 2014-03-05 12:47:17 +08:00
Damyon Wiese
67eb36413a MDL-43930 Assign: Fix unit tests.
The tests were expecting exact log data to match, I changed the data
but missed updating the test.
2014-03-05 12:21:27 +08:00
Dan Poltawski
baa1c69408 Merge branch 'MDL-43930-master' of git://github.com/damyon/moodle 2014-03-05 11:22:35 +08:00
Dan Poltawski
cb34249fe0 Merge branch 'wip-MDL-44321-master-fix2' of git://github.com/marinaglancy/moodle 2014-03-05 11:08:31 +08:00
Marina Glancy
f2f7065895 MDL-44321 events: make sure the full object is passed to add_record_snapshot in book 2014-03-05 11:01:19 +08:00
Tim Hunt
2fa19cfe82 MDL-43749 quiz editing: fix adding the first question.
The first question added to a quiz was getting slot number 2, not 1.
2014-03-04 17:57:47 +00:00
Dan Poltawski
81cbf283e8 Merge branch 'wip-MDL-44258-master' of git://github.com/marinaglancy/moodle 2014-03-04 17:49:06 +08:00