mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 07:30:01 +01:00
Code Issues Projects Releases Wiki Activity
68,950 Commits 36 Branches 527 Tags
Commit Graph

68950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
59ba5a5952 Merge branch 'MDL-45599-master-addons' of git://github.com/mudrd8mz/moodle 2014-07-08 15:31:50 +01:00
Dan Poltawski
8bdcbcaf7d Merge branch 'MDL-44492' of git://github.com/timhunt/moodle 2014-07-08 14:17:56 +01:00
Tim Hunt
afbe4592ad MDL-44492 quiz: fix hilighting of graded attempt 
In various places, when showing several attempts, we try to hilight the
most significant one (the one that gave the final grade if the quiz is
set to first/last/best attempt). That was not working because the table
zebra stripes were a more specific rule.

Also, the colour was inconsistent, not nice, and not very bootstrapy, so
I changed it.
 2014-07-08 13:31:55 +01:00
Tim Hunt
6f885844fd MDL-44492 quiz reports: revert some style overrides. 
But add one more. This makes Clean theme look a lot better.
 2014-07-08 13:31:53 +01:00
Tim Hunt
750757cff1 MDL-44492 Rough unit test for the report SQL. 
We really ought to test more cases, but this hits one of the most tricky cases.
 2014-07-08 13:31:51 +01:00
Tim Hunt
8cacc71dd2 MDL-44492 quiz reports: make show only graded attempt work. 
It needs to only affect finished attempts, and the wording needs to be
modified to make it clear that is what it does.
 2014-07-08 13:31:49 +01:00
Frederic Massart
cd6e149c86 MDL-45471 javascript: Escape content of exception dialogs 2014-07-08 12:59:59 +01:00
Dan Poltawski
79269b05f0 Merge branch 'MDL-45381_master' of git://github.com/markn86/moodle 2014-07-08 11:28:58 +01:00
Dan Poltawski
772d658f1d Merge branch 'MDL-45596-master' of git://github.com/FMCorz/moodle 2014-07-08 10:50:55 +01:00
Marina Glancy
de5009f4a2 MDL-43948 forms: setting types to filemanager and editor elements 2014-07-08 10:47:29 +01:00
Dan Poltawski
55d6361f5a MDL-46231 navigation: en_fix behat changes 2014-07-08 08:34:53 +01:00
Dan Poltawski
4c8fab291b Merge branch 'MDL-46231-master-en_fix' of git://github.com/mudrd8mz/moodle 2014-07-08 08:32:32 +01:00
Helen Foster
272a071694 MDL-45599 Fix tiny grammatical errors in the plugin installer 2014-07-08 09:07:01 +02:00
Skylar Kelty
79a70e776e MDL-46227 Fix XSS in scheduled tasks 2014-07-08 13:37:13 +08:00
David Mudrák
18619d8440 MDL-46223 Improve the marking guide output 2014-07-08 13:22:50 +08:00
David Mudrák
b9b2968e8a MDL-46223 Improve the rubric output 2014-07-08 13:22:50 +08:00
Sam Hemelryk
bed9a55344 MDL-46059 mod_lti: fixed invalid decimals attribute 2014-07-08 15:35:59 +12:00
Sam Hemelryk
961484d41e Merge branch 'wip-MDL-46059-master' of git://github.com/abgreeve/moodle 2014-07-08 15:15:12 +12:00
Sam Hemelryk
94b956d3ec Merge branch 'MDL-46016_master' of https://github.com/markn86/moodle 2014-07-08 14:27:47 +12:00
Sam Hemelryk
1c194014bf MDL-19270 core_text: added unit tests for strrev 2014-07-08 14:14:51 +12:00
Sam Hemelryk
d320391099 Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle 2014-07-08 13:53:40 +12:00
Sam Hemelryk
7044c6be1f Merge branch 'MDL-46200-master' of git://github.com/danpoltawski/moodle 2014-07-08 13:38:04 +12:00
Sam Hemelryk
189f9937ad Merge branch 'mdl45982-master' of https://github.com/tlock/moodle 2014-07-08 13:26:36 +12:00
Sam Hemelryk
bac04a65bb Merge branch 'm28_MDL-46144' of https://github.com/totara/moodle 2014-07-08 13:10:30 +12:00
Sam Hemelryk
2f8cf35811 Merge branch 'MDL-46193' of git://github.com/mr-russ/moodle 2014-07-08 13:10:24 +12:00
Eloy Lafuente (stronk7)
cc7a5d40d1 Merge branch '46208-28' of git://github.com/samhemelryk/moodle 2014-07-08 02:13:35 +02:00
Sam Hemelryk
95d294368f Merge branch 'MDL-46212' of git://github.com/timhunt/moodle 
Conflicts:
	question/type/calculated/question.php
 2014-07-08 11:43:09 +12:00
Sam Hemelryk
cf9ae1134c Merge branch 'm28_MDL-46225' of https://github.com/totara/moodle 2014-07-08 10:36:10 +12:00
Sam Hemelryk
a5dcdd4bd9 Merge branch 'MDL-46240-master' of git://github.com/danpoltawski/moodle 2014-07-08 10:34:28 +12:00
Eloy Lafuente (stronk7)
292803a4f9 Merge branch 'wip_MDL-45945_m28_mssqlcol' of https://github.com/skodak/moodle 2014-07-08 00:31:54 +02:00
Sam Hemelryk
03ecddb440 MDL-45678 cache: renamed new cache and better comments 2014-07-08 09:52:41 +12:00
Sam Hemelryk
207891d791 Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle 2014-07-08 09:42:35 +12:00
Sam Hemelryk
a02656b75a Merge branch 'wip_MDL-46126_m28_passnulls' of https://github.com/skodak/moodle 2014-07-08 09:37:08 +12:00
Sam Hemelryk
4264ed8454 Merge branch 'MDL-43347-master' of https://github.com/mackensen/moodle 2014-07-08 09:28:20 +12:00
Sam Hemelryk
744c77c057 Merge branch 'MDL-16474-master' of git://github.com/FMCorz/moodle 2014-07-08 08:29:45 +12:00
Adrian Greeve
005402f503 MDL-46201 events: Sanitization of username before returning the description. 2014-07-07 18:18:45 +01:00
Yuliya Bozhko
ea76b652fc MDL-46042 badges: Clean up external badge data 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-07-07 16:37:36 +01:00
Dan Poltawski
e3541d3c1b Merge branch 'MDL-42393-master' of git://github.com/FMCorz/moodle 2014-07-07 16:27:29 +01:00
Osanda Malith Jayathissa
ce5a785b09 MDL-45683 user: Escaping Skype ID used in profile 2014-07-07 16:05:06 +01:00
Marina Glancy
9dbf62d230 MDL-45760 make sure to check permission before setting header 2014-07-07 15:06:08 +01:00
Tim Hunt
88ec9f308d MDL-46148 qtype_calculated: validate formulas everywhere. 2014-07-07 14:33:34 +01:00
Tim Hunt
155bc75472 MDL-46148 qtype_calculated: function to validate equations in text. 2014-07-07 14:33:29 +01:00
Tim Hunt
29005a5418 MDL-46148 qtype_calculated: Remove unused function. 2014-07-07 14:33:24 +01:00
Tim Hunt
44f726a7b1 MDL-46148 qtype_calculated: unit tests + fixes for validation 2014-07-07 14:33:20 +01:00
Frederic Massart
595ef4772d MDL-45417 mod_imscp: Prevent entity injections from package content 2014-07-07 13:02:54 +01:00
Frederic Massart
78ed99ec7e MDL-45463 mod_lti: Prevent XML entity injections from provider 2014-07-07 13:01:02 +01:00
Marina Glancy
e29bb97c07 MDL-45616 repositories: API changes to avoid serialized data in user input 2014-07-07 14:41:20 +08:00
Marina Glancy
56964b7948 MDL-45616 repositories: use json encoding instead of serialization 2014-07-07 14:41:20 +08:00
Marina Glancy
5ad3f3c61e MDL-45616 repositories: more clearly distinguish when we use source and when reference 
Function repository::get_moodle_file() should always be called on packed reference and not on the source received from user.
Also added phpdocs to some other methods that were confusing source and reference
 2014-07-07 14:41:20 +08:00
Dan Poltawski
a332d6606a MDL-43848 message: remove unused strings 2014-07-07 13:37:11 +08:00