Commit graph

74303 commits

Author SHA1 Message Date
Dan Poltawski
e2ddd9ad04 Merge branch 'wip-mdl-49659' of https://github.com/rajeshtaneja/moodle 2015-06-11 09:56:07 +01:00
David Monllao
d8ee571298 MDL-48618 upgrade: Matching conditions and upgrade savepoints 2015-06-11 15:02:06 +08:00
David Monllao
408e3812af MDL-48618 grades: Forcing new upgrade savepoint 2015-06-11 14:37:31 +08:00
David Monllao
e87acc8386 Merge branch 'MDL-48618-master' of git://github.com/FMCorz/moodle 2015-06-11 14:20:56 +08:00
Rajesh Taneja
352a70e25d MDL-49659 theme_clean: Add login info in the nav bar 2015-06-11 10:21:35 +08:00
Eloy Lafuente (stronk7)
b2521cfa45 Merge branch 'MDL-50250-master' of git://github.com/lameze/moodle 2015-06-11 00:32:11 +02:00
Eloy Lafuente (stronk7)
05df4bc5f9 MDL-50452 behat: 2nd level dep. Update twig/twig to v1.18.2 2015-06-10 13:34:58 +02:00
Juan Leyva
d421a41979 MDL-50107 webservices: Enable CORS in login/token.php 2015-06-10 11:33:53 +02:00
Rod Norfor
0f382fe2e7 MDL-39353 xmlrpc: Add proxy support 2015-06-10 08:17:36 +01:00
Frederic Massart
056aeae8d4 MDL-48618 grades: Test for the minmax upgrade step 2015-06-10 12:33:42 +08:00
Frederic Massart
597fc6db1a MDL-48618 grades: Behat tests to cover min/max grade changes
The values provided as part of this test are similar to values
that can be found in 2.7. This is to ensure that users will not
experience changes in grades.
2015-06-10 12:33:42 +08:00
Frederic Massart
2eb4a83c29 MDL-48618 grades: Unit tests for grade_grade::get_min/max_grade() 2015-06-10 12:33:41 +08:00
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
Juan Leyva
b1aa7dfac3 MDL-50493 forum: Handle correctly qanda forums in get_discussion_posts 2015-06-06 00:00:56 +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