Commit graph

79673 commits

Author SHA1 Message Date
Rajesh Taneja
fc2e137750 MDL-55174 core_testing: Use proper directory separator
While searching for existing files if directory
separator is not correct then original files
and directories will be deleted. So use DIRECTORY_SEPARATOR.
2016-07-15 13:51:41 +08:00
Damyon Wiese
91445c63f8 MDL-55012 Atto: no style attrs on paste
Specifically on paste - we don't need all the random style attributes
from content on the clipboard. When you copy from a webpage - the browser
inlines all the styles from the page so that the pasted content will look
like the place it was copied from. But this is never what you want - you
want the content on paste, but with no special styling.
2016-07-15 13:34:11 +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
Anant
e370e069a7 MDL-55141 task: Add CLI debugging for tasks 2016-07-14 09:24:52 -07:00
Serge Gauthier
cc6b92483a MDL-31356 enrol_imsenterprise: Continue development for added features
* Add the possibility to make it works as before (with categrory name or idnumber).
    * Add possibility to specify nested categories by name or idnumber.
    * Fix error in core_course_courselib_testcase::test_course_created_event because dependency with imsenterprise
2016-07-14 09:36:03 -04:00
Serge Gauthier
08b29336b9 MDL-31356 enrol_imsenterprise: merge with moodle3.2 2016-07-14 09:36:03 -04:00
Dan Poltawski
81e849bc71 MDL-31356 enrol_imsenterprise: add additional test coverage 2016-07-14 09:36:03 -04:00
Dan Poltawski
ecf6a0ab5b MDL-31356 enrol_imsenterprise: Fix behaviour with course idnumber
When not set we shouldn't throw a warning
2016-07-14 09:36:03 -04:00
Brian Biggs
93fdbb4292 MDL-31356 enrol_imsenterprise: New Features
* Feature 1: Allow nested categories when creating courses.
* Feature 2: Allow updates to course Full Name and Short Name.
* Feature 3: Allow setting authentication type for users.
* Feature 4: Allow updates to users.

Also added tests and updated course update routines so it doesn't
muck with DB directly.
2016-07-14 09:36:02 -04:00
David Monllao
36a19ecc26 weekly release 3.2dev 2016-07-14 11:28:40 +02:00
David Monllao
78f5b1841f Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-07-14 11:28:37 +02: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
25d8a63a4e MDL-54657 Behat: Add tests for section_links block 2016-07-13 21:38:31 -04:00
Stephen Bourget
ca97b358bb MDL-14448 mod_lesson: Add view permissions 2016-07-13 19:10:06 -04:00
Eric Merrill
e0867b2222 MDL-55190 search: Limit search to non-files if disabled 2016-07-13 06:05:33 -04:00
Michael Aherne
b4beaed931 MDL-55161 assign: Check for existence of gradebook feedback plugin 2016-07-13 09:01:45 +01:00
Adrian Greeve
f6f0ba2d45 MDL-55126 files: Deprecate get_records_csv and put_records_csv.
Initial deprecation of the above functions.
2016-07-13 14:22:46 +08:00
JD
560cea838b MDL-54977 blocks_navigation: Use html_writer::random_id for id
uniqid() may returns the same id for faster machines (seen on iis)
so use html_writer::random_id(), to ensure id is different and
navigation don't break
2016-07-13 14:04:16 +08:00
Andrew Nicols
3142a57c69 Merge branch 'MDL-47371-master-fix' of git://github.com/cameron1729/moodle 2016-07-13 12:07:36 +08:00
Cameron Ball
48ae4707cc
MDL-47371 mod_book: Fix out of scope $unescapedtitle 2016-07-13 10:26:24 +08:00
Damyon Wiese
87c6f9ab23 MDL-52544 oracle: Apply upstream pull request to AdoDB oracle driver
Upstream: https://github.com/ADOdb/ADOdb/pull/259

Prevent segfault with ocipo driver on php7.

The OCIFetchinto function is causing segfaults on php7 - probably because the fields array
is not initialised or it is optimised out. This fixes just changes to use the safer function
oci_fetch_array instead.
2016-07-13 08:45:06 +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)
5968add63f Merge branch 'MDL-55083_master' of https://github.com/tunele/moodle 2016-07-13 00:09:08 +02:00
tunele
f029401b36 MDL-55083 admin: provide friendly error in case phpxml is missing 2016-07-12 23:35:15 +02:00
Eloy Lafuente (stronk7)
af8b948e2b Merge branch 'MDL-54629-master' of git://github.com/jleyva/moodle 2016-07-12 21:01:02 +02:00
Eloy Lafuente (stronk7)
5748e56242 Merge branch 'MDL-54671-master' of git://github.com/danpoltawski/moodle 2016-07-12 18:14:17 +02: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)
4a132893e0 Merge branch 'MDL-54892-master' of https://github.com/tobiasreischmann/moodle 2016-07-12 17:51:36 +02:00
Juan Leyva
c1da311ad6 MDL-54801 webservice: Support 'ids' search in get_categories 2016-07-12 15:41:32 +01:00
Eloy Lafuente (stronk7)
bdfb19cc2a Merge branch 'MDL-11369_m32v2' of https://github.com/sbourget/moodle 2016-07-12 15:58:59 +02:00
Eloy Lafuente (stronk7)
3c724b4218 Merge branch 'MDL-55136_dataobject' of git://github.com/davosmith/moodle 2016-07-12 15:48:13 +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
David Monllao
eb4f0d9c84 Merge branch 'MDL-54771-master' of git://github.com/cameron1729/moodle 2016-07-12 14:53:32 +02: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
7aad43e13f Merge branch 'MDL-55133-master' of git://github.com/damyon/moodle 2016-07-12 13:16:27 +02:00
David Monllao
64c1e707a9 Merge branch 'wip-MDL-55107-master' of git://github.com/abgreeve/moodle 2016-07-12 13:03: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
120f4ed7ee Merge branch 'MDL-54891-master' of git://github.com/ryanwyllie/moodle 2016-07-12 10:38:56 +01:00
Dan Poltawski
815abdf4db Merge branch 'MDL-47371-master' of git://github.com/cameron1729/moodle 2016-07-12 10:15:57 +01:00
Damyon Wiese
eea2fc4319 MDL-52544 oracle: php7 fixes for oci driver
These are our bugs actually - the oci docs are very clear that bound
params should be in-scope when oci_execute is called - and due to pass by value etc,
this was not true for our driver.

There is another bug that needed fixing - OCI barfs if null values are bound - this
can be avoided by setting them to '' which oci treats as null.

And finally - all our lob/clob/blob hacks were also binding to local "out-of-scope" vars.
2016-07-12 16:55:47 +08:00
David Monllao
4fcca5378b Merge branch 'MDL-55170_master' of https://github.com/nadavkav/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2016-07-12 10:30:31 +02:00
David Monllao
8178b7824d MDL-54963 search: Show no results 2016-07-12 10:27:31 +02:00
Dan Poltawski
acb75afe39 Merge branch 'MDL-55007-master' of https://github.com/dthies/moodle 2016-07-12 09:20:15 +01:00
Adrian Greeve
97a85bf6f0 MDL-55107 gradebook: Unit tests for the new setting check. 2016-07-12 13:30:10 +08:00
Adrian Greeve
05156571c0 MDL-55107 gradebook: Improve the 57 letter boundary upgrade.
This fixes a setting not being checked before and also
reduces the number of false positives.
2016-07-12 13:30:10 +08:00
Damyon Wiese
a066cfc843 MDL-55133 javascript: Correctly use component names in requirejs
Core subsystems must use the 'core_' prefix always.
2016-07-12 11:15:17 +08:00
Cameron Ball
a9ebd43b27
MDL-47371 mod_book: Don't double escape book titles 2016-07-12 10:31:17 +08:00