73836 Commits

Author SHA1 Message Date
Frederic Massart
ebea19cb26 MDL-48618 grades: Handling of inconsistencies due to min/max grades 2015-06-10 12:33:41 +08:00
Eloy Lafuente (stronk7)
22214c22d1 Merge branch 'MDL-49882' of git://github.com/jmvedrine/moodle 2015-06-10 01:39:17 +02:00
Eloy Lafuente (stronk7)
28ddf1e94d Merge branch 'MDL-47480-master' of git://github.com/ankitagarwal/moodle 2015-06-10 00:32:10 +02:00
Eloy Lafuente (stronk7)
75704fe6b8 Merge branch 'wip-MDL-28954-master' of https://github.com/marinaglancy/moodle 2015-06-10 00:23:20 +02:00
Eloy Lafuente (stronk7)
db91aae8f4 Merge branch 'MDL-50145_master' of git://github.com/markn86/moodle 2015-06-09 20:40:56 +02:00
Eloy Lafuente (stronk7)
7d91e86452 Merge branch 'm30_MDL-50415_Add_PHP_Variables_In_PHPInfo_Admin_Page' of https://github.com/scara/moodle 2015-06-09 20:35:02 +02:00
Eloy Lafuente (stronk7)
094356a954 Merge branch 'wip-mdl-50179' of https://github.com/rajeshtaneja/moodle 2015-06-09 20:32:10 +02:00
Eloy Lafuente (stronk7)
b3b6dc9d66 Merge branch 'MDL-50176' of git://github.com/aolley/moodle 2015-06-09 20:28:36 +02:00
Dan Poltawski
cc9806146d Merge branch 'MDL-43731' of https://github.com/ramdesh/moodle 2015-06-09 14:56:52 +01:00
Dan Poltawski
f68cf0a2b7 Merge branch 'MDL-49659_master' of git://github.com/lazydaisy/moodle 2015-06-09 14:42:12 +01:00
Dan Poltawski
6362f68ebe Merge branch 'MDL-49885_course_overview_block2' of https://github.com/andyjdavis/moodle 2015-06-09 13:57:10 +01:00
Dan Poltawski
39e8ff6226 Merge branch 'MDL-50186-master' of git://github.com/mastnym/moodle 2015-06-09 13:28:16 +01:00
Barry Oosthuizen
a3657f8b42 MDL-49959 course: Fix hidden drag and drop message 2015-06-09 09:37:53 +01:00
Mark Nelson
1254e48f26 MDL-50145 mod_lesson: added behat test for multiple dashboard lessons 2015-06-09 00:49:04 -07:00
Jetha Chan
e37d53dac1 MDL-50520 templates: fix helpers not firing inside pix helper 2015-06-09 15:23:04 +08:00
Mark Nelson
2c4b43d9b2 MDL-50145 mod_lesson: fixed issue with duplicate values 2015-06-08 22:09:25 -07:00
Rajesh Taneja
2835eee63b MDL-50179 lesson: Get student/attempts only when showing overview 2015-06-09 09:34:10 +08:00
Rajesh Taneja
f0b48270d3 MDL-50179 behat: Use %d for windows compatibility 2015-06-09 09:34:10 +08:00
Eloy Lafuente (stronk7)
b26f8af988 MDL-48470 strings: Fix unit tests by moving to another string. 2015-06-08 22:53:06 +02:00
Eloy Lafuente (stronk7)
d3c2a653a8 Merge branch 'MDL-48470-master' of git://github.com/ankitagarwal/moodle 2015-06-08 19:55:34 +02:00
Eloy Lafuente (stronk7)
d4d1b2b5a3 Merge branch 'MDL-50394_master' of git://github.com/markn86/moodle 2015-06-08 18:32:45 +02:00
Eloy Lafuente (stronk7)
6422f03f15 Merge branch 'MDL-50442-master' of git://github.com/jleyva/moodle 2015-06-08 18:21:31 +02:00
Eloy Lafuente (stronk7)
4a85f8dc16 Merge branch 'MDL-50408_master' of git://github.com/dmonllao/moodle 2015-06-08 15:49:06 +02:00
David Mudrák
cdc6938bf9 MDL-50509 datalib: Fix the typo in the variable name
The line is supposed to sanitize the function parameter.
2015-06-08 11:14:08 +02:00
Marina Glancy
2bf60e22f7 MDL-50222 admin: do not use deprecated print_textarea() 2015-06-08 17:10:58 +08:00
David Monllao
5c73688b4a MDL-50408 tool_log: Extra deprecation tip
Adding a debugging message and returning alternative data to keep backwards
compatibility as get_readers is a widely used function.
2015-06-08 15:56:23 +08:00
Marina Glancy
6218473334 MDL-28954 cohorts: support files in cohort descriptions 2015-06-08 09:18:45 +08:00
Eloy Lafuente (stronk7)
eec5902cd6 Merge branch 'wip-mdl-50452' of git://github.com/rajeshtaneja/moodle 2015-06-08 02:33:31 +02:00
Andrew Davis
ef38a7286b MDL-49885 core_blocks: fixed course_overview block applicable_formats() 2015-06-08 05:42:18 +08:00
Eloy Lafuente (stronk7)
208ebc5cd1 Merge branch 'MDL-50456-master' of git://github.com/damyon/moodle 2015-06-07 21:56:18 +02:00
Eric Merrill
c07775dfff MDL-48618 gradebook: Only use individual min/max for aggrigate grades 2015-06-05 17:05:24 +08:00
Juan Leyva
ceac202f64 MDL-50442 ws: Add core_user_get_users_by_field to the mobile service 2015-06-04 22:02:04 +02:00
Mary Evans
5563c0bcc1 MDL-49659 theme: Removed home link and limited login info in secure.php
Credits: Thanks go to Andreas Hruska [https://github.com/ahruska] for the original patch for this issue.
2015-06-04 17:39:49 +01:00
Eloy Lafuente (stronk7)
17abbfba1f weekly release 3.0dev 2015-06-04 12:08:53 +02:00
Eloy Lafuente (stronk7)
7d55d643a0 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-06-04 12:08:45 +02:00
Rajesh Taneja
7deb61e7c0 MDL-47995 lib: encode title properly, before additing it to image title 2015-06-04 11:13:00 +08:00
jinhofer
59f7fd42e0 MDL-50140 grade/import: Fix for misplaced CSH buttons 2015-06-03 15:44:28 +01:00
Eloy Lafuente (stronk7)
0eee70506e Merge branch 'MDL-47995-master' of git://github.com/lameze/moodle 2015-06-03 11:10:41 +02:00
yashvardhanpatel07
3da723d548 MDL-49098 feedback: Fix completion message language strings
With contributions from John Okely
2015-06-03 16:47:52 +08:00
Dan Poltawski
21313019d9 Merge branch 'MDL-46294-master' of git://github.com/ankitagarwal/moodle 2015-06-03 08:53:19 +01:00
Mark Nelson
9758da6ed5 MDL-50394 core_course: fixed form validation of 'gradepass' 2015-06-02 23:31:46 -07:00
Damyon Wiese
2139d7995b MDL-50456 Javascript: Fix simple logic error in core/url amd module 2015-06-03 14:21:03 +08:00
Rajesh Taneja
bf32276058 MDL-50452 behat: Added tag for moodle 3.0 2015-06-03 11:50:11 +08:00
Ankit Agarwal
28ac49c899 MDL-46294 completion: Final deprecation of get_incomplete_criteria 2015-06-03 07:36:40 +05:30
Eloy Lafuente (stronk7)
1df669e7bf Merge branch 'MDL-50228' of git://github.com/timhunt/moodle 2015-06-03 01:29:46 +02:00
Eloy Lafuente (stronk7)
23abab38e7 Merge branch 'MDL-50198' of git://github.com/timhunt/moodle 2015-06-03 01:19:42 +02:00
Eloy Lafuente (stronk7)
2426d816fe Merge branch 'MDL-49901_master' of https://github.com/jinhofer/moodle 2015-06-02 19:57:38 +02:00
Dan Poltawski
4bbb035830 Merge branch 'MDL-49905_postform_timeoption' of https://github.com/kylemn/moodle 2015-06-02 16:06:45 +01:00
Dan Poltawski
38414e965c Merge branch 'MDL-50009-m' of https://github.com/micaherne/moodle 2015-06-02 14:42:21 +01:00
Dan Poltawski
f272503420 Merge branch 'MDL-50260-remove-code-optional_param' of git://github.com/tmuras/moodle 2015-06-02 14:22:59 +01:00