Commit Graph

20348 Commits

Author SHA1 Message Date
Juan Leyva 91a12bc64c MDL-49796 assign: Unit texts for view_grading_table 2015-07-13 09:25:24 +02:00
Juan Leyva e0d6d10a83 MDL-49796 assign: New external function view_grading_table 2015-07-13 09:25:23 +02:00
Paul Nicholls 8ff7531ed7 MDL-43709 Forum: Reset forums not working with multiple forum types
The SQL being generated from the selected forum types on the course reset
form was using AND, resulting in never matching anything if more than one
forum type was selected for resetting (as each forum can only have one
type).  This should use $DB->get_in_or_equal() to generate sensible SQL.
2015-07-13 16:19:08 +12:00
Eloy Lafuente (stronk7) b164e2ec30 Merge branch 'MDL-50049-master' of git://github.com/ankitagarwal/moodle 2015-07-09 20:24:13 +02:00
Dan Marsden d1673b8f6c MDL-49647 mod_scorm: correct escaping of javascript content. 2015-07-09 16:35:20 +12:00
Marina Glancy fc62987c84 MDL-49618 forum: apply format_string 2015-07-09 08:24:08 +08:00
Eloy Lafuente (stronk7) 17d47fa5aa Merge branch 'MDL-50489-master' of git://github.com/jleyva/moodle 2015-07-07 19:12:12 +02:00
Eloy Lafuente (stronk7) cc623a384f Merge branch 'MDL-49185-master' of git://github.com/lameze/moodle 2015-07-07 16:59:19 +02:00
Dan Poltawski f79860257a MDL-50749 js: add some TODOs to some small hacks 2015-07-07 08:48:32 +01:00
Juan Leyva 039c81f098 MDL-50489 forum: Handle qanda forums in get_forum_discussions_paginated
I removed the last qanda checks in forum_user_can_see_discussion because they are not necessary and
they make the external function fail.

A user in a qanda forum can always see a discussion (he needs to see the discussion to be able to reply).
What he cannot see are the other user posts unless he has replied to the discussion once and the edition period
(usually 30 minutes) has ended.

Note also that forum_user_can_see_discussion was originally only used when displaying forums in blog format
in order to display the button show more or not, this is the reason this wasn't detected before.
2015-07-02 10:55:40 +02:00
Dan Poltawski 2606aecc3b Merge branch 'MDL-33765_master_offset' of git://github.com/markn86/moodle 2015-06-30 11:32:47 +02:00
Dan Marsden 476e97f280 MDL-50614 mod_scorm: Improve validation on currentorg 2015-06-30 10:12:51 +08:00
Mark Nelson eabbc98c78 MDL-50220 mod_forum: added missing capability check 2015-06-29 18:43:09 +02:00
Ankit Agarwal 2149326b8c MDL-50049 deprecation: Remove usage of deprecated api and cleanup 2015-06-29 17:15:50 +05:30
David Monllao 489878ad09 Merge branch 'MDL-50708_master' of git://github.com/nadavkav/moodle 2015-06-29 15:57:27 +08:00
Martin Mastny 57a1f4fc65 MDL-33765 mod_glossary: Concept in ajax request not linking to itself 2015-06-28 21:44:11 -07:00
Nadav Kavalerchik e51bdc0bcc MDL-50708 SCORM: Right align menu item folder icon, when in RTL mode. 2015-06-27 23:49:11 +03:00
Paul Nicholls a673650477 MDL-50699 Lesson: "Link to next activity" empty until Lesson saved
Due to a logic bug, the "Link to next activity" dropdown was empty (only
contains the "None" option) until the Lesson had been saved.  This minor
change allows a "next activity" to be specified when initially creating
the Lesson whilst still preventing the user from choosing the Lesson as its
own next activity.
2015-06-26 16:16:23 +12:00
Marc Català 90faa6ae9c MDL-50652 workshop: Workshop module allows duplicated ID number 2015-06-25 14:28:10 +02:00
spvickers 01f38dd0e2 MDL-49185 mod_lti: Check for all capabilities
Added check for explicit and implicit enabled capabilities when parsing
a custom parameter.
2015-06-23 10:22:41 +08:00
Eloy Lafuente (stronk7) 26adb614ae Merge branch 'MDL-50171-master' of git://github.com/jleyva/moodle 2015-06-23 01:42:47 +02:00
David Monllao 15e6543a5f Merge branch 'MDL-50622-master-enfix' of git://github.com/mudrd8mz/moodle 2015-06-22 17:43:56 +08:00
Helen Foster ddef7f7848 MDL-50622 lang: Merge English strings from the en_fix language pack 2015-06-19 12:11:33 +02:00
Juan Leyva 3c4d2965de MDL-50171 data: Fixed incorrect text formatting in external functions 2015-06-19 09:43:51 +02:00
Andrew Nicols d04e408e38 Merge branch 'php7_reserved_words' of git://github.com/tlevi/moodle 2015-06-18 07:10:38 +02:00
Andrew Nicols 7512af87d4 Merge branch 'MDL-50380-master' of git://github.com/lameze/moodle 2015-06-18 07:10:37 +02:00
Dan Poltawski 846dade5ab Merge branch 'MDL-49098-master' of git://github.com/xow/moodle 2015-06-15 12:12:07 +01:00
Tony Levi 303936aa57 MDL-50453 core: Replace reserved word usage in progress\null (PHP7) 2015-06-15 12:21:27 +09:30
Eloy Lafuente (stronk7) 22214c22d1 Merge branch 'MDL-49882' of git://github.com/jmvedrine/moodle 2015-06-10 01:39:17 +02:00
Eloy Lafuente (stronk7) db91aae8f4 Merge branch 'MDL-50145_master' of git://github.com/markn86/moodle 2015-06-09 20:40:56 +02:00
Eloy Lafuente (stronk7) 094356a954 Merge branch 'wip-mdl-50179' of https://github.com/rajeshtaneja/moodle 2015-06-09 20:32:10 +02:00
Dan Poltawski cc9806146d Merge branch 'MDL-43731' of https://github.com/ramdesh/moodle 2015-06-09 14:56:52 +01:00
Mark Nelson 1254e48f26 MDL-50145 mod_lesson: added behat test for multiple dashboard lessons 2015-06-09 00:49:04 -07:00
Mark Nelson 2c4b43d9b2 MDL-50145 mod_lesson: fixed issue with duplicate values 2015-06-08 22:09:25 -07:00
Rajesh Taneja 2835eee63b MDL-50179 lesson: Get student/attempts only when showing overview 2015-06-09 09:34:10 +08:00
Eloy Lafuente (stronk7) d3c2a653a8 Merge branch 'MDL-48470-master' of git://github.com/ankitagarwal/moodle 2015-06-08 19:55:34 +02:00
Juan Leyva b1aa7dfac3 MDL-50493 forum: Handle correctly qanda forums in get_discussion_posts 2015-06-06 00:00:56 +02:00
Eloy Lafuente (stronk7) 0eee70506e Merge branch 'MDL-47995-master' of git://github.com/lameze/moodle 2015-06-03 11:10:41 +02:00
yashvardhanpatel07 3da723d548 MDL-49098 feedback: Fix completion message language strings
With contributions from John Okely
2015-06-03 16:47:52 +08:00
Eloy Lafuente (stronk7) 1df669e7bf Merge branch 'MDL-50228' of git://github.com/timhunt/moodle 2015-06-03 01:29:46 +02:00
Eloy Lafuente (stronk7) 23abab38e7 Merge branch 'MDL-50198' of git://github.com/timhunt/moodle 2015-06-03 01:19:42 +02:00
Dan Poltawski 4bbb035830 Merge branch 'MDL-49905_postform_timeoption' of https://github.com/kylemn/moodle 2015-06-02 16:06:45 +01:00
Dan Poltawski 09bc038674 Merge branch 'MDL-49793-master' of git://github.com/jleyva/moodle 2015-06-02 14:01:05 +01:00
Dan Poltawski 356fd5bae7 Merge branch 'm29_MDL-49628a' of https://github.com/totara/moodle 2015-06-02 13:54:01 +01:00
Dan Poltawski 290b156276 Merge branch 'MDL-49323-master' of git://github.com/nmoller/moodle 2015-06-02 13:23:37 +01:00
Marina Glancy 29645f9745 MDL-26501 mod_glossary: fixes to tabs management 2015-06-02 11:25:27 +01:00
Nivedita Setru 223d6cb3bf MDL-26501 mod_glossary: Allow to specify visible tabs 2015-06-02 11:25:26 +01:00
Nelson Moller b73eed1249 MDL-49323 mod_assign: Fixed numeric validation in grade form.
The behat test for another decimal separator was incorporated.
2015-06-01 10:54:12 -04:00
Dan Poltawski 825be82b8a MDL-50322 forum: add basic split post behat coverage
Also bump version for autoloading new class.
2015-06-01 14:59:06 +01:00
Juan Leyva 752036b826 MDL-49793 url: New Web Service mod_url_view_url 2015-06-01 13:46:22 +02:00