Commit Graph

16787 Commits

Author SHA1 Message Date
Juan Leyva f3fe1b8b35 MDL-49793 url: Move logging and completion to new API 2015-06-01 13:43:17 +02:00
Dan Poltawski 450b0f1dfd Merge branch 'MDL-49776-master' of git://github.com/lameze/moodle 2015-05-26 11:53:34 +01:00
Dan Poltawski 3b88ce4bce Merge branch 'MDL-50321-master-modupgradetxt' of git://github.com/mudrd8mz/moodle 2015-05-25 12:30:34 +01:00
spvickers 058cd1c1d0 MDL-49776 mod_lti: Set parameter in privacy check
Moved sending of the lis_result_sourcedid parameter to within the block
which checks that grades are being accepted for the link.
2015-05-25 13:01:33 +08:00
Nadav Kavalerchik d19de800ed MDL-40592 assign/grading: Display default user picture, if none is set. 2015-05-22 10:35:47 +03:00
David Mudrák f7a84c6386 MDL-50321 docs: Add info about deprecated method into mod/upgrade.txt
This was forgotten in MDL-49101.
2015-05-21 18:06:41 +02: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
Ankit Agarwal 23e9968a25 MDL-50276 forums: Add a new line in forum emails 2015-05-19 11:46:00 +05:30
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
Tim Hunt 3a1bc53bc2 MDL-50245 quiz: fix CSS of search options in the qbank dialogue 2015-05-14 14:40:44 +01:00
Rajesh Taneja e9eaf94226 MDL-50203 behat: Click on link in student 1 row 2015-05-13 15:19:59 +08:00
David Monllao 88d127d37c Merge branch 'MDL-34102' of git://github.com/jmvedrine/moodle 2015-05-12 12:08:30 +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
Rajesh Taneja f84a0d49c1 MDL-50154 behat: Resize pdf window so toolbar is always visible 2015-05-08 11:17:39 +08:00
Rajesh Taneja 0ce090c09a MDL-50154 behat: Click on Grades link under navigation 2015-05-08 10:06:39 +08:00
Eloy Lafuente (stronk7) 7a69b19596 Merge branch 'MDL-50136-master' of git://github.com/ankitagarwal/moodle 2015-05-07 19:34:00 +02:00
Eloy Lafuente (stronk7) 88ffe4020f Merge branch 'MDL-50152' of git://github.com/timhunt/moodle 2015-05-07 16:18:35 +02:00
Tim Hunt f459f29b6f MDL-50152 forum: show if last post in a thread is unread. 2015-05-07 10:38:32 +01:00
Ankit Agarwal 991efb8b1a MDL-50136 database: Update css of search box 2015-05-07 13:40:44 +05:30
David Monllao 0f186bd62d Merge branch 'MDL-50110' of git://github.com/ramdesh/moodle 2015-05-07 12:16:03 +08:00
Frederic Massart 546a58bcdc MDL-50128 mod_data: String needed escaping before being used in regex 2015-05-07 11:19:47 +08:00
Andrew Nicols 7ae030d54e Merge branch 'master_MDL-50133' of https://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/version.php
2015-05-07 10:24:11 +08:00
Dan Marsden a374769640 MDL-50133 mod_scorm: use correct captypes 2015-05-07 11:43:28 +12:00
Ramindu Deshapriya 83679e0fb9 MDL-50110 mod_book: Added Behat test to automate MDLQA-7646 2015-05-07 01:52:18 +05:30
Dan Poltawski 57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Salih Gedik 683f717919 MDL-49789 mod_book: filter book chapter content 2015-05-06 13:54:24 +08:00
Andrew Nicols 43ef409276 Merge branch 'MDL-49985_master' of git://github.com/markn86/moodle
Conflicts:
	mod/forum/post.php
2015-05-06 11:11:21 +08:00
Eloy Lafuente (stronk7) 15005d91f0 MDL-50102 versions: coding style cleanup. 2015-05-05 18:23:21 +02:00
Eloy Lafuente (stronk7) 26ea380d24 MDL-50102 versions: bump all versions and requires near release
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
2015-05-05 17:43:19 +02:00
Frederic Massart b2687a055d MDL-49179 weblib: Secure the direct usage of $_SERVER['HTTP_REFERER'] 2015-05-05 18:31:13 +08:00
Frederic Massart dd0607b7bb MDL-49179 mod_forum, mod_quiz: Prevent misuse of get_referer() 2015-05-05 18:31:13 +08:00
Tim Hunt e51fdfe0cb MDL-49941 quiz: mod/quiz:grade should declare RISK_XSS 2015-05-05 18:31:13 +08:00
Mark Nelson 9542b15671 MDL-49985 core_enrol: direct user to appropriate URL 2015-05-05 01:17:23 -07:00
Mark Nelson b3cb726431 MDL-49985 core_course: revert commit belonging to MDL-18309
This reverts commit 6601690202.

This commit was adding the 'returnurl' param unnecessarily to the
course links in the navigation block, causing a lot of long URLs
to be created.
2015-05-05 01:09:20 -07:00
David Monllao a7f81bc72d Merge branch 'MDL-48002-master' of git://github.com/ankitagarwal/moodle 2015-05-05 10:21:06 +08:00
David Monllao 119ff65c0e Merge branch 'MDL-49954-master' of git://github.com/jleyva/moodle 2015-05-04 15:16:01 +08:00
John Okely 4887d15228 MDL-49983 navigation: Remove 'my' from user context navigation 2015-05-04 12:38:50 +08:00
Ankit Agarwal 0174fa9bc0 MDL-48002 inbound: add tests for evolution 2015-05-04 08:00:01 +05:30
Ankit Agarwal aef3c18b76 MDL-48002 inbound: Remove quoted text from forum emails 2015-05-04 08:00:00 +05:30
Jean-Michel Vedrine 2107531f3c MDL-34102 mod_lesson: display feedback
Feedback for incorrect answer was not diplayed when
Provide option to try a question again was set to Yes.
2015-05-02 15:01:17 +02:00
David Monllao 84d83fe7e1 Merge branch 'MDL-49998' of git://github.com/stronk7/moodle 2015-05-01 15:05:42 +08:00
Eloy Lafuente (stronk7) 46686eafeb MDL-49998 editpdf: Clean code to make it more readable.
There was a big proliferation and reuse of $pdf variable
that was making the code hard to read/review. This commit
does change nothing but makes it more readable.

Also adds a couple of Close() calls, not strictly needed
because they don't have opened files. But think it makes
really clearer the scope of every variable. And, for sure
it frees some resources. That cannot be bad.
2015-04-30 10:55:08 +02:00
David Monllao 388b0beec1 MDL-49637 mod_assign: Fixing behat test
The participant number is dynamically generated so it is not possible to
match known values.

Match on the submission text instead.
2015-04-30 14:03:50 +08:00
Andrew Nicols c80270fe89 Merge branch 'MDL-50033-master-enfix' of git://github.com/mudrd8mz/moodle 2015-04-30 10:47:33 +08:00
Helen Foster 0634dc3b76 MDL-50033 lang: Merge English strings from the en_fix language pack 2015-04-29 21:43:00 +02:00
David Monllao 2296285748 Merge branch 'MDL-50026' of git://github.com/timhunt/moodle 2015-04-29 13:25:02 +08:00
David Monllao 5c012a7426 Merge branch 'MDL-49637' of git://github.com/NeillM/moodle 2015-04-29 12:04:43 +08:00