Commit Graph

13606 Commits

Author SHA1 Message Date
Ankit Agarwal 1efa930202 MDL-42604 scorm: Fix division by zero warnings in error logs 2013-10-30 11:01:04 +08:00
Tim Hunt ef37c13e29 MDL-42309 typo: fix reponse -> response throughout Moodle. 2013-10-15 13:50:05 +11:00
Damyon Wiese f72e3fbbf2 MDL-34586 assignment - fix whitespace 2013-10-14 14:29:22 +08:00
Damyon Wiese 8afe4de645 Merge branch 'MDL-34586-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE 2013-10-14 14:29:14 +08:00
Damyon Wiese 7643bd4ca9 Merge branch 'MDL-34612-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE 2013-10-14 14:12:23 +08:00
Eloy Lafuente (stronk7) 5864eb6017 Merge branch 'wip-mdl-41843-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE 2013-10-14 00:15:29 +02:00
Marina Glancy 7bd19d562d Merge branch 'MDL-37153_24' of https://github.com/pauln/moodle into MOODLE_24_STABLE 2013-10-10 12:53:27 +11:00
Charles Fulton b6a84b6fdd MDL-34612 forum: convert default format value during restore 2013-10-08 20:05:35 -07:00
Paul Nicholls 3e2821e6f5 MDL-37153 - assign: Obey grade display settings in submission status
The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
2013-10-09 16:03:50 +13:00
Eloy Lafuente (stronk7) 6257097a3f Merge branch 'MDL-42069_24' of https://github.com/appalachianstate/moodle into MOODLE_24_STABLE 2013-10-08 21:27:27 +02:00
Charles Fulton cd35f43eac MDL-34586 assignment: convert default format value during restore 2013-10-08 09:48:56 -07:00
Rajesh Taneja 788105dd3d MDL-41843 IMS-LTI: Fixed exception namespace 2013-10-08 15:56:52 +08:00
Dongsheng Cai 80cee53996 MDL-41843 Uses OAuthException in moodle\mod\lti namespace 2013-10-08 15:56:52 +08:00
Damyon Wiese dd94734d9a Merge branch 'MDL-41520-MOODLE_24_STABLE-mod_lti-completion-view' of github.com:Trii/moodle into MOODLE_24_STABLE 2013-10-08 14:34:49 +08:00
Dan Poltawski 925ec67b22 Merge branch 'MDL-38655_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE 2013-10-08 13:21:44 +08:00
Marina Glancy b159b57207 Merge branch 'MDL-25176_m24' of https://github.com/merrill-oakland/moodle into MOODLE_24_STABLE 2013-10-08 12:04:12 +11:00
Joshua Johnston d276541169 MDL-41520 LTI: Does not track page views for completion 2013-10-04 09:47:14 -04:00
Fred Woolard 72b266d54e MDL-42069 mod_quiz add lastname sort for manual grading 2013-10-04 09:09:00 -04:00
Eric Merrill 236a2fca9b MDL-25176 forum Redirects for new discussions shouldn't use SESSION
Unset the session->fromdiscussion var, because we know that the correct
path will be computed later.
2013-10-01 21:19:17 -04:00
Tim Lock a7c5e2d24d MDL-41996: Don't show the Review Attempt link if no attempts exist. 2013-10-01 20:05:12 +02:00
Sam Hemelryk a7fd949571 Merge branch 'MDL-41894-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-10-01 13:44:44 +13:00
Marina Glancy 29d526b495 Merge branch 'MDL-41954-workshop-zero-variance_24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-09-30 16:11:44 +10:00
Adam Olley 6e3013be7c MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads 2013-09-27 12:45:47 +09:30
David Mudrák 2ccad8f967 MDL-41954 Fix the grade for assessment calculation in the Workshop module
In a pretty rare case of zero variance of received assessments, the "distance"
of the evaluated assessment from the referential ("best") one was not increased
regardless it's actual value. This led to higher grades for assessments in
certain situations (see the tracker for a particular example).
2013-09-25 02:03:02 +02:00
Marina Glancy 8492c192af Merge branch 'MDL-41929_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE 2013-09-24 21:33:12 +10:00
Ankit Agarwal 654f0c0cf7 MDL-41894 feedback: Remove unused code, which is generating warnings 2013-09-24 15:08:33 +08:00
Tim Hunt 768779972e MDL-41929 quiz statistics, overall stats not displayed. 2013-09-23 18:07:25 +01:00
Marina Glancy b0124c9703 Merge branch 'MDL-41833-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE 2013-09-23 19:18:05 +10:00
Marina Glancy 47ba8d481e Merge branch 'wip-MDL-41772-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-09-23 14:41:22 +10:00
Ankit Agarwal 5011fb91ff MDL-41833 feedback: Fix setType() warning when deleting a response in feedback 2013-09-17 15:30:07 +08:00
Eloy Lafuente (stronk7) 657beb8924 Merge branch 'MDL-41595_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE 2013-09-17 02:15:42 +02:00
Sam Hemelryk 1081b8ec84 Merge branch 'm24_MDL-37524' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-09-16 10:38:25 +12:00
Dan Marsden 9963b0b6a6 MDL-37524 SCORM: mode not calculated correctly. 2013-09-16 10:13:47 +12:00
Henning Bostelmann 0137a13d55 MDL-29987 File resource: fix problem with PDF display on mobile devices
Setting the default display option for PDF files from DISPLAY_EMBED to DISPLAY_OPEN
2013-09-13 10:28:41 +01:00
Adrian Greeve 254bf485f1 MDL-41772 - mod_data: Fixed database_module comments not being restored. 2013-09-13 15:35:32 +08:00
Damyon Wiese 43e1ed2cf3 MDL-37804 assign: Return proper notice when submissions closed.
MDL-38267 was returning the html page when it should have been adding to the list
of notices and returing false.

Conflicts:

	mod/assign/locallib.php
2013-09-12 10:38:45 +08:00
Dan Poltawski 18cbf0db95 Merge branch 'MDL-38267-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-09-11 12:00:15 +08:00
Dan Poltawski 5e99c1f9a1 Merge branch 'MDL-40631-24' of git://github.com/damyon/moodle into MOODLE_24_STABLE 2013-09-10 14:32:00 +08:00
Damyon Wiese b604cb81e4 Merge branch 'wip-mdl-23335-m24' of https://github.com/deraadt/moodle into MOODLE_24_STABLE 2013-09-10 12:56:53 +08:00
Sam Hemelryk a7f3f08722 MDL-32862 backup: fixed missing global 2013-09-10 10:40:11 +12:00
Sam Hemelryk 5db72d63c5 Merge branch 'wip-MDL-32862-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE 2013-09-10 09:38:23 +12:00
Sam Hemelryk d58d0239db Merge branch 'MDL-29378-survey-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-09-10 09:35:50 +12:00
David Mudrák e523503fb8 MDL-29378 Fix the recent string modification
But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.
2013-09-09 11:22:14 +02:00
Dan Poltawski 4da2fefa4d Merge branch 'MDL-37804_24' of github.com:recreate/moodle into MOODLE_24_STABLE 2013-09-09 17:13:49 +08:00
Mary Evans 0f85e6ba0b MDL-41595 mod_book: Book mod does not add TOC to default region 2013-09-09 09:52:43 +01:00
Damyon Wiese 5a36d6292d Merge branch 'm24_MDL-31232' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE 2013-09-09 11:13:27 +08:00
Sam Hemelryk eae5890112 Merge branch 'MDL-38794_24' of https://github.com/prateeksachan/moodle into MOODLE_24_STABLE 2013-09-09 11:12:11 +12:00
Sam Hemelryk 1fdc20cbdb Merge branch 'MDL-29378-survey-24' of git://github.com/mudrd8mz/moodle into MOODLE_24_STABLE 2013-09-09 10:48:49 +12:00
Adrian Greeve 7ed78289b5 MDL-32862 - Backup: Rewriting resource_old links on backup. 2013-09-06 14:49:08 +08:00
David Mudrák f257805573 MDL-29378 Code cleanup in the Survey module
While working on the issue, I spotted these two places that were worth of
fixing. The first one is a trivial reminiscence of a previous refactoring,
after which both branches of the if() statement became equal.

The second one is actually a typo as in theory it could generate unexpected
input fields with the name like qPP1. Luckily this never happened due to the
way how survey questions are hardcoded (there are no questions with the type 2
that would require two answers to their subquestions).
2013-09-05 00:09:59 +02:00