mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 17:03:33 +02:00
Code Issues Projects Releases Wiki Activity
79,424 Commits 36 Branches 529 Tags
Commit Graph

79424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c08a7eebb6 Merge branch 'wip-MDL-55126-master' of git://github.com/abgreeve/moodle 
Conflicts:
	lib/upgrade.txt
 2016-07-18 20:50:47 +02:00
David Monllao
8c00f1cbc7 Merge branch 'MDL-55200_master' 2016-07-18 20:41:07 +02:00
Steffen Pegenau
51ed23519a MDL-55200 question type ddmarker: Display coordinates on image 
To make the creation of dropzones easier, the mouse coordinates are shown.
 2016-07-18 20:40:49 +02: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
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
Rajesh Taneja
ce78e33a84 MDL-55174 core_tests: Use proper itemid while creating file 2016-07-18 10:29:23 +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
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
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
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
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
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
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