18134 Commits

Author SHA1 Message Date
Stephen Bourget
73b1d580aa MDL-55253 mod_choice: prevent direct script access to lib files. 2016-07-25 09:40:38 +01:00
Stephen Bourget
c4b70cfc61 MDL-55255 mod_data: prevent direct script access to lib files. 2016-07-25 09:39:57 +01:00
Eloy Lafuente (stronk7)
4feed61702 Merge branch 'MDL-55220-master' of git://github.com/jleyva/moodle 2016-07-19 13:21:36 +02:00
David Monllao
fa8f88095c Merge branch 'MDL-55157_m32v6' of https://github.com/sbourget/moodle 2016-07-19 08:41:29 +02:00
Stephen Bourget
05fbbb7731 MDL-55157 mod_feedback: Deprecate unused strings 2016-07-18 22:08:47 -04:00
Stephen Bourget
b28753f5bf MDL-55157 mod_feedback: Course reset should update dates 2016-07-18 22:08:00 -04:00
Eloy Lafuente (stronk7)
9e91ff52c9 Merge branch 'MDL-51410_m32v2' of https://github.com/sbourget/moodle 2016-07-19 02:31:24 +02:00
David Monllao
db26654b70 Merge branch 'MDL-55173-master' of git://github.com/andrewnicols/moodle 2016-07-19 01:48:28 +02:00
David Monllao
2f8da1e814 Merge branch 'MDL-55158_m32v3' of https://github.com/sbourget/moodle 2016-07-19 00:50:41 +02:00
Stephen Bourget
87d6e85a9a MDL-55158 mod_data: Add calendar events for database activities 2016-07-18 18:35:37 -04:00
David Monllao
f60a16ad9d Merge branch 'MDL-55162-master' of git://github.com/jleyva/moodle
Conflicts:
	mod/assign/externallib.php
2016-07-18 20:35:50 +02:00
David Monllao
d66e54b021 Merge branch 'MDL-55161-m' of https://github.com/micaherne/moodle 2016-07-18 20:00:18 +02:00
David Monllao
90f3675d9c Merge branch 'MDL-55163-master' of git://github.com/jleyva/moodle 2016-07-18 19:42:46 +02:00
Dan Poltawski
ae76b9ed17 Merge branch 'MDL-14448_m32v1' of https://github.com/sbourget/moodle 2016-07-18 15:06:22 +01:00
Andrew Nicols
d16185fd4f MDL-55173 mod_forum: Perform final deprecations 2016-07-18 08:42:33 +08:00
Jun Pataleta
667cec9ba1 MDL-55240 editpdf: Revert changes in MDL-54772
* Revert rendering of annotations and comments back to the
  drawing region.
* Bind events to stamp annotation when editing only.
2016-07-15 10:36:45 +08:00
Juan Leyva
55bb8189ba MDL-55220 forum: Add string filtering in WS
The following external functions now filter the discussion and post
name and subject.
- get_forum_discussions_paginated
- get_forum_discussion_posts
2016-07-14 09:10:07 +01:00
Stephen Bourget
ca97b358bb MDL-14448 mod_lesson: Add view permissions 2016-07-13 19:10:06 -04:00
Michael Aherne
b4beaed931 MDL-55161 assign: Check for existence of gradebook feedback plugin 2016-07-13 09:01:45 +01:00
Cameron Ball
48ae4707cc
MDL-47371 mod_book: Fix out of scope $unescapedtitle 2016-07-13 10:26:24 +08:00
Stephen Bourget
7040f90d07 MDL-51410 mod_survey: fix notifications when saving analysis 2016-07-12 20:07:35 -04:00
Eloy Lafuente (stronk7)
731f2989c9 MDL-53803 mod_choice: fix trailing whitespace 2016-07-12 18:05:32 +02:00
Eloy Lafuente (stronk7)
4a5bbd9cda Merge branch 'MDL-53803_m32v1' of https://github.com/sbourget/moodle 2016-07-12 18:03:08 +02:00
Eloy Lafuente (stronk7)
bdfb19cc2a Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle 2016-07-12 15:58:59 +02:00
Juan Leyva
b93ea100fc MDL-55162 mod_assign: Refactor to use new validate_assign helper 2016-07-12 14:39:24 +01:00
Juan Leyva
7336b66f05 MDL-55162 mod_assign: New WS mod_assign_view_assign 2016-07-12 14:39:24 +01:00
Eloy Lafuente (stronk7)
9f4c5c542b MDL-37250 mod_lesson: Move conditions to queries for better performance
While this ony seems to affect MySQL, better put the filter/conditions
on every query so the temporary view/table does not need to handle
thousands of potentially unrelated records.
2016-07-12 13:31:25 +02:00
Eloy Lafuente (stronk7)
9401ee156c Merge branch 'wip-MDL-37250-master' of git://github.com/abgreeve/moodle 2016-07-12 13:21:19 +02:00
David Monllao
b60d4fca13 Merge branch 'MDL-55048-master' of git://github.com/danpoltawski/moodle 2016-07-12 12:20:35 +02:00
Dan Poltawski
815abdf4db Merge branch 'MDL-47371-master' of git://github.com/cameron1729/moodle 2016-07-12 10:15:57 +01:00
Cameron Ball
a9ebd43b27
MDL-47371 mod_book: Don't double escape book titles 2016-07-12 10:31:17 +08:00
Dan Poltawski
9b62a3eb71 MDL-55048 js: rebuilt files with new version of uglifyjs 2016-07-11 15:53:10 +01:00
Eloy Lafuente (stronk7)
cf7dc57a91 Merge branch 'MDL-54944-master' of git://github.com/danpoltawski/moodle 2016-07-11 16:50:51 +02:00
Dan Poltawski
64ec975e19 Merge branch 'MDL-55082-master' of git://github.com/merrill-oakland/moodle 2016-07-11 15:20:48 +01:00
David Monllao
26140adbb9 Merge branch 'wip-MDL-54962-master' of git://github.com/abgreeve/moodle 2016-07-11 16:15:48 +02:00
David Monllao
034544ffda Merge branch 'MDL-18599-master' of git://github.com/junpataleta/moodle 2016-07-11 15:59:44 +02:00
David Monllao
27600832aa Merge branch 'MDL-49029_m32v2' of https://github.com/sbourget/moodle 2016-07-11 15:50:29 +02:00
Dan Poltawski
8846f9950f Merge branch 'MDL-55112-master' of git://github.com/junpataleta/moodle 2016-07-11 14:42:06 +01:00
Jun Pataleta
af0fc6a254 MDL-18599 mod_forum: Hide single discussion owner's name and picture
* On the discussion's page.
* On the recent activity block.
* On the recent activity page.
2016-07-11 21:40:19 +08:00
Dan Poltawski
e9da895634 Merge branch 'wip-MDL-55154-master' of git://github.com/abgreeve/moodle 2016-07-11 13:31:24 +01:00
Dan Poltawski
ad3f8cd18c MDL-54944 eslint: make the .eslintrc default stricter
Instead of using the more rollup-tolerant config for all files, make the
configuration stricter by default but lower in grunt for yui modules.

This means that manual runs (prechecker) or editor integrations will
flag up the errors as well as grunt.

Also add ignore lines to the core files so that eslint isn't noisy when
not running with grunt.
2016-07-11 12:44:34 +01:00
Dan Poltawski
e2f79e330d Merge branch 'MDL-53222_master' of git://github.com/dmonllao/moodle 2016-07-11 11:42:41 +01:00
David Monllao
6a4c2146f9 MDL-53222 search: Replace report_search by new searchareas admin page 2016-07-11 11:49:14 +02:00
Juan Leyva
95624eef09 MDL-55163 mod_assign: Fix mod_assign_copy_previous_attempts
- Not exposed via WS
- Have a bug when calling the api function
2016-07-11 10:35:24 +01:00
David Monllao
1d17f51a8d Merge branch 'MDL-54832-master' of https://github.com/nashtechdev01/moodle 2016-07-11 06:47:13 +02:00
Adrian Greeve
681f8f09c0 MDL-37250 mod_lesson: All actual attempts on the lesson are displayed.
The lesson overview report now shows all attempts made including hitting
the page and immediately navigating away.
2016-07-11 08:18:41 +08:00
Adrian Greeve
d58f3a4d2a MDL-54962 mod_data: Approval status is now translated.
It was using hardcoded English. Now it uses get_string.
2016-07-08 10:53:39 +08:00
Adrian Greeve
9582e530eb MDL-55154 mod_lesson: Lesson numerical response shows images. 2016-07-08 09:54:58 +08:00
Stephen Bourget
9be8052937 MDL-11369 mod_choice: Add calendar events for choice activities 2016-07-07 16:56:17 -04:00
Stephen Bourget
1725216aee MDL-49029 mod_choice: Add view permissions 2016-07-07 15:10:17 -04:00