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

64979 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
012b0472c5 Merge branch '42299-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	version.php
 2013-10-24 15:47:48 +08:00
Dan Poltawski
c6dd6d2eb7 Merge branch 'wip-MDL-42486-master' of git://github.com/marinaglancy/moodle 2013-10-24 15:15:07 +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
Dan Poltawski
2d2c5f36c4 Merge branch 'MDL-42272-master' of git://github.com/ankitagarwal/moodle 2013-10-24 12:43:52 +08:00
Dan Poltawski
205d507f87 Merge branch 'MDL-42362_master' of git://github.com/dmonllao/moodle 2013-10-24 12:39:38 +08:00
Jason Fowler
7db052a8f2 MDL-42285 Behat: Automate MDLQA-93 - A teacher can delete questions from the question bank 2013-10-24 12:35:23 +08:00
Dan Poltawski
f76c87151f Merge branch 'wip-MDL-42323-master' of git://github.com/marinaglancy/moodle 2013-10-24 12:33:15 +08:00
Marina Glancy
c7944a72b3 Merge branch 'MDL-35402_editor_rules' of git://github.com/davosmith/moodle 2013-10-24 15:29:15 +11:00
Marina Glancy
33c4c3a363 Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle 2013-10-24 14:15:05 +11:00
Andrew Nicols
1607ead74d MDL-42481 Editor: Temporarily unhide the editor to calculate its size 2013-10-24 11:11:11 +08:00
rwijaya
45535d95b3 MDL-42338 lti_mod: convert hardcoded string. 2013-10-24 10:30:02 +08:00
Damyon Wiese
76f8eb9be9 Merge branch 'MDL-40976-behat-fix' of git://github.com/dmonllao/moodle 2013-10-24 10:29:05 +08:00
Dan Poltawski
93488d8bb0 Merge branch 'MDL-42293-master' of git://github.com/ankitagarwal/moodle 2013-10-24 10:27:23 +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
Andrew Nicols
0f965ca901 MDL-42507 JavaScript: Fix alignment of tooltips 2013-10-24 09:58:04 +08:00
Frederic Massart
37008335c0 MDL-42477 filter_glossary: Alert was not showing 2013-10-24 09:11:15 +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
295e4fa8f4 MDL-29070 enrol_imsenterprise: more code cleanups 
Including:
* fix whitespace
* coding style fixes:
* Declare method visibility
* Don't have variable names with underscores
* Comments without .
* if/for loop spacing
* Unused variables
* Split long lines
* Removed outdates files
* moodlecheck warnings
* code checker warnings
 2013-10-23 17:10:56 +08:00
Brian Biggs
1ee378bbdc MDL-29070 enrol_imsenterprise: Code cleanup 
In preparation for new features.
 2013-10-23 17:10:35 +08:00
David Monllao
2a9275c4c5 MDL-40976 behat: Updating tests according to new behaviour 
We only open the actions menu when is collapsed.
 2013-10-23 16:19:33 +08:00
Rajesh Taneja
3f038d6d97 MDL-42283 Behat: Automated MDLQA-1777 
MDLQA-1777: A teacher can set grade conditions to restrict availability of a section
 2013-10-23 15:57:53 +08:00
Dan Poltawski
b8a5092f2e Merge branch 'MDL-42342-master' of git://github.com/ankitagarwal/moodle 2013-10-23 15:26:54 +08:00
Dan Poltawski
276c451b2a Merge branch 'MDL-42343_master' of git://github.com/dmonllao/moodle 2013-10-23 15:12:22 +08: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
Marina Glancy
90eb4ddd9a Merge branch '42246-26' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-10-23 17:22:28 +11: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
Damyon Wiese
db812f5e5a Merge branch 'w43_MDL-42208_m26_authunmask' of https://github.com/skodak/moodle 2013-10-23 13:37:24 +08:00
Petr Škoda
a668a7e420 MDL-42208 fix JS get_string usage and remove unnecessary params from auth password unmask init 2013-10-23 07:32:24 +02:00
Dan Poltawski
40f0a3abed Merge branch 'wip-MDL-42278-master' of git://github.com/marinaglancy/moodle 2013-10-23 13:20:08 +08:00
Dan Poltawski
8c8a844f2b Merge branch '42277-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:18:45 +08:00
Dan Poltawski
d0041fb110 Merge branch 'w43_MDL-38743_m26_private' of https://github.com/skodak/moodle 2013-10-23 13:15:48 +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
Marina Glancy
d82a3b9f76 Merge branch 'MDL-42427-master' of git://github.com/ankitagarwal/moodle 2013-10-23 15:34:47 +11:00
Ankit Agarwal
f3218d15b0 MDL-42427 backup: Fix undefined errors during automated backups 2013-10-23 12:03:13 +08:00
Damyon Wiese
f45d62e792 MDL-41339 Tags - use uppercase for SQL keywords (AS) 2013-10-23 12:00:01 +08:00
Damyon Wiese
549ce3fa76 Merge branch 'wip-mdl-41339' of https://github.com/jennymgray/moodle 2013-10-23 11:50:50 +08:00
Marina Glancy
ab864f2c36 Merge branch 'MDL-42426-master' of git://github.com/damyon/moodle 2013-10-23 13:59:50 +11:00
Marina Glancy
4f10bc6bb0 Merge branch '42301-26' of git://github.com/samhemelryk/moodle 2013-10-23 13:51:00 +11:00
Marina Glancy
63e77f410d Merge branch 'w43_MDL-42414_m26_rev' of https://github.com/skodak/moodle 2013-10-23 13:11:13 +11:00
Marina Glancy
c5df0a63bc Merge branch '42170-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:43:23 +11:00
Marina Glancy
f9c86035c9 Merge branch '42316-26' of git://github.com/samhemelryk/moodle 2013-10-23 11:05:59 +11:00
Marina Glancy
0d7b312247 MDL-42486 enrol: fixed bug in URL on manage enrol plugins page 2013-10-23 10:44:22 +11:00
Marina Glancy
295825feb6 Merge branch 'w43_MDL-37813_m26_filterall' of https://github.com/skodak/moodle 2013-10-23 10:17:00 +11: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
Dan Poltawski
34fb3545ea on demand release 2.6beta+ 
Thanks to all who entered the competition to find the mistake in the
last commit. It was spotted by none other than super-awesome Moodler
Justin Filip.

He collects a beer from me at our next available meeting.
 2013-10-22 23:05:02 +08:00