Commit graph

14928 commits

Author SHA1 Message Date
Frederic Massart
268bd2fe77 MDL-42534 mod_forum: Fix issue because cm_info is read only 2013-10-25 11:34:10 +08:00
Dan Poltawski
3f9a9e86b3 Merge branch 'MDL-42338' of git://github.com/rwijaya/moodle 2013-10-24 16:28:46 +08:00
Damyon Wiese
6d87dcebe2 MDL-42401 EditPDF: Allow dragging the edit pdf window.
Also move the location of the call the centerDialogue so it fires after the drawing region is
added to the window.
2013-10-24 13:50:58 +08:00
Damyon Wiese
298a7ee386 MDL-42402 EditPDF: CSS Improvements for editing toolbar.
The main change here is to prevent the default rendering of a select list for the page
selector, so that it looks more consistent with the rest of the toolbar on different
browsers/os combinations.

This is done with some vendor specific css rules targeting webkit, mozilla and ie.

There are also some minor tweaks to vertically align the images in the buttons and reduce the padding
above and below the toolbar.
2013-10-24 13:22:39 +08:00
rwijaya
45535d95b3 MDL-42338 lti_mod: convert hardcoded string. 2013-10-24 10:30:02 +08:00
Dan Poltawski
459dbd4362 Merge branch 'MDL-42030-master' of git://github.com/mouneyrac/moodle
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
2013-10-24 10:19:47 +08:00
David Mudrák
e01d4a2236 MDL-42494 Fix workshop coding exception if all assessments have zero weight
If all assessments for the given submission have zero weight, the grading
evaluation plugin "Comparison with the best assessment" is unable to decide on
the average assessment as it ignores those with zero weight. In such rare case,
it makes sense to set the grading grade to null and prevent the coding
exception.
2013-10-23 11:45:18 +02:00
Dan Poltawski
0f136c1a5b Merge branch 'MDL-42290-master' of git://github.com/ankitagarwal/moodle 2013-10-23 14:36:07 +08:00
Ankit Agarwal
b2b50d92f6 MDL-42219 quiz: Fix alternate name warnings in quiz
Fix the alternate name warning which is generated when submitting an attempt for a quiz
2013-10-23 14:36:00 +08:00
Ankit Agarwal
b469c5e750 MDL-42220 quiz: Fix name fields warning in quiz
Fix warnings generated when manually grading a quiz attempts
2013-10-23 14:21:15 +08:00
Damyon Wiese
19becd541a Merge branch 'MDL-42210_master' of git://github.com/grabs/moodle 2013-10-23 14:06:04 +08:00
rwijaya
5639454509 MDL-41251 forum_mod: add aria label and role to forum discussion page for accessibility purpose.
Thanks to Nate Baxley for creating the original patch.
2013-10-23 12:43:35 +08:00
Dan Poltawski
de3d8fda10 Merge branch 'MDL-40531' of https://github.com/stronk7/moodle 2013-10-23 12:37:45 +08:00
Davo Smith
60b8708076 MDL-42355 assignfeedback_editpdf - do not start a new comment immediately when deselecting the old comment 2013-10-22 18:46:45 +01:00
Davo Smith
6e67d80d50 MDL-42482 assignfeedback_editpdf - prevent blank comments from disappearing when the menu is opened 2013-10-22 18:26:44 +01:00
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