Commit graph

15163 commits

Author SHA1 Message Date
Davo Smith
114913e31f MDL-42352 assignfeedback_editpdf - prevent scrolling when clicking on buttons 2013-10-22 15:09:15 +01:00
Jerome Mouneyrac
6bdb788679 MDL-24380 Chat: autoscroll help popup incorrect and doesn't display fully 2013-10-22 12:35:23 +02:00
Dan Poltawski
a8261e2830 Merge branch 'MDL-29441-master' of git://github.com/andrewnicols/moodle 2013-10-22 12:11:48 +02:00
Dan Poltawski
0c7c5e767c Merge branch 'MDL-42115-master' of git://github.com/jamiepratt/moodle 2013-10-22 12:11:45 +02:00
Marina Glancy
a90e023b4a Merge branch 'MDL-26170_rss' of https://github.com/andyjdavis/moodle 2013-10-22 12:11:44 +02:00
Dan Poltawski
59dca9505b Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle 2013-10-22 12:11:42 +02:00
Andrew Nicols
087c5d43c0 MDL-42464 mod_chat: Correct use of encoded & in link 2013-10-22 15:12:28 +08:00
Andrew Davis
54eb02a45c MDL-26170 RSS: fixed RSS cache clearing when items are deleted 2013-10-22 10:29:05 +07:00
Rajesh Taneja
1c4d953cef MDL-31405 Assignment: removed type in time shift reset status
Assignment reset shifts time for all assignments and not specific to
assignment type, hence removed type string from reset status
2013-10-22 11:10:32 +08:00
Petr Škoda
d5814f4e22 MDL-41811 simplify the admin tree detection logic and fix navigation in multiple areas 2013-10-21 14:17:55 +08:00
Rajesh Taneja
bafcd3f17a MDL-41811 navigation: Load site admin navigation
Go to notification page before following links within site admin
navigation, ensuring site admin navigation is loaded

With no js, test should follow site admin link and not expand it.
2013-10-21 14:17:55 +08:00
rwijaya
bc8a409c1f MDL-38664 Lesson mod: code improvement for lesson re-attempt page 2013-10-21 13:47:22 +08:00
Jody Steele
add50b5ab0 MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission 2013-10-21 16:47:05 +11:00
Joseph Rézeau
b882b8c678 MDL-38664 Lesson mod: fixed re-attempt unseen page 2013-10-21 13:43:05 +08:00
Dan Poltawski
2d0316d60d Merge branch 'MDL-26244_url' of https://github.com/andyjdavis/moodle 2013-10-21 11:24:51 +08:00
Dan Poltawski
fb032ccb3f Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle
Conflicts:
	lib/upgrade.txt
    mod/upgrade.txt
2013-10-21 10:57:44 +08:00
Andrew Davis
fa4fb78642 MDL-26244 mod_date:added some logic show or hide the file picker button based on repository availability 2013-10-21 08:49:38 +07:00
Andreas Grabs
bb4191ff4d MDL-42210 mod_feedback - convert tabs to space 2013-10-20 10:22:56 +02:00
Michael Milette
690266bcf7 MDL-42210-Feedback-Input-Labels
Adds labels to the input fields in the Feedback module including: multichoice, multichoicerated, numeric, textarea and textfield.
2013-10-20 10:22:54 +02:00
Charles Severance
ba0f89e168 MDL-40531 mod_lti: Various 1.1/1.1.1 fixes. 2013-10-19 02:57:12 +02:00
Sam Chaffee
33ad01a291 MDL-40531 mod_lti: Changed namespace in XML to IMS LTI compliant 2013-10-18 10:12:15 -06:00
Jamie Pratt
f16ed06c2c MDL-42115 exception when there are no questions 2013-10-16 19:40:04 +07:00
Ankit Agarwal
79b40dea57 MDL-42290 choice: Add a automated test to verify limiting number of responses works 2013-10-16 15:34:26 +08:00
Petr Škoda
b2858b916a MDL-42148 new overview of 3rd party libraries
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
2013-10-16 14:48:29 +08:00
Damyon Wiese
fc69508f01 Merge branch 'MDL-42029-master-nomerge' of git://github.com/mouneyrac/moodle
Conflicts:
	mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
2013-10-16 12:45:07 +08:00
Jerome Mouneyrac
ea6d86743f MDL-42029 Editpdf: Page selector should indicate what page you are on 2013-10-16 11:55:30 +08:00
Eloy Lafuente (stronk7)
77631383f0 Merge branch 'MDL-42240' of git://github.com/danpoltawski/moodle 2013-10-16 01:04:36 +02:00
Dan Poltawski
e3aa1fa929 Merge branch 'wip-MDL-42288-master' of git://github.com/marinaglancy/moodle 2013-10-15 11:53:26 +08:00
Tim Hunt
562684e3a0 MDL-42309 typo: fix reponse -> response throughout Moodle. 2013-10-15 13:47:27 +11:00
Marina Glancy
38a5cc79f8 Merge branch 'MDL-42230' of git://github.com/timhunt/moodle 2013-10-15 13:19:20 +11:00
Dan Poltawski
7159340f7f Merge branch 'MDL-41131_c' of git://github.com/rwijaya/moodle 2013-10-14 15:46:22 +08:00
Damyon Wiese
185364d366 MDL-34586 assignment - fix whitespace 2013-10-14 14:30:08 +08:00
Damyon Wiese
48947db114 Merge branch 'MDL-34586-master' of https://github.com/mackensen/moodle 2013-10-14 14:29:52 +08:00
Damyon Wiese
031a28ce7f Merge branch 'MDL-34612-master' of https://github.com/mackensen/moodle 2013-10-14 14:12:57 +08:00
rwijaya
f159ad7302 MDL-41131 assign module: remove setting for submission comments and edipdf plugins' setting. 2013-10-14 12:43:26 +08:00
Rajesh Taneja
e63515ba93 MDL-31405 Assignment: Fixed date in reset to be called for every assignment 2013-10-14 12:34:55 +08:00
Dan Poltawski
b1bdb61e90 Merge branch 'MDL-42167-workshop-update-record' of git://github.com/mudrd8mz/moodle 2013-10-14 12:07:54 +08:00
Marina Glancy
4ff520d800 MDL-42288 behat: Allowing to change choice response
Automate MDLQA-46 - A teacher can choose whether to allow students to change their choice response
2013-10-14 10:46:24 +11:00
Eloy Lafuente (stronk7)
7d766e4ca1 Merge branch 'wip-mdl-41843' of git://github.com/rajeshtaneja/moodle 2013-10-14 00:13:26 +02:00
Andrew Nicols
ee4ece6822 MDL-29441 Chat: Use a valid name for chat popup actions 2013-10-12 00:53:48 +08:00
Tim Hunt
d3603928a9 MDL-42230 fix inconsistent quiz lang string.
This matches a change made to another string in MDL-32188.
2013-10-11 14:32:24 +01:00
Marina Glancy
1b7930fe4a Merge branch 'wip-MDL-42238-master' of git://github.com/abgreeve/moodle 2013-10-11 13:32:14 +11:00
Matteo Scaramuccia
996531e7f1 MDL-42167 Update workshop assessment record only when really changed
Under certain conditions there is nothing to actually update here. The
$DB->update_record() would throw an exception here.
2013-10-10 10:07:53 +02:00
Adrian Greeve
6d3d9bd927 MDL-42238 - mod_wiki: Alternate name sql update to wiki_print_recent_activity 2013-10-10 14:02:32 +08:00
Adrian Greeve
dda60f88cd MDL-42238 - mod_forum: Alternate name sql update to forum_print_recent_activity. 2013-10-10 14:02:23 +08:00
Dan Poltawski
9092378ddb MDL-42240 assignfeedback_editpdf: improve ghostscript debugging 2013-10-10 13:55:46 +08:00
Marina Glancy
0965a9be10 Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle 2013-10-10 12:52:28 +11:00
Marina Glancy
9c5d6183d5 Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle 2013-10-10 11:12:35 +11:00
Dan Poltawski
f57053fc2a Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle 2013-10-09 17:23:44 +08:00
Rajesh Taneja
9dbe0313ce MDL-42222 Assignment: Added type check before checking mimetype
Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype
2013-10-09 16:53:46 +08:00