3b674f5d0a
MDL-35870 mod_scorm : Bump version
2014-07-15 01:45:23 +02:00
714b25d07d
MDL-35870 mod_scorm : whitespace fixes
2014-07-15 01:41:07 +02:00
857449d769
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
2014-07-15 01:06:53 +02:00
2c3d6f240f
Merge branch 'MDL-46346_blog' of https://github.com/andyjdavis/moodle
2014-07-15 10:33:13 +12:00
d1d9e833d8
Merge branch 'MDL-46080' of https://github.com/jonof/moodle
2014-07-14 23:29:07 +02:00
3c94f90cde
MDL-37993 mod_quiz: fixed deprecated behat step
2014-07-15 09:10:17 +12:00
9b3b730c62
Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle
2014-07-15 08:48:55 +12:00
5c9ba23a68
Merge branch 'MDL-42179-003-master' of https://github.com/dbezborodovrp/moodle
2014-07-15 08:39:37 +12:00
8d0703d643
Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle
2014-07-14 18:13:18 +02:00
8707dae4f8
Merge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle
2014-07-14 18:06:52 +02:00
db3686d546
MDL-37993 Quiz: completion upon all passing grade or attempts exhausted
...
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails". (Where "fail" means "using up all attempts without passing".)
2014-07-14 10:14:27 -05:00
c5afe577c9
Merge branch 'MDL-42752-master' of git://github.com/phalacee/moodle
2014-07-14 16:06:13 +01:00
ffd17daf0a
MDL-46226 fix unit tests
2014-07-14 15:50:50 +01:00
2df87a9d2a
Merge branch 'MDL-46218_disabled2' of https://github.com/andyjdavis/moodle
2014-07-14 15:33:12 +01:00
39b803cf56
Merge branch 'm28_MDL-46197' of https://github.com/totara/moodle
2014-07-14 16:25:23 +02:00
388debc7c5
Merge branch 'm28_MDL-46226' of https://github.com/totara/moodle
2014-07-14 15:13:32 +01:00
d3181cc8b5
Merge branch 'm28_MDL-46250' of https://github.com/totara/moodle
2014-07-14 13:12:43 +01:00
080d86e39f
Merge branch 'MDL-46286-master' of https://github.com/lucisgit/moodle
2014-07-14 12:33:59 +01:00
79397b56cb
MDL-42179 mod_assign: Time remaining issue for group assignment
2014-07-14 13:41:44 +09:30
ceeb287740
Merge branch 'MDL-42214_popup_blocked' of https://github.com/andyjdavis/moodle
2014-07-14 15:27:16 +12:00
628e818be2
Merge branch 'MDL-45991_master' of https://github.com/Syxton/moodle
2014-07-14 15:19:21 +12:00
1cae31e8c7
Merge branch 'MDL-46073_master' of https://github.com/totara/openbadges
2014-07-14 15:14:49 +12:00
2b6e53e8e2
MDL-46346 blog: coding style fixes
2014-07-14 10:45:33 +08:00
e9fb99b15c
MDL-46218 reshuffled access checks in blog and notes
2014-07-14 10:33:38 +08:00
727c69ca9e
MDL-42214 core_message:prevented popup notifications of messages from blocked users
2014-07-14 09:49:47 +08:00
2cd64c93a0
Merge branch 'MDL-45765-master' of https://github.com/StudiUM/moodle
2014-07-14 12:09:29 +12:00
eb5942ea9d
Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle
2014-07-14 11:55:02 +12:00
72c9c5fa13
MDL-46138 post integratino phpdoc fixes
2014-07-14 10:50:51 +12:00
b7a9846a26
Merge branch 'MDL-46138-master' of git://github.com/damyon/moodle
2014-07-14 10:39:54 +12:00
080fdf0533
Merge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle
2014-07-14 10:32:28 +12:00
8324084299
Merge branch 'MDL-22469-master' of https://github.com/StudiUM/moodle
2014-07-14 10:21:13 +12:00
94dab2abb3
Merge branch 'MDL-31089_master' of git://github.com/dmonllao/moodle
2014-07-14 10:12:16 +12:00
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
8538c56281
MDL-31089 mod_forum: Filtering non-visible groups
2014-07-11 16:48:02 +08:00
17af896c4b
MDL-45562 blog: fixed issues when creating/editing an external blog.
2014-07-11 15:11:28 +08:00
93d14b8ad1
MDL-44523 events: Changing edulevels to make them consistent with other events
2014-07-11 10:36:00 +08:00
ab57368a72
MDL-46138 tasks: The adhoc task is being too helpful with json_encoding/decoding.
2014-07-11 09:43:32 +08:00
9b4162fb1d
MDL-31366 Feedback: decode htmlchars on output to excel
2014-07-11 13:28:16 +12:00
186f2f47dd
MDL-46197 core_calendar: Added label text to durations in minutes field
2014-07-11 09:11:20 +12:00
40ebfaeefd
MDL-46226 core: pix_icon no longer sets title to the alt text
2014-07-11 08:41:11 +12:00
b8ad1728d8
MDL-45765 Calendar import: Fix undefined variable in cron when updating calendar subscriptions
2014-07-10 16:09:28 -04:00
886601cf45
MDL-22469 auth_cas: CAS module : parameter authCAS=NOCAS not properly handled
2014-07-10 15:58:02 -04:00
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
5fd0df97c5
weekly release 2.8dev
2014-07-10 19:15:18 +02:00
54064d8ac6
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2014-07-10 19:15:06 +02:00
ad88d3ed2a
MDL-35870 mod_scorm : Adding phpdocs for new functions
...
get_scorm_default in scorm_12lib.php
get_scorm_default in scorm_13lib.php
get_scorm_default in aicclib.php
scorm_isset in locallib.php
scorm_empty in locallib.php
2014-07-10 15:40:39 +00:00
3ad5eeedcf
MDL-35870 mod_scorm : Removing loaddatamodel.php
2014-07-10 14:17:32 +00:00
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
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
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
Eloy Lafuente (stronk7)