66149 Commits

Author SHA1 Message Date
Dan Poltawski
0394a0eefe Merge branch 'MDL-43408-master' of https://github.com/tonyjbutler/moodle 2014-01-06 10:06:11 +08:00
Sam Hemelryk
7c445ab8c0 Merge branch 'w01_MDL-43527_m27_safemode' of https://github.com/skodak/moodle 2014-01-06 14:46:31 +13:00
Sam Hemelryk
8e06909afd Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle 2014-01-06 14:19:11 +13:00
Sam Hemelryk
98f0074fc5 Merge branch 'MDL-31050_rss' of https://github.com/andyjdavis/moodle 2014-01-06 14:16:26 +13:00
Sam Hemelryk
e4ac256c35 Merge branch 'wip-mdl-18770' of https://github.com/rajeshtaneja/moodle 2014-01-06 13:09:42 +13:00
Sam Hemelryk
e6d3f9438e Merge branch 'MDL-40054_master' of https://github.com/markn86/moodle 2014-01-06 12:01:54 +13:00
Sam Hemelryk
61a79e01fc Merge branch 'MDL-40551_master' of https://github.com/totara/openbadges
Conflicts:
	badges/upgrade.txt
2014-01-06 12:00:11 +13:00
Sam Hemelryk
a9bd004c8c Merge branch 'MDL-35973_redirect' of https://github.com/andyjdavis/moodle 2014-01-06 11:28:34 +13:00
Sam Hemelryk
9b94e327d3 Merge branch 'MDL-43281-master' of git://github.com/andrewnicols/moodle 2014-01-06 11:22:29 +13:00
Sam Hemelryk
f29dcf642b Merge branch 'MDL-42212-master' of git://github.com/FMCorz/moodle 2014-01-06 10:30:31 +13:00
Sam Hemelryk
62b4ddc294 Merge branch 'MDL-42801-master' of git://github.com/andrewnicols/moodle 2014-01-06 10:19:20 +13:00
Sam Hemelryk
dfed81ae12 Merge branch 'MDL-36334-master' of git://github.com/andrewnicols/moodle 2014-01-06 09:53:15 +13:00
Sam Hemelryk
2dad31ecf9 MDL-43238 mod_assign: removed incorrect validation 2014-01-06 09:51:38 +13:00
Sam Hemelryk
7404bfd003 Merge branch 'w01_MDL-43196_m27_signupfiles' of https://github.com/skodak/moodle 2014-01-06 09:11:32 +13:00
Rajesh Taneja
456d7bc7f3 MDL-18770 mod_assign: Set gradetype to GRADE_TYPE_NONE if feedback not enabled 2014-01-03 16:30:37 +08:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00
Mark Nelson
4cc4b85deb MDL-40054 mod_lesson: removed 'update email essay grade' add_to_log call
The add_to_log call was triggered whenever a grade was sent via the messaging
API. We should not be firing an event here, it should be fired via the
messaging API.
2014-01-02 19:52:49 -08:00
Mark Nelson
00c027c7e3 MDL-40054 mod_lesson: replaced 'end' add_to_log call with an event 2014-01-02 19:52:49 -08:00
Mark Nelson
9c192d812b MDL-40054 mod_lesson: replaced 'start' add_to_log call with an event 2014-01-02 19:52:48 -08:00
Mark Nelson
81d2421c55 MDL-40054 mod_lesson: replaced 'view highscores' add_to_log call with an event 2014-01-02 19:52:48 -08:00
Mark Nelson
8539411823 MDL-40054 mod_lesson: replaced 'update highscores' add_to_log call with an event 2014-01-02 19:52:44 -08:00
Mark Nelson
b6374c24ee MDL-40054 mod_lesson: replaced 'grade view' add_to_log call with an event 2014-01-02 19:44:39 -08:00
Mark Nelson
3f08c95ade MDL-40054 mod_lesson: replaced 'view all' add_to_log call with an event 2014-01-02 19:44:39 -08:00
Mark Nelson
7edf27c48e MDL-40054 mod_lesson: replaced 'view' add_to_log call with an event 2014-01-02 19:44:32 -08:00
David Monllao
afe9f42adb MDL-43173 behat: Thowing an exception if the JS is not ready 2014-01-03 11:27:54 +08:00
Rajesh Taneja
42ebe8f04f MDL-43521 block_admin_bookmarks: Site admin node is of type TYPE_SITE_ADMIN
Since 2.6 Site admin node is of type TYPE_SITE_ADMIN, previously it was TYPE_SETTING
2014-01-03 10:39:50 +08:00
Michael Milette
a059b434f7 MDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls
Conflicts:
	mod/feedback/item/multichoice/lib.php
	mod/feedback/item/multichoicerated/lib.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
2014-01-03 10:24:49 +08:00
Tony Butler
2b6b37d4f9 MDL-43373 core_enrol: Display enrolments dimmed if outside of start or end times 2014-01-02 17:16:06 +00:00
Tony Butler
0aff7a5517 MDL-43408 gradereport_grader: Display users with expired enrolments as inactive in grader report 2014-01-02 16:39:13 +00:00
Andrew Nicols
b4ab504574 MDL-43534 Course: Remove deprecated functions from course/renderer
This function was deprecated in 2.4 and was due for removal in 2.6.

Removing as per deprecation policy.
2014-01-02 11:35:33 +08:00
Andrew Nicols
2ad8f0f680 MDL-43532 Course: Remove deprecated functions from calendar
This function was deprecated in 2.4 and was due for removal in 2.6.

Removing as per deprecation policy.
2014-01-02 11:27:25 +08:00
Andrew Nicols
e9a235e444 MDL-43531 Course: Remove deprecated functions from dnduploadlib
These functions were deprecated in 2.5 and are due for removal in 2.7.

Removing as per deprecation policy.
2014-01-02 11:20:01 +08:00
Andrew Davis
6c90c5cae2 MDL-31050 rss: removed some unused function parameters and removed some low value comments 2014-01-02 10:35:14 +08:00
Petr Škoda
3e5226ab6e MDL-43528 remove all traces of magic quotes hacking from moodle core 2014-01-02 10:15:06 +08:00
Petr Škoda
90627d9d59 MDL-43527 eliminate last references to safe_mode
Safe mode is not availabel in PHP 5.4 any more...
2014-01-02 09:23:15 +08:00
Petr Škoda
61d598f057 MDL-42797 require real user login on upgrade settings page 2014-01-02 09:17:16 +08:00
Sam Hemelryk
3d907759ad MDL-23837 enrol: restyled the role and group controls 2014-01-02 11:39:53 +13:00
Sam Hemelryk
2201c02d73 MDL-43349 cache: is_ready now checks are_requirements_met by default 2014-01-02 09:55:51 +13:00
Sam Hemelryk
07658be7b4 MDL-43349 cache: init now checks store requirements are met 2014-01-02 09:44:25 +13:00
Petr Škoda
fc1d0e822d MDL-42797 require real user login on admin page 2014-01-01 15:19:02 +08:00
Mark Nelson
e9787bda9a MDL-40918 mod_lti: removed the 'launch' add_to_log call
This add_to_log call is unnecessary and does not need to be replaced with an event.
It is called whenever we view the external tool, which will trigger the view event.
There is no need for two events when this occurs.
2013-12-31 16:06:37 -08:00
Mark Nelson
3fdd73e83d MDL-40918 mod_lti: replaced 'view' and 'view all' add_to_log calls with events 2013-12-31 15:47:49 -08:00
Mark Nelson
81ec45ea11 MDL-40922 mod_folder: replaced the 'edit' add_to_log call with an event 2013-12-31 15:14:57 -08:00
Mark Nelson
6f3e33c947 MDL-40922 mod_folder: replaced the 'view' and 'view all' add_to_log calls with events 2013-12-31 15:14:57 -08:00
Petr Škoda
deae60239d MDL-43503 do not check presence of ldap paging functions, we require PHP 5.4 now 2013-12-31 14:34:20 +08:00
Andrew Nicols
fd2dcaa603 MDL-43451 Cron: Retrieve additional name fields when creating passwords 2013-12-31 13:45:14 +08:00
Andrew Davis
8f6e47d9c7 MDL-42607 mod_forum:fixed some inefficiencies in forum RSS generation 2013-12-31 12:28:09 +08:00
Andrew Nicols
4e2c2c64bb MDL-36334 mod_scorm: Remove gallery-sm-treeview
This has now been incorporated into core.
2013-12-30 19:19:26 +08:00
Andrew Nicols
9edca1ae42 MDL-36334 Libraries: Add version gallery-2013.10.02-20-26 of specified gallery modules
We currently only include:
* gallery-sm-treeview*
2013-12-30 19:19:26 +08:00
Andrew Nicols
5b49f8b3a8 MDL-36334 JavaScript: Enable access to the gallery 2013-12-30 19:19:26 +08:00