17137 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
d6ed5f8230 MDL-51836 mod_forum: Fix CASE statement breaking mssql & oracle. 2015-10-19 23:14:35 +02:00
David Monllao
7d45554019 Merge branch 'MDL-50724' of git://github.com/andrewhancox/moodle 2015-10-19 17:21:58 +08:00
Adam Olley
1e36665719 MDL-50993 forum: Display timed posts/discussions in a logical order
Users that don't have permission to view timed posts outside of the release
time frame will have discussions that have entered the visible frame appear
in an odd order from their point of view on the discussion list.

Example:
Discussion 1, modified 2015-01-01, hidden till 2015-01-03
Discussion 2, modified 2015-01-02, not hidden

The standard 'modified descending' order means that D2 is listed at the top
even after D1 becomes visible. When scanning the list of discussions for new
posts, the user could be tricked into thinking they'd already read it.

This fix instead takes into account the release time of the discussion when
timed forum posts are enabled.

I opted to use CASE statements to handle this instead of GREATEST as the
latter is not supported by MSSQL.
2015-10-19 04:04:58 +00:00
Andrew Nicols
d8bf49f81e MDL-51629 mod_survey: Coding style violation fix 2015-10-16 11:10:38 +08:00
Andrew Nicols
5762c92fcf Merge branch 'MDL-51629-master' of git://github.com/jleyva/moodle 2015-10-16 10:56:19 +08:00
Andrew Nicols
62029ba7f4 Merge branch 'MDL-51565-master' of git://github.com/jleyva/moodle 2015-10-16 09:35:23 +08:00
Juan Leyva
55dca60f45 MDL-51629 mod_survey: New WS mod_survey_submit_answers 2015-10-15 16:17:23 +02:00
Juan Leyva
f772b5159c MDL-51629 mod_survey: New WS mod_survey_get_questions 2015-10-15 16:17:22 +02:00
Juan Leyva
75516809d2 MDL-51629 mod_survey: New Web Service mod_survey_view_survey 2015-10-15 16:05:05 +02:00
Juan Leyva
a2926eb3e6 MDL-51629 mod_survey: New WS mod_survey_get_surveys_by_courses 2015-10-15 16:05:05 +02:00
Juan Leyva
66a582d0b3 MDL-51703 mod_survey: Trigger response_submitted event in correct place 2015-10-15 13:59:15 +01:00
Andrew Nicols
a308dc15c9 Merge branch 'MDL-51594-master' of git://github.com/jleyva/moodle 2015-10-15 14:19:10 +08:00
Damyon Wiese
bb6ca6f360 MDL-51260 tags: Update the tags form element to use the autocomplete field
AMOS BEGIN
    REM [interestslist_help,moodle] Commas are no longer required
    REM [entertags,tag] Commas are no longer required
    REM [othertags,tag] Commas are no longer required
AMOS END
2015-10-15 12:03:35 +08:00
Juan Leyva
bb3500c6d4 MDL-51594 webservice: Fix typos in choice and SCORM documentation 2015-10-14 14:29:12 +02:00
Damyon Wiese
ab848fea81 MDL-48861 assign: Make the requires grading filter consistent
Consistently include submissions with a null grade (see MDL-47694).
2015-10-13 14:52:50 +08:00
Damyon Wiese
fb6bae3eae MDL-48861 assign: Fix unit tests and behat tests
The tests were not working with the change to the needs grading filter.
2015-10-13 12:59:13 +08:00
David Monllao
ee58df52da Merge branch 'MDL-46455-master-20151012' of git://github.com/damyon/moodle 2015-10-13 11:42:40 +08:00
Andrew Nicols
5e2547612f Merge branch 'MDL-51302-master' of git://github.com/danpoltawski/moodle 2015-10-13 11:33:23 +08:00
Andrew Nicols
a6c0702884 Merge branch 'wip-MDL-49515-master' of git://github.com/abgreeve/moodle 2015-10-13 11:05:05 +08:00
Andrew Nicols
3648d7963a Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle 2015-10-13 10:13:43 +08:00
Adrian Greeve
59d20e706a MDL-49515 libraries: Update to editpdf/classes/pdf.php
This updates fpdi_bridge to extend our Moodle pdf class
as was done before.
2015-10-13 09:28:16 +08:00
Dan Poltawski
37029775f9 Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle 2015-10-12 16:53:18 +01:00
Juan Leyva
5b587c7570 MDL-51565 webservice: Fix return types definitions
This commit also format the activity name via external_format_string in
some cases
2015-10-12 13:24:49 +02:00
Andrew Hancox
ce449f6307 MDL-50724 mod_assign: show issues with groups in grading table
Where a user is in multiple or no groups show and group membership
is required show an appropriate error in the gradding table rather
than 'Default Group'
2015-10-12 12:04:28 +01:00
David Monllao
fd47ef44bd Merge branch 'MDL-51637-master' of git://github.com/jleyva/moodle 2015-10-12 17:08:27 +08:00
Juan Leyva
4f3a2d2103 MDL-51637 forum: Make forum_get_discussions_paginated return group post 2015-10-12 10:08:17 +02:00
Andrew Nicols
fe26df5ec9 MDL-49682 mod_forum: Correct arguments to format_message_text
This feeds straight into context_module::instance() and I was inadvertantly
using the forum->id, rather than the cm->id.
2015-10-12 14:54:34 +08:00
David Monllao
1c94483300 MDL-49682 mod_forum: Bump version for caches 2015-10-12 14:07:55 +08:00
Andrew Nicols
317938393c MDL-49682 mod_forum: Build forum email templates 2015-10-12 13:26:29 +08:00
Mark Nelson
607021c14b MDL-46455 events: added more mapping
Also fixed a few bugs.
2015-10-11 18:52:36 -07:00
Mark Nelson
0bfafc5ba0 MDL-46455 mod_*: added restore mapping to events 2015-10-11 18:14:57 -07:00
Mark Nelson
ef15eae433 MDL-46455 mod_*: added additional mapping to be used by events 2015-10-11 18:14:56 -07:00
Dan Poltawski
b96da4eaef MDL-51302 scorm: do not use invalid course urls
Previous behaviour of setting an empty sectionid was incorrect and we
were doing work which course_get_url() does for us.
2015-10-09 09:04:35 +01:00
Damyon Wiese
64f6ef1f3a MDL-48861 mod_assign: use >= for requires grading filter
If the grade and submission were modified at exactly the same time,
assume that this means the grade was automatically created for the submission
and is not a real grade from a teacher interaction.
2015-10-09 15:08:06 +08:00
Adrian Greeve
858d457d61 MDL-49515 libraries: Update FPDI to 1.5.4 2015-10-09 14:46:12 +08:00
Adam Olley
a7d95e4e65 MDL-51285 mod_forum: Posts all need to have different stamps 2015-10-08 12:21:36 +08:00
Eloy Lafuente (stronk7)
b82a60d1a7 Merge branch 'MDL-51624-master' of git://github.com/jleyva/moodle 2015-10-08 01:18:39 +02:00
Eloy Lafuente (stronk7)
11e2efe941 Merge branch 'MDL-51566-master' of git://github.com/jleyva/moodle 2015-10-08 00:24:06 +02:00
Juan Leyva
4bed1682bb MDL-51624 mod_lti: New Web Service mod_lti_view_lti 2015-10-07 14:54:18 +02:00
Juan Leyva
c4c838ae82 MDL-51624 mod_lti: Rename function lti_view to lti_launch_tool 2015-10-07 14:53:00 +02:00
Juan Leyva
4b93c3e342 MDL-51566 mod_choice: New WS mod_choice_delete_choice_responses 2015-10-07 13:58:51 +02:00
Dan Poltawski
cae31eccfd Merge branch 'MDL-50543-master' of git://github.com/jleyva/moodle 2015-10-07 11:36:21 +01:00
David Monllao
6be0240df5 Merge branch 'MDL-51567-master' of git://github.com/jleyva/moodle 2015-10-07 15:34:23 +08:00
rajesh Taneja
ac40984241 MDL-50524 behat: Fixed multiple when then and use of generator 2015-10-07 14:47:01 +08:00
David Monllao
de27cf6a3f Merge branch 'wip-mdl-51285' of git://github.com/rajeshtaneja/moodle 2015-10-07 11:22:56 +08:00
Adrian Greeve
33a2512acd MDL-49028 mod_wiki: Fix for reseting pages and tags
This will ensure that both pages and tags will be
removed when all the reset options for the wiki are
selected.
2015-10-07 10:03:02 +08:00
Eloy Lafuente (stronk7)
cb171682ff Merge branch 'MDL-49823-master' of git://github.com/jleyva/moodle 2015-10-07 01:08:52 +02:00
Andrew Hancox
08a54173d8 MDL-50526 mod_assign: Highlight error message when user has no group
If I set the "Require group to make submission" setting in an assignment
activity to yes, students who are not in any group are prevented from submitting
their assignment and are presented a warning instead that they should contact
their teacher. This message is now presented in an alert box.
2015-10-06 16:41:25 +01:00
Dan Poltawski
a059ef2e9f MDL-50524 assign: improve method visibility and upgrade.txt 2015-10-06 16:32:57 +01:00
Dan Poltawski
1a5f8df5c0 Merge branch 'MDL-50524' of https://github.com/andrewhancox/moodle 2015-10-06 16:32:57 +01:00