mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
68,975 Commits 36 Branches 519 Tags
Commit Graph

68975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Davis
e9fb99b15c MDL-46218 reshuffled access checks in blog and notes 2014-07-14 10:33:38 +08:00
Eloy Lafuente (stronk7)
5fd0df97c5 weekly release 2.8dev 2014-07-10 19:15:18 +02:00
Eloy Lafuente (stronk7)
54064d8ac6 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-07-10 19:15:06 +02:00
Ankit Agarwal
82b3260eab MDL-46148 qtype_calculated: low-level defence against bad formulas 
This catches things like:
 * Malicious equations coming from backup files.
 * Malicious equations in old questions in the database.
 2014-07-10 17:55:11 +08:00
Andrew Nicols
f2946a5419 MDL-38990 mod_forum: Restrict ability to post to all groups in a forum 
In order to post to all groups in a forum, you must have the
moodle/site:accessallgroups capability.

Thanks to Jakob Ackermann <jackermann@onlineschool.ca> for part of the fix
on this one.
 2014-07-10 16:26:01 +08:00
Russell Smith
9462323b13 MDL-46193 phpunit: Replace value in component config. 
There are two phpunit.xml build locations, one for overall
and another for individual components.  To reduce id changes
when running different components, we use the same initial ID
in all component files when building.
 2014-07-10 09:53:23 +02:00
Damyon Wiese
539a25ff03 MDL-46148 questions: Added missing allow_commit for transaction 2014-07-10 11:35:47 +08:00
Damyon Wiese
a77e8b7b7b Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle 
Conflicts:
	lib/graphlib.php
 2014-07-10 09:57:06 +08:00
Tim Hunt
5c6c172033 MDL-46148 qtype_calculatedsimple: fix notice 
... when adding a dataset with a formula error.
 2014-07-09 13:47:48 +01:00
Tim Hunt
66de66fe6a MDL-46148 qtype_calculated: fix validation when importing. 
In order to do this in a sane way, I cleaned up a lot of old mess,
inclduing:

1. Previously, qtype_calcuated used ->answeres when importing, and
->answer when saving the form. This was crazy, so I fixed it, and
stripped out the code that made the alternative variable name work.

2. Similarly, it could handle ->answer being either an array, such as
you would get form the HTML editor, or a simple string, which is what
you get form the form. I simplified that too.

3. Finally, I made import use a transaction around saving each
question, so we don't get half questions in the database when an error
occurs.
 2014-07-09 13:35:09 +01:00
Nadav Kavalerchik
94e2dc1daf MDL-19270 - Quiz graph - Fix reverse display of Hebrew legend text in RTL mode 2014-07-09 14:57:31 +03:00
Tim Hunt
770d3ce426 MDL-46148 qtype_calculated: removed unused method. 2014-07-09 12:56:18 +01:00
David Mudrák
db5a6e6560 MDL-46223 Fix frequently used comments in the marking guide 
When the frequently used comment contains a character like >, re-use it
directly instead of its HTML entitiy.
 2014-07-09 16:42:39 +08:00
David Mudrák
6c3264a22a MDL-46223 Improve the display of marking guide validation message 2014-07-09 16:42:37 +08:00
Dan Poltawski
ebf709ded5 MDL-46227 fix typo 2014-07-09 08:22:45 +01:00
Dan Poltawski
abc5f84539 MDL-44605 calendar: improved returnurl validation 
Now we will only redirect to a local url (though sesskey was
already preventing this redirect from being open)
 2014-07-09 01:05:51 +02:00
Eloy Lafuente (stronk7)
b77130af5e Merge branch '41502-28' of git://github.com/samhemelryk/moodle 2014-07-09 00:51:22 +02:00
Eloy Lafuente (stronk7)
fa4f0de6b1 MDL-42609 course: management default missing bits 
With the previous commit in this issue, now the course management
UI defaults to show the "default category" courses.

But some bits were missing in order to make that default behavior
fully equivalent with the manual navigation to that category.

This patch:
  - Adds the missing categoryid url param, used by some of the options
    in the UI, like sorting, that was completely broken.
  - Sets the context to the default category, previously was being set to
    system context, incorrectly if now we are defaulting to a category.

That way everything is 100% the same than when we land to the category manually.
 2014-07-08 21:21:25 +02:00
Eloy Lafuente (stronk7)
4c8914b777 Merge branch '42609-28' of git://github.com/samhemelryk/moodle 2014-07-08 20:31:25 +02:00
Eloy Lafuente (stronk7)
7a26204e18 Merge branch 'MDL-43849_master' of git://github.com/dmonllao/moodle 2014-07-08 20:28:58 +02:00
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