moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73517 commits 37 branches 540 tags 1.3 GiB
Commit graph

73517 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Hunt
e7df2335b6 MDL-50373 questions: random Qs must not pick deleted or sub- questions 
This was a regression caused by MDL-6340. I missed the necessary
    AND parent = 0 AND hidden = 0
in one query of the question table.
 2015-05-27 20:32:47 +01:00
Eloy Lafuente (stronk7)
803f565753 weekly on-sync release 3.0dev 2015-05-21 12:44:08 +02:00
Eloy Lafuente (stronk7)
2e365978de Merge branch 'MDL-50277-master' of git://github.com/andrewnicols/moodle 2015-05-20 11:04:56 +02:00
David Monllao
a103ccb4a4 Merge branch 'wip-mdl-49061' of git://github.com/rajeshtaneja/moodle 2015-05-20 10:18:11 +08:00
Rajesh Taneja
99018b283d MDL-49061 behat: Fixed input name to use full activity name 2015-05-20 10:07:26 +08:00
Andrew Nicols
4218673093 MDL-50277 Javascript: Hardcode nodejs dependencies 
In order to produce a consistent build across the board, we must hardcode
several package versions. We must additionally specify compatible
versions for any sub-dependency that we have a requirement upon.

In this instance, the only sub-dependency which has an effect upon the
overall output is grunt-contrib-uglify's dependency upon uglify-js.

Since change in uglify-js may lead to changes in the generated output, we
must specify a fixed version of that dependency. That version must be
compatible with the dependency signature for grunt-contrib-uglify or the
dependency manager will just download a different version.

This issue also bumps the version of uglify-js to a version which changes
the output. This is the latest version at time of commit.
 2015-05-20 09:41:17 +08:00
Eloy Lafuente (stronk7)
7dd6cd75de Merge branch 'wip-mdl-50259' of https://github.com/rajeshtaneja/moodle 2015-05-19 18:02:34 +02:00
Dan Poltawski
2ce0c86d62 Merge branch 'wip-MDL-49061-master' of https://github.com/marinaglancy/moodle 2015-05-19 15:00:26 +01:00
Dan Poltawski
c1b9c3d10d Merge branch 'wip-mdl-50203' of https://github.com/rajeshtaneja/moodle 2015-05-19 12:38:56 +01:00
Andrew Nicols
5fd62ba064 Merge branch 'MDL-50276-master' of git://github.com/ankitagarwal/moodle 2015-05-19 15:43:28 +08:00
Dan Poltawski
9e4e5d1194 Merge branch 'wip-mdl-50116' of https://github.com/rajeshtaneja/moodle 2015-05-19 08:27:49 +01:00
Rajesh Taneja
53cf1a4149 MDL-50259 behat: Use strict activity name checking 
contains might select wrong activity
so using strict activity text checking
 2015-05-19 14:20:05 +08:00
Ankit Agarwal
23e9968a25 MDL-50276 forums: Add a new line in forum emails 2015-05-19 11:46:00 +05:30
Rajesh Taneja
d31e69f976 MDL-50116 behat: Fixed xpath for selecting table row 2015-05-19 13:32:32 +08:00
Eloy Lafuente (stronk7)
4115105c2c Merge branch 'MDL-50169' of https://github.com/sk-unikent/moodle 2015-05-19 02:03:07 +02:00
Eloy Lafuente (stronk7)
74ebb5ce4b Merge branch 'MDL-50280' of https://github.com/sk-unikent/moodle 2015-05-19 01:43:06 +02:00
Eric Merrill
0f7f2134a7 MDL-48467 atto: Clean the textarea during submission when in HTML mode 2015-05-19 01:39:22 +02:00
Eloy Lafuente (stronk7)
bb6b107111 Merge branch 'MDL-50197' of git://github.com/timhunt/moodle 2015-05-19 00:35:35 +02:00
Eloy Lafuente (stronk7)
767da25767 Merge branch 'MDL-50245' of git://github.com/timhunt/moodle 2015-05-19 00:32:58 +02:00
Dan Poltawski
04d73f4fff Merge branch 'MDL-49949-master' of git://github.com/mastnym/moodle 2015-05-18 15:32:56 +01:00
Dan Poltawski
7b88b85392 Merge branch 'MDL-49764_master' of https://github.com/jinhofer/moodle 2015-05-18 15:28:48 +01:00
Skylar Kelty
5b8e7b9564 MDL-50280 WebCT import scripts don't always clean up 2015-05-18 15:25:18 +01:00
Dan Poltawski
62fc688bac Merge branch 'MDL-49906-master' of git://github.com/lameze/moodle 2015-05-18 14:04:10 +01:00
Dan Poltawski
4bd7eb6117 Merge branch 'MDL-50092_master' of git://github.com/dmonllao/moodle 2015-05-18 13:58:14 +01:00
jinhofer
75a548b5f3 MDL-49764 grade/report/grader: Fixed height issue for IE 2015-05-18 07:47:54 -05:00
Dan Poltawski
d597f85638 Merge branch 'MDL-50254-master' of git://github.com/damyon/moodle 2015-05-18 13:09:42 +01:00
Dan Poltawski
14dbf56266 Merge branch 'MDL-50177_master' of git://github.com/dmonllao/moodle 2015-05-18 13:01:51 +01:00
Damyon Wiese
4c7dfac372 MDL-50254 Mustache: Missing alias for namespaced class in mustache 
Thanks to Francesco Bigiarini for the report and suggested fix.
 2015-05-18 15:11:12 +08:00
David Monllao
7ab171fdff Merge branch 'wip-MDL-49742-master' of git://github.com/abgreeve/moodle 2015-05-18 10:16:49 +08:00
Adrian Greeve
1fc2bb35e6 MDL-49742 lib: Removed additional names on tables for sorting. 
When additional names are disabled, they are no longer shown as
sortable headings in the enrolment and admin user tables.
 2015-05-15 15:29:52 +08:00
Martin Mastny
1be1c66a9b MDL-49949 grader: Using method to determine item name 2015-05-15 14:58:00 +08:00
Rajesh Taneja
2ffaceb7a9 MDL-50116 behat: updated symfony/symfony version 2015-05-15 10:07:02 +08:00
Tim Hunt
3a1bc53bc2 MDL-50245 quiz: fix CSS of search options in the qbank dialogue 2015-05-14 14:40:44 +01:00
David Monllao
b5dbb126f9 weekly on-sync release 3.0dev 2015-05-14 11:35:20 +08:00
Rajesh Taneja
e9eaf94226 MDL-50203 behat: Click on link in student 1 row 2015-05-13 15:19:59 +08:00
Simey Lameze
baa850a309 MDL-49906 core_user: add require login exception message 2015-05-13 13:51:22 +08:00
Marina Glancy
bdbe385cc2 MDL-49061 reports: call format_string on activities names 2015-05-13 12:14:13 +08:00
David Monllao
51062c52cb Merge branch 'MDL-25138-master' of git://github.com/lameze/moodle 2015-05-13 10:23:01 +08:00
Damyon Wiese
d051442461 MDL-25138 core_tags: remove duplicated related tags 2015-05-13 10:04:09 +08:00
Simey Lameze
da7f951345 MDL-25138 core_tag: fix correlated tags query unique error 2015-05-13 10:04:09 +08:00
Eloy Lafuente (stronk7)
a17d9a6b99 Merge branch 'MDL-50187_master' of git://github.com/dmonllao/moodle 2015-05-12 09:48:28 +02:00
Skylar Kelty
6e60e99570 MDL-50169: Fix grade report SQL logic 2015-05-12 08:03:56 +01:00
David Monllao
729a6c5617 MDL-50177 completion: Also accepting cm integer strings 2015-05-12 12:19:43 +08:00
David Monllao
88d127d37c Merge branch 'MDL-34102' of git://github.com/jmvedrine/moodle 2015-05-12 12:08:30 +08:00
David Monllao
6491a90be0 Merge branch 'MDL-50184' of git://github.com/stronk7/moodle 2015-05-12 10:57:00 +08:00
Eloy Lafuente (stronk7)
b758ab3053 MDL-50183 upgrade: add 2.9.0 separation line to all upgrade scripts 2015-05-12 00:21:05 +02:00
Tim Hunt
ca79762ac4 MDL-50197 quiz editing: fix dialogue titles at the end of the quiz 2015-05-11 16:19:08 +01:00
David Monllao
709314447b MDL-50092 enrol_imsenterprise: Fixing wrong field name 
Thanks to JD for the fix.
 2015-05-11 14:55:02 +08:00
David Monllao
2261bc153a MDL-50187 docs: Including all x.y releases 2015-05-11 11:05:06 +08:00
Eloy Lafuente (stronk7)
66d46d1534 MDL-50184 backup: Bump release to 3.0 2015-05-11 01:46:50 +02:00