David Monllao [Tue, 15 Sep 2015 08:58:54 +0000 (16:58 +0800)]
Merge branch 'MDL-50966-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 15 Sep 2015 07:25:46 +0000 (15:25 +0800)]
Merge branch 'MDL-50983-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 15 Sep 2015 06:26:57 +0000 (14:26 +0800)]
Merge branch 'MDL-50921-master' of git://github.com/ryanwyllie/moodle
David Monllao [Tue, 15 Sep 2015 05:43:45 +0000 (13:43 +0800)]
MDL-51048 backup: Removing unnecessary var
David Monllao [Tue, 15 Sep 2015 05:40:55 +0000 (13:40 +0800)]
Merge branch 'MDL-51048' of git://github.com/timhunt/moodle
Andrew Nicols [Tue, 15 Sep 2015 05:05:30 +0000 (13:05 +0800)]
Merge branch 'MDL-51290-master' of git://github.com/cameron1729/moodle
Damyon Wiese [Tue, 15 Sep 2015 04:21:22 +0000 (12:21 +0800)]
MDL-50783 ajax: Default for ajax calls to requirelogin=true
David Monllao [Tue, 15 Sep 2015 03:21:22 +0000 (11:21 +0800)]
Merge branch 'MDL-51008-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Tue, 15 Sep 2015 03:01:50 +0000 (11:01 +0800)]
Merge branch 'MDL-50982-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 15 Sep 2015 02:07:55 +0000 (10:07 +0800)]
Merge branch 'MDL-51147' of git://github.com/timhunt/moodle
David Monllao [Tue, 15 Sep 2015 01:58:08 +0000 (09:58 +0800)]
Merge branch 'm30_MDL-51363_Fix_Default_Settings_1x_Restore' of git://github.com/scara/moodle
Conflicts:
mod/scorm/version.php
Andrew Nicols [Tue, 15 Sep 2015 00:33:06 +0000 (08:33 +0800)]
Merge branch 'MDL-50981-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Tue, 15 Sep 2015 00:23:10 +0000 (08:23 +0800)]
Merge branch 'MDL-51017-master' of git://github.com/jleyva/moodle
Matteo Scaramuccia [Wed, 9 Sep 2015 14:26:47 +0000 (16:26 +0200)]
MDL-51363 SCORM: fixed default settings on restoring 1.x backups
Cameron Ball [Wed, 9 Sep 2015 02:55:15 +0000 (10:55 +0800)]
MDL-51290 user: Expand picture section in profile by default
Juan Leyva [Thu, 6 Aug 2015 12:33:14 +0000 (14:33 +0200)]
MDL-51017 mod_scorm: New WS mod_scorm_get_scorm_attempt_count
David Monllao [Mon, 14 Sep 2015 08:18:01 +0000 (16:18 +0800)]
Merge branch 'wip-mdl-51101' of git://github.com/rajeshtaneja/moodle
Andrew Nicols [Mon, 14 Sep 2015 07:52:42 +0000 (15:52 +0800)]
Merge branch 'MDL-50783-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 14 Sep 2015 07:43:26 +0000 (15:43 +0800)]
MDL-50994 mod_forum: Correct docs for discussion WS
Andrew Nicols [Mon, 14 Sep 2015 07:40:05 +0000 (15:40 +0800)]
Merge branch 'MDL-50994-master' of git://github.com/jleyva/moodle
Damyon Wiese [Mon, 14 Sep 2015 07:09:38 +0000 (15:09 +0800)]
MDL-50783 ajax: Properly deprecate the is_allowed_from_ajax() methods.
Damyon Wiese [Mon, 14 Sep 2015 06:00:23 +0000 (14:00 +0800)]
MDL-50783 ajax: Add specific check for NO_MOODLE_COOKIES
If loginrequired is set for a webservice - NO_MOODLE_COOKIES cannot
be true - or it is a coding error.
Damyon Wiese [Thu, 16 Jul 2015 06:14:33 +0000 (14:14 +0800)]
MDL-50783 Ajax: Configure how to call a webservice through db/service.php
Now the db/service.php array can contain these extra keys to provide information
on how a webservice may be called:
'ajax' => true (Default is false)
Replaces the xx_is_allowed_from_ajax callback.
'loginrequired' => false (Default is true)
Means that this webservice can be called through lib/ajax/service-nosession.php
which sets NO_MOODLE_COOKIES to true (faster). This is only safe for webservices returning
static public data (e.g. get_string).
Andrew Nicols [Mon, 14 Sep 2015 07:07:31 +0000 (15:07 +0800)]
Merge branch 'MDL-50980-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 14 Sep 2015 06:14:09 +0000 (14:14 +0800)]
Merge branch 'MDL-51170-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 14 Sep 2015 06:00:52 +0000 (14:00 +0800)]
Merge branch 'MDL-50782-master' of git://github.com/damyon/moodle
David Monllao [Mon, 14 Sep 2015 05:58:55 +0000 (13:58 +0800)]
Merge branch 'MDL-51191-master' of git://github.com/StudiUM/moodle
David Monllao [Mon, 14 Sep 2015 05:31:06 +0000 (13:31 +0800)]
Merge branch 'MDL-51205_pix_style' of git://github.com/andyjdavis/moodle
David Monllao [Mon, 14 Sep 2015 05:16:52 +0000 (13:16 +0800)]
Merge branch 'MDL-51296-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 14 Sep 2015 05:06:38 +0000 (13:06 +0800)]
Merge branch 'MDL-51253_forum_urls' of git://github.com/BenKelada/moodle
Ben Kelada [Mon, 31 Aug 2015 04:12:42 +0000 (14:12 +1000)]
MDL-51253 forum: fix urls for exceptions and redirects
Jun Pataleta [Tue, 8 Sep 2015 02:22:01 +0000 (10:22 +0800)]
MDL-51296 blog: Added title that reflects the blog's editing mode
David Monllao [Mon, 14 Sep 2015 02:04:08 +0000 (10:04 +0800)]
Merge branch 'MDL-51217-master' of git://github.com/lucisgit/moodle
David Monllao [Mon, 14 Sep 2015 01:38:56 +0000 (09:38 +0800)]
Merge branch 'MDL-51232' of git://github.com/jinuabraham/moodle
Mark Nelson [Fri, 7 Aug 2015 16:16:12 +0000 (11:16 -0500)]
MDL-51051 core_grades: 'Categories and items' => 'Gradebook setup'
Jean-Philippe Gaudreau [Mon, 24 Aug 2015 21:05:44 +0000 (17:05 -0400)]
MDL-51191 assign: Optimizing slow SQL query for MySQL
Juan Leyva [Tue, 4 Aug 2015 15:43:25 +0000 (17:43 +0200)]
MDL-50994 mod_forum: New Web Service mod_forum_add_discussion
Juan Leyva [Fri, 31 Jul 2015 09:28:06 +0000 (11:28 +0200)]
MDL-50966 core_group: New WS core_group_get_activity_allowed_groups
Jun Pataleta [Fri, 11 Sep 2015 02:32:02 +0000 (10:32 +0800)]
MDL-50983 templates: Create core template "columns-autoflow-1to1to1"
Jun Pataleta [Fri, 11 Sep 2015 02:15:57 +0000 (10:15 +0800)]
MDL-50982 templates: Create core template "columns-1to1to1"
Jun Pataleta [Fri, 11 Sep 2015 02:08:41 +0000 (10:08 +0800)]
MDL-50981 templates: Create core template "columns-1to2"
Jun Pataleta [Tue, 18 Aug 2015 08:54:37 +0000 (16:54 +0800)]
MDL-50980 templates: Create core template "columns-2to1"
Eloy Lafuente (stronk7) [Thu, 10 Sep 2015 09:09:52 +0000 (11:09 +0200)]
weekly release 3.0dev
Eloy Lafuente (stronk7) [Thu, 10 Sep 2015 09:09:46 +0000 (11:09 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Rajesh Taneja [Thu, 13 Aug 2015 08:28:12 +0000 (16:28 +0800)]
MDL-51101 behat: Fixed wrong hover step usage
Hover step was being mis-used for checking activity completion
This is replaced with proper step which check for img element
Rajesh Taneja [Thu, 13 Aug 2015 07:03:45 +0000 (15:03 +0800)]
MDL-51101 behat: Removed old behat steps checking feature
This was introduced when there were no features
testing all the steps. Now we have all use-cases
so removing this feature file
rajesh Taneja [Thu, 10 Sep 2015 06:30:28 +0000 (14:30 +0800)]
MDL-50516 behat: Back/next button reloads page
When next/back button is pressed in phantomjs/browserkit
it reload page, so adding a bug_phantomjs, so that we can
test the lesson re-attempt scenario
Eloy Lafuente (stronk7) [Wed, 9 Sep 2015 23:42:06 +0000 (01:42 +0200)]
Merge branch 'MDL-50015-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Wed, 9 Sep 2015 23:01:32 +0000 (01:01 +0200)]
Merge branch 'MDL-50537-master' of git://github.com/jleyva/moodle
Tim Hunt [Thu, 20 Aug 2015 18:12:02 +0000 (19:12 +0100)]
MDL-51147 qtype_match: stats should cope even if Q edited badly
The numbers become pretty meaningless, but we need to avoid fatal
errors.
Dan Poltawski [Wed, 9 Sep 2015 13:29:53 +0000 (14:29 +0100)]
Merge branch 'MDL-50944-master' of git://github.com/jleyva/moodle
Juan Leyva [Wed, 29 Jul 2015 14:27:46 +0000 (16:27 +0200)]
MDL-50537 mod_chat: Use the utility class and several fixes
Costantino Cito [Mon, 15 Jun 2015 07:45:39 +0000 (09:45 +0200)]
MDL-50537 mod_chat: New WS mod_chat_get_chats_by_courses
Juan Leyva [Wed, 29 Jul 2015 14:09:18 +0000 (16:09 +0200)]
MDL-50537 core_webservice: New external functions utility class
Juan Leyva [Wed, 9 Sep 2015 10:15:17 +0000 (12:15 +0200)]
MDL-50995 mod_forum: Fix WS to not rely in the DB ordering defaults
Andrew Nicols [Wed, 9 Sep 2015 08:16:43 +0000 (16:16 +0800)]
MDL-50995 mod_forum: Coding style fixes
Andrew Nicols [Wed, 9 Sep 2015 08:03:05 +0000 (16:03 +0800)]
Merge branch 'MDL-50995-master' of git://github.com/jleyva/moodle
Andrew Nicols [Wed, 9 Sep 2015 07:38:00 +0000 (15:38 +0800)]
Merge branch 'MDL-50852-master' of git://github.com/junpataleta/moodle
Jun Pataleta [Thu, 20 Aug 2015 02:36:59 +0000 (10:36 +0800)]
MDL-50852 formslib: Fixed client-side form validation problem.
This patch fixes the problem of client validation being broken when
shortforms is not enabled. This issue is caused by moodle-core-event
module not being loaded and the broadcast parameter in the
Y.Global.publish set to 2 instead of true.
Mark Nelson [Thu, 13 Aug 2015 06:20:46 +0000 (23:20 -0700)]
MDL-50516 mod_lesson: changes to existing behat tests
Mark Nelson [Tue, 11 Aug 2015 00:50:49 +0000 (17:50 -0700)]
MDL-50516 mod_lesson: added behat tests
Mark Nelson [Mon, 10 Aug 2015 23:45:38 +0000 (16:45 -0700)]
MDL-50516 core_behat: added ability to go back, forward and reload the browser
Mark Nelson [Fri, 4 Sep 2015 00:48:11 +0000 (17:48 -0700)]
MDL-50516 mod_lesson: fixed issue with grade not using minquestions
It's possible to reach the end of the lesson, get your result,
click back until you get to the last question, answer it correctly
and then be awarded a result of 100%. This was because the grade
calculation would only include the questions answered, rather than
all of them in the lesson. However, you can not fix this by always
grading by the amount of questions in the lesson as some lessons
bypass certain questions depending on the answer to previous ones.
The minquestion setting can now successfully be used to prevent this
behaviour by rewording the misleading string and adding logic.
Mark Nelson [Thu, 13 Aug 2015 20:36:40 +0000 (13:36 -0700)]
MDL-50516 mod_lesson: prevented deletion of previous attempts
The 'startlastseen' flag was removing any previous attempts
the user had from the DB. This meant that the user could
simply re-answer the question, regardless of the number
of attempts allowed.
Mark Nelson [Thu, 30 Jul 2015 06:37:01 +0000 (23:37 -0700)]
MDL-50516 mod_lesson: prevented user from repeating question
It was possible in the lesson module for a user to
answer a question, get the result, then click back
in the browser and re-answer it, even if they exceeded
the number of attempts allowed per question.
Eloy Lafuente (stronk7) [Wed, 9 Sep 2015 06:21:45 +0000 (08:21 +0200)]
Merge branch 'wip-mdl-51322' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 9 Sep 2015 06:00:46 +0000 (08:00 +0200)]
Merge branch 'wip-MDL-51357-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 9 Sep 2015 05:07:11 +0000 (13:07 +0800)]
MDL-51357 roles: fix table layout after MDL-38763
Ankit Agarwal [Mon, 8 Jun 2015 09:03:26 +0000 (14:33 +0530)]
MDL-50173 ratings: Use proper checks to ensure ratings are viewable.
Mainly to verify groups visibility this new callback has been created.
Note this was originally 3 commits but for amending purposes they have
been squashed.
Andrew Nicols [Wed, 9 Sep 2015 01:00:27 +0000 (09:00 +0800)]
Merge branch 'wip-MDL-34938-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 8 Sep 2015 14:21:27 +0000 (15:21 +0100)]
Merge branch 'MDL-50013-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 8 Sep 2015 12:37:35 +0000 (13:37 +0100)]
Merge branch 'MDL-50853-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 8 Sep 2015 12:27:37 +0000 (13:27 +0100)]
Merge branch 'MDL-51194' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 8 Sep 2015 12:22:54 +0000 (13:22 +0100)]
MDL-51132 course: add tag require
John Okely [Tue, 28 Jul 2015 09:00:04 +0000 (17:00 +0800)]
MDL-50709 groups: Prevent XSS in grouping description
Dan Poltawski [Tue, 8 Sep 2015 09:46:38 +0000 (10:46 +0100)]
Merge branch 'wip-MDL-51132-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 8 Sep 2015 08:14:14 +0000 (09:14 +0100)]
Merge branch 'wip-MDL-50323-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 8 Sep 2015 08:11:57 +0000 (09:11 +0100)]
Merge branch 'MDL-51307-master' of git://github.com/cameron1729/moodle
Andrew Nicols [Tue, 8 Sep 2015 06:07:27 +0000 (14:07 +0800)]
Merge branch 'MDL-51281-master' of git://github.com/jleyva/moodle
Andrew Nicols [Tue, 8 Sep 2015 04:51:30 +0000 (12:51 +0800)]
Merge branch 'MDL-51325-master' of git://github.com/jleyva/moodle
Cameron Ball [Tue, 8 Sep 2015 04:10:07 +0000 (12:10 +0800)]
MDL-51307 navigation: hide message button
Marina Glancy [Tue, 8 Sep 2015 02:16:51 +0000 (10:16 +0800)]
MDL-34938 enrol_meta: sync enrolment start/end dates
Marina Glancy [Thu, 6 Aug 2015 09:09:11 +0000 (17:09 +0800)]
MDL-51008 grades: show correct default value in overview report
Andrew Nicols [Tue, 8 Sep 2015 01:24:00 +0000 (09:24 +0800)]
Merge branch 'MDL-51245' of git://github.com/stronk7/moodle
Adrian Greeve [Wed, 12 Aug 2015 08:51:43 +0000 (16:51 +0800)]
MDL-50323 themes: Course unordered lists correctly styled.
Thank you to Ann Adamcik for providing this patch.
Damyon Wiese [Mon, 13 Jul 2015 04:21:33 +0000 (12:21 +0800)]
MDL-50782 Ajax: No require_login for all ajax webservice calls
Some webservice functions need to be available without a login, e.g.
fetching strings and templates.
External functions must call validate_context if they require a valid login etc.
Added a new parameter to services.php: "loginrequired". Default is true.
Eloy Lafuente (stronk7) [Fri, 4 Sep 2015 01:00:52 +0000 (03:00 +0200)]
MDL-51245 sqlsrv: Diagnose missing READ_COMMITTED_SNAPSHOT mode
Without it, transactions are executed in standard READ_COMMITED
mode, without snapshoting/row versioning, leading to update
conflicts under high concurrency.
Eloy Lafuente (stronk7) [Fri, 4 Sep 2015 00:05:29 +0000 (02:05 +0200)]
MDL-51245 mssql: Diagnose missing READ_COMMITTED_SNAPSHOT mode
Without it, transactions are executed in standard READ_COMMITED
mode, without snapshoting/row versioning, leading to update conflicts
under high concurrency.
Andrew Nicols [Tue, 8 Sep 2015 00:18:03 +0000 (08:18 +0800)]
Merge branch 'MDL-50287-master' of git://github.com/danpoltawski/moodle
Petr Skoda [Tue, 18 Aug 2015 21:33:12 +0000 (09:33 +1200)]
MDL-50860 core: improve creation of random strings
Tim Lock [Thu, 23 Jul 2015 04:01:26 +0000 (13:31 +0930)]
MDL-42670 mod_assign: Fix recent activity block when blind marking is on
Corey Wallis [Thu, 13 Aug 2015 04:47:50 +0000 (14:17 +0930)]
MDL-51048 IMS-CC: Fix import & export of true/false questions
Marina Glancy [Wed, 2 Sep 2015 06:45:01 +0000 (14:45 +0800)]
MDL-50744 enrol_meta: fix incorrect role assign
Adrian Greeve [Tue, 25 Aug 2015 04:57:43 +0000 (12:57 +0800)]
MDL-48371 editors: Option for removing managefiles
We want to remove the managefiles button from the
editors in the wiki so that students don't delete
each others files.
Marina Glancy [Tue, 11 Aug 2015 05:29:58 +0000 (13:29 +0800)]
MDL-50921 message: allow popup messages from noreply user
Thanks Gary Harris for the patch
Marina Glancy [Sat, 22 Aug 2015 12:55:37 +0000 (20:55 +0800)]
MDL-51132 tags: do not use user tags for tagging courses
lazydaisy [Wed, 2 Sep 2015 15:05:12 +0000 (16:05 +0100)]
MDL-51194 theme_bootstrapbase: Move CSS classes from /less/moodle.less
Juan Leyva [Fri, 10 Jul 2015 14:15:39 +0000 (16:15 +0200)]
MDL-50013 mod_book: New WS mod_book_view_book
Juan Leyva [Fri, 10 Jul 2015 14:15:13 +0000 (16:15 +0200)]
MDL-50013 mod_book: Move logging and completion to new API
Juan Leyva [Fri, 10 Jul 2015 11:57:30 +0000 (13:57 +0200)]
MDL-50015 mod_imscp: New WS mod_imscp_view_imscp