1640389bcf
Merge branch 'MDL-29441-24' of git://github.com/andrewnicols/moodle into MOODLE_24_STABLE
2013-10-22 13:21:27 +08:00
a70c9434d7
Merge branch 'MDL-26170_rss_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE
2013-10-22 15:04:25 +11:00
441b8d6e69
MDL-26170 RSS: fixed RSS cache clearing when items are deleted
2013-10-22 10:59:03 +07:00
de61d99ad1
MDL-31405 Assignment: removed type in time shift reset status
...
Assignment reset shifts time for all assignments and not specific to
assignment type, hence removed type string from reset status
2013-10-22 11:54:23 +08:00
f311ba2714
Merge branch 'MDL-24380-24' of git://github.com/mouneyrac/moodle into MOODLE_24_STABLE
2013-10-22 14:35:09 +11:00
45e4351ade
MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully (it only concerns the alternative chat methods)
2013-10-22 10:45:27 +08:00
a10d621fc5
MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission
2013-10-21 16:51:33 +11:00
bd1fae5fc0
Merge branch 'MDL-26244_url_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE
2013-10-21 11:25:27 +08:00
6e72e0a6aa
MDL-31405 assign: avoid uncessary get_string call
2013-10-21 11:02:45 +08:00
57bafe6ebc
Merge branch 'wip-mdl-31405-m24' of git://github.com/rajeshtaneja/moodle into MOODLE_24_STABLE
2013-10-21 10:59:00 +08:00
b15478526a
MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability
2013-10-16 08:33:39 +07:00
ef37c13e29
MDL-42309 typo: fix reponse -> response throughout Moodle.
2013-10-15 13:50:05 +11:00
f72e3fbbf2
MDL-34586 assignment - fix whitespace
2013-10-14 14:29:22 +08:00
8afe4de645
Merge branch 'MDL-34586-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE
2013-10-14 14:29:14 +08:00
7643bd4ca9
Merge branch 'MDL-34612-24' of https://github.com/mackensen/moodle into MOODLE_24_STABLE
2013-10-14 14:12:23 +08:00
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
16e566b99f
MDL-29441 Chat: Use a valid name for chat popup actions
2013-10-13 20:08:04 +08:00
ca4349c1ce
MDL-31405 Assignment: Fixed date in reset to be called once
...
Conflicts:
mod/assign/locallib.php
2013-10-11 08:59:02 +08:00
267b45e0a1
MDL-31405 Assignment reset issue solved
2013-10-11 08:58:29 +08:00
7bd19d562d
Merge branch 'MDL-37153_24' of https://github.com/pauln/moodle into MOODLE_24_STABLE
2013-10-10 12:53:27 +11:00
b6a84b6fdd
MDL-34612 forum: convert default format value during restore
2013-10-08 20:05:35 -07:00
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
6257097a3f
Merge branch 'MDL-42069_24' of https://github.com/appalachianstate/moodle into MOODLE_24_STABLE
2013-10-08 21:27:27 +02:00
cd35f43eac
MDL-34586 assignment: convert default format value during restore
2013-10-08 09:48:56 -07:00
788105dd3d
MDL-41843 IMS-LTI: Fixed exception namespace
2013-10-08 15:56:52 +08:00
80cee53996
MDL-41843 Uses OAuthException in moodle\mod\lti namespace
2013-10-08 15:56:52 +08:00
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
925ec67b22
Merge branch 'MDL-38655_24' of git://github.com/aolley/moodle into MOODLE_24_STABLE
2013-10-08 13:21:44 +08:00
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
d276541169
MDL-41520 LTI: Does not track page views for completion
2013-10-04 09:47:14 -04:00
72b266d54e
MDL-42069 mod_quiz add lastname sort for manual grading
2013-10-04 09:09:00 -04:00
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
a7c5e2d24d
MDL-41996: Don't show the Review Attempt link if no attempts exist.
2013-10-01 20:05:12 +02:00
a7fd949571
Merge branch 'MDL-41894-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE
2013-10-01 13:44:44 +13:00
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
6e3013be7c
MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads
2013-09-27 12:45:47 +09:30
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
8492c192af
Merge branch 'MDL-41929_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
2013-09-24 21:33:12 +10:00
654f0c0cf7
MDL-41894 feedback: Remove unused code, which is generating warnings
2013-09-24 15:08:33 +08:00
768779972e
MDL-41929 quiz statistics, overall stats not displayed.
2013-09-23 18:07:25 +01:00
b0124c9703
Merge branch 'MDL-41833-m24' of git://github.com/ankitagarwal/moodle into MOODLE_24_STABLE
2013-09-23 19:18:05 +10:00
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
5011fb91ff
MDL-41833 feedback: Fix setType() warning when deleting a response in feedback
2013-09-17 15:30:07 +08:00
657beb8924
Merge branch 'MDL-41595_M24' of git://github.com/lazydaisy/moodle into MOODLE_24_STABLE
2013-09-17 02:15:42 +02:00
1081b8ec84
Merge branch 'm24_MDL-37524' of git://github.com/danmarsden/moodle into MOODLE_24_STABLE
2013-09-16 10:38:25 +12:00
9963b0b6a6
MDL-37524 SCORM: mode not calculated correctly.
2013-09-16 10:13:47 +12:00
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
254bf485f1
MDL-41772 - mod_data: Fixed database_module comments not being restored.
2013-09-13 15:35:32 +08:00
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
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