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

69013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
5c9ba23a68 Merge branch 'MDL-42179-003-master' of https://github.com/dbezborodovrp/moodle 2014-07-15 08:39:37 +12:00
Eloy Lafuente (stronk7)
8d0703d643 Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle 2014-07-14 18:13:18 +02:00
Eloy Lafuente (stronk7)
8707dae4f8 Merge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle 2014-07-14 18:06:52 +02:00
Dan Poltawski
c5afe577c9 Merge branch 'MDL-42752-master' of git://github.com/phalacee/moodle 2014-07-14 16:06:13 +01:00
Dan Poltawski
ffd17daf0a MDL-46226 fix unit tests 2014-07-14 15:50:50 +01:00
Dan Poltawski
2df87a9d2a Merge branch 'MDL-46218_disabled2' of https://github.com/andyjdavis/moodle 2014-07-14 15:33:12 +01:00
Eloy Lafuente (stronk7)
39b803cf56 Merge branch 'm28_MDL-46197' of https://github.com/totara/moodle 2014-07-14 16:25:23 +02:00
Dan Poltawski
388debc7c5 Merge branch 'm28_MDL-46226' of https://github.com/totara/moodle 2014-07-14 15:13:32 +01:00
Dan Poltawski
d3181cc8b5 Merge branch 'm28_MDL-46250' of https://github.com/totara/moodle 2014-07-14 13:12:43 +01:00
Dan Poltawski
080d86e39f Merge branch 'MDL-46286-master' of https://github.com/lucisgit/moodle 2014-07-14 12:33:59 +01:00
Damien Bezborodov
79397b56cb MDL-42179 mod_assign: Time remaining issue for group assignment 2014-07-14 13:41:44 +09:30
Sam Hemelryk
ceeb287740 Merge branch 'MDL-42214_popup_blocked' of https://github.com/andyjdavis/moodle 2014-07-14 15:27:16 +12:00
Sam Hemelryk
628e818be2 Merge branch 'MDL-45991_master' of https://github.com/Syxton/moodle 2014-07-14 15:19:21 +12:00
Sam Hemelryk
1cae31e8c7 Merge branch 'MDL-46073_master' of https://github.com/totara/openbadges 2014-07-14 15:14:49 +12:00
Andrew Davis
e9fb99b15c MDL-46218 reshuffled access checks in blog and notes 2014-07-14 10:33:38 +08:00
Andrew Davis
727c69ca9e MDL-42214 core_message:prevented popup notifications of messages from blocked users 2014-07-14 09:49:47 +08:00
Sam Hemelryk
2cd64c93a0 Merge branch 'MDL-45765-master' of https://github.com/StudiUM/moodle 2014-07-14 12:09:29 +12:00
Sam Hemelryk
eb5942ea9d Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle 2014-07-14 11:55:02 +12:00
Sam Hemelryk
72c9c5fa13 MDL-46138 post integratino phpdoc fixes 2014-07-14 10:50:51 +12:00
Sam Hemelryk
b7a9846a26 Merge branch 'MDL-46138-master' of git://github.com/damyon/moodle 2014-07-14 10:39:54 +12:00
Sam Hemelryk
080fdf0533 Merge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle 2014-07-14 10:32:28 +12:00
Sam Hemelryk
8324084299 Merge branch 'MDL-22469-master' of https://github.com/StudiUM/moodle 2014-07-14 10:21:13 +12:00
Sam Hemelryk
94dab2abb3 Merge branch 'MDL-31089_master' of git://github.com/dmonllao/moodle 2014-07-14 10:12:16 +12:00
Tony Butler
817b202018 MDL-46286 lib_htmlpurifier: Add allowed URI scheme for RTMP 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-11 15:52:34 +01:00
David Monllao
8538c56281 MDL-31089 mod_forum: Filtering non-visible groups 2014-07-11 16:48:02 +08:00
Simey Lameze
17af896c4b MDL-45562 blog: fixed issues when creating/editing an external blog. 2014-07-11 15:11:28 +08:00
David Monllao
93d14b8ad1 MDL-44523 events: Changing edulevels to make them consistent with other events 2014-07-11 10:36:00 +08:00
Damyon Wiese
ab57368a72 MDL-46138 tasks: The adhoc task is being too helpful with json_encoding/decoding. 2014-07-11 09:43:32 +08:00
Dan Marsden
9b4162fb1d MDL-31366 Feedback: decode htmlchars on output to excel 2014-07-11 13:28:16 +12:00
Brian Barnes
186f2f47dd MDL-46197 core_calendar: Added label text to durations in minutes field 2014-07-11 09:11:20 +12:00
Brian Barnes
40ebfaeefd MDL-46226 core: pix_icon no longer sets title to the alt text 2014-07-11 08:41:11 +12:00
Jean-Philippe Gaudreau
b8ad1728d8 MDL-45765 Calendar import: Fix undefined variable in cron when updating calendar subscriptions 2014-07-10 16:09:28 -04:00
Gilles-Philippe Leblanc
886601cf45 MDL-22469 auth_cas: CAS module : parameter authCAS=NOCAS not properly handled 2014-07-10 15:58:02 -04:00
Syxton
55c9a15041 MDL-45991 groups: Auto-create ignore grouped users 
MDL-45991 groups: Auto-create groups with ungrouped users only

When using auto-create groups, sometimes it is needed to only create
groups with users that are not already inside a course group.  This
patch creates a checkbox that will ignore users that are in already
existing groups.  It alters the groups_get_potential_members function so
that the eligible users are retrieved entirely though sql.
 2014-07-10 15:44:21 -04: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