moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 11:26:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
79694 commits 37 branches 544 tags 1.3 GiB
Commit graph

79694 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dan Poltawski
3ed88885e5 Merge branch 'wip-mdl-55174' of https://github.com/rajeshtaneja/moodle 2016-07-18 14:49:48 +01:00
Dan Poltawski
bbb826f48f Merge branch 'MDL-55190-master' of git://github.com/merrill-oakland/moodle 2016-07-18 14:21:03 +01:00
Dan Poltawski
151aaa2654 Merge branch 'MDL-55012-master' of git://github.com/damyon/moodle 2016-07-18 13:55:50 +01:00
Dan Poltawski
2dbaaa9bdc Merge branch 'MDL-54963_master' of git://github.com/dmonllao/moodle 2016-07-18 13:38:36 +01:00
Dan Poltawski
eab9f3d32e Merge branch 'wip-mdl-54977' of https://github.com/rajeshtaneja/moodle 2016-07-18 13:27:48 +01:00
Dan Poltawski
5e60c1d436 Merge branch 'MDL-55240-master' of git://github.com/junpataleta/moodle 2016-07-18 10:51:06 +01:00
Dan Poltawski
fa57043eb6 Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle 2016-07-18 09:17:53 +01:00
Dani Palou
9ac99220c5 MDL-55046 assign: Return submissionstatement in get_assignments 2016-07-18 09:22:12 +02:00
Rajesh Taneja
ce78e33a84 MDL-55174 core_tests: Use proper itemid while creating file 2016-07-18 10:29:23 +08:00
Andrew Nicols
21e8b48d13 MDL-51758 libraries: Remove password_compat library from core 2016-07-18 10:06:57 +08:00
Andrew Nicols
d16185fd4f MDL-55173 mod_forum: Perform final deprecations 2016-07-18 08:42:33 +08:00
Andrew Nicols
9a60d5f98f MDL-54915 core: JS Blocks must not used shared variables 
The JS blocks in a template must _not_ use a shared variable as they can be
executed asynchronously and complete in any order.

Instead it is stored in the only local variable available - the current
context.

Since the context can be passed in from elsewhere, we namespace it to
reduce the chance of collission.
 2016-07-18 08:29:52 +08:00
Stephen Bourget
0f256bc05e MDL-55251 mod_chat: Add view permissions 2016-07-15 16:13:06 -04:00
AMOS bot
05ce84fbc1 Automatically generated installer lang files 2016-07-16 00:05:30 +08:00
Jun Pataleta
49ccaee5a9 MDL-55206 admin: Some code cleanup 
* Removed unnecessary TODOs.
* Changed message prompt case to sentence case.
 2016-07-15 14:44:35 +08:00
Jun Pataleta
36b88f2486 MDL-55206 admin: Remove div tags in password policy error message 2016-07-15 14:40:54 +08:00
Brendan Heywood
685e5b002c MDL-55207 adminlib: Improve help and validation errors for configiplist 2016-07-15 16:38:54 +10:00
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