1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 23:51:15 +01:00

17110 Commits

Author SHA1 Message Date
Andrew Nicols
3648d7963a Merge branch 'MDL-51427-master' of git://github.com/marinaglancy/moodle 2015-10-13 10:13:43 +08:00
Dan Poltawski
37029775f9 Merge branch 'MDL-48861-master' of git://github.com/damyon/moodle 2015-10-12 16:53:18 +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
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
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
Dan Poltawski
f5e68c2892 Merge branch 'MDL-51564-master' of git://github.com/jleyva/moodle 2015-10-06 16:32:55 +01:00
Dan Poltawski
d540aa8c70 Merge branch 'MDL-51615-master' of git://github.com/jleyva/moodle 2015-10-06 16:32:00 +01:00
David Monllao
115ef5f91c MDL-51434 mod_scorm: Including protectpackagedownloads in unit tests 2015-10-06 16:31:35 +01:00
David Monllao
889a9fbba1 MDL-49811 mod_choice: Removing skipresultgraph link
The target of the link is not available after MDL-30816.
2015-10-06 16:26:54 +01:00
David Monllao
7da61f95ce Merge branch 'MDL-49811_master' of git://github.com/jinhofer/moodle 2015-10-06 16:26:54 +01:00
David Monllao
86c48d177e Merge branch 'master-MDL-49750' of git://github.com/jojoob/moodle 2015-10-06 16:26:53 +01:00
David Monllao
c6ce30bb3f Merge branch 'MDL-51434-master' of git://github.com/jleyva/moodle 2015-10-06 16:26:53 +01:00
Juan Leyva
9748791ba8 MDL-51564 webservice: Review the use of external format_string 2015-10-06 14:00:45 +02:00
jinhofer
0b7856efbe MDL-49811 lib: Added js to skiplinks
I have added a JS module to handle skiplinks to send
the focus to the end of the block. This improves the function
and allows the user to better tab through the page.
2015-10-05 06:17:58 -05:00
Johannes Burk
8c3b27d4b2 MDL-49750 mod_data: fix updating file/picture fields breaks references
Use file_save_draft_area_files on file/picture update and
set content to null if file was removed.
2015-10-05 11:42:53 +02:00
Adrian Greeve
30836b17da MDL-49028 mod_wiki: Fully reset wiki pages.
All the wiki pages as well as comments and tags
can now be reset.

A thank you to Daniel Kosinski and Pascal Maury for
providing patches for this improvement.
2015-10-05 09:48:38 +08:00
Juan Leyva
dfcdec1254 MDL-50543 mod_lti: New WS mod_lti_get_ltis_by_courses 2015-10-04 21:19:18 +02:00
Juan Leyva
d5ded9e72d MDL-51615 mod_lti: New Web Service mod_lti_get_tool_launch_data 2015-10-04 21:19:06 +02:00
Juan Leyva
77496aa556 MDL-51567 mod_scorm: Return warnings for invalid attempt numbers
In the external function get_scorm_sco_tracks
2015-10-04 21:15:21 +02:00
Juan Leyva
ae67efa883 MDL-51615 mod_lti: New Web Service mod_lti_get_tool_launch_data 2015-10-03 08:25:28 +02:00
Juan Leyva
8b06acf76c MDL-51434 mod_scorm: New global setting for enabling package downloads 2015-10-01 18:16:01 +02:00
Juan Leyva
d85bedf796 MDL-49823 webservice: Support gravatar profile images 2015-10-01 09:36:31 +02:00
David Monllao
6dbb46ec0f MDL-46710 mod_lti: Removing duplicated generated events
Event generation and completion should be generated only once.
2015-10-01 11:55:38 +08:00
Eloy Lafuente (stronk7)
c75b891ba7 Merge branch 'MDL-49821-master-master' of git://github.com/jleyva/moodle 2015-10-01 01:26:58 +02:00
Eloy Lafuente (stronk7)
9fb434a618 Merge branch 'wip-mdl-51266' of https://github.com/rajeshtaneja/moodle 2015-09-30 20:34:33 +02:00
Adam Olley
dba0fdc2bc MDL-9070 forum: Add margin in rtl mode to timed post icon
As the icon has a float on it to move it to the right, a margin-top
needs to be applied to keep it aligned the same as in ltr.
2015-09-30 12:27:12 +08:00
David Monllao
8e31c017f2 MDL-9070 mod_forum: Reducing it to a single scenario 2015-09-30 10:09:03 +08:00
David Monllao
15791dffac Merge branch 'MDL-9070' of git://github.com/aolley/moodle 2015-09-30 09:29:55 +08:00
Eloy Lafuente (stronk7)
d4e65df215 Merge branch 'MDL-49143-master' of git://github.com/cameron1729/moodle
Note: Fixed small bug in unit test.
2015-09-30 03:22:26 +02:00
Adam Olley
05f1455b35 MDL-9070 forum: Show timed post display period
This adds the following changes when viewing a list of discussions and
forum_enabletimedposts is turned on.

* Discussions a student wouldnt see right now are dimmed (timestart in
  future or timeend in the past).
* A icon appears next to the discussion subject, the tooltip for this
  icon displays the display start and/or end time. This only appears for
  the user that made the discussion or has permission to
  viewhiddentimedposts.

These two changes achieve a couple of important things, namely, teachers
will not mistakenly think their students can see a discussion when
viewing the list if they've later forgot that they set a time limit on
it (or indeed if someone else put it on their discussion without them
realising). Additionally it makes it easy to see from the list when
different discussions are set to be released without having to go in and
edit them to find out.

Change-Id: Ia1818b33c00adae0dad72df8e170a078fb66cd76
2015-09-30 09:18:31 +09:30
Dan Poltawski
5fc9fdd54e Merge branch 'MDL-51402' of git://github.com/timhunt/moodle 2015-09-29 20:54:45 +01:00
Dan Poltawski
747554d335 Merge branch 'MDL-50658' of https://github.com/spvickers/moodle 2015-09-29 16:50:45 +01:00