Commit graph

14985 commits

Author SHA1 Message Date
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
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
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
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
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 Davis
e3288953e7 MDL-35973 lib: added a page title to redirect() and added 2 seconds to the page redirection when posting in a forum 2013-12-30 18:26:24 +08:00
Petr Škoda
2803f3c1b5 MDL-43402 remove all zlib detection code
Zlib extension is now required.
2013-12-27 11:06:18 +08:00
Matteo Scaramuccia
323f4fff46 MDL-43482 Chat Lot of "Only variables should be passed by reference". 2013-12-24 11:02:29 +01:00
Sam Hemelryk
946e770ede Merge branch 'MDL-43243-master' of git://github.com/andrewnicols/moodle 2013-12-24 11:56:01 +13:00
Sam Hemelryk
c5213d7e6e Merge branch 'MDL-43438-master' of git://github.com/FMCorz/moodle 2013-12-24 11:23:15 +13:00
Sam Hemelryk
ee70f10f99 Merge branch 'MDL-43250-master' of git://github.com/damyon/moodle 2013-12-24 10:36:22 +13:00
Andrew Nicols
54a3dca258 MDL-43307 JavaScript: Migrate moodle-mod_assign-history to use Shifter 2013-12-23 16:18:10 +08:00
Sam Hemelryk
6ac16bb981 Merge branch 'MDL-35032-master' of git://github.com/FMCorz/moodle 2013-12-23 15:58:04 +13:00
Rajesh Taneja
cdfd607449 MDL-43293 Events: Added unit test for comment events 2013-12-23 09:22:15 +08:00
Rajesh Taneja
a55eaf0351 MDL-43293 Events: Added comments event in modules supporting comments 2013-12-23 09:22:14 +08:00
Eloy Lafuente (stronk7)
a6761e26e7 Merge branch 'MDL-43318-master' of git://github.com/damyon/moodle 2013-12-23 00:39:41 +01:00
Damyon Wiese
997588195d MDL-43318 Assign: Fix bug when editing previous attempt feedback 2013-12-20 11:14:27 +08:00
Damyon Wiese
4a47008ca6 MDL-42585 Assign: Add capability to only view grades
AMOS BEGIN
    CPY [viewgrades,grades],[assign:viewgrades,mod_assign]
AMOS END
2013-12-20 11:01:44 +08:00
Eloy Lafuente (stronk7)
1f73779156 MDL-42425 assign: keep already bumped version. 2013-12-20 03:40:58 +01:00
Eloy Lafuente (stronk7)
c7df8656be Revert "MDL-42425 modify mod_assign_save_grade to process advanced grading data"
This reverts commit 29932b2112.

Conflicts:
	mod/assign/upgrade.txt
2013-12-20 03:39:14 +01:00
David Monllao
f49cede794 MDL-43404 behat: Avoid failures at framework level as much as possible
- Move them to i_look_for_exceptions() so they will be
  thrown at a step (scenario) level.
- Accept alerts only when they are detected to avoid
  all the following scenarios to be failing; they would
  continue executing, but they will all fail if the alert
  is still there
- Add a step to avoid add_scorm.feature to fail
- Refine the UnknownError catch
2013-12-19 15:48:03 +08:00
Frederic Massart
19c70231f9 MDL-43454 mod_assignment: Use of undefined constants FILE_* 2013-12-19 07:21:04 +01:00
Dan Poltawski
70f1ddba87 Merge branch 'wip-mdl-43437' of https://github.com/rajeshtaneja/moodle 2013-12-19 10:56:41 +08:00
Damyon Wiese
76dc48cb6a MDL-34432 Assign: Set up the commentinline form element properly. 2013-12-19 09:40:14 +08:00
Eloy Lafuente (stronk7)
c751d81bbc Merge branch 'MDL-42425' of https://github.com/Lightwork-Marking/moodle
Conflicts:
	mod/assign/upgrade.txt
2013-12-19 01:37:57 +01:00
Paul Charsley
29932b2112 MDL-42425 modify mod_assign_save_grade to process advanced grading data 2013-12-19 09:39:22 +13:00
Frederic Massart
4550e762f4 MDL-43438 mod_assignment: Prevent double inclusion of plugin files 2013-12-18 09:13:47 +01:00
Rajesh Taneja
fc832a4882 MDL-43437 wiki: Fixed unit test for page_version_deleted event 2013-12-18 13:56:44 +08:00
Eloy Lafuente (stronk7)
5d2667fa07 Merge branch 'MDL-40920_master' of https://github.com/markn86/moodle 2013-12-18 00:13:15 +01:00
Eloy Lafuente (stronk7)
1f71f7685a Merge branch 'MDL-43025-master' of git://github.com/damyon/moodle 2013-12-17 22:58:51 +01:00
Sam Hemelryk
9b4c44c8e6 Merge branch 'MDL-43074-master' of git://github.com/damyon/moodle 2013-12-18 09:59:05 +13:00
Marina Glancy
9cba0f8981 Merge branch 'wip-MDL-43295-master' of git://github.com/abgreeve/moodle 2013-12-17 16:35:31 +11:00
Sam Hemelryk
233e6b985b Merge branch 'MDL-43259-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/upgrade.txt
2013-12-17 16:32:35 +13:00
Adrian Greeve
fb59d5352a MDL-43295 mod_assign: Removed wrongly used format_text call in online text submission. 2013-12-17 10:42:20 +08:00
Sam Hemelryk
bb4551334f Merge branch 'MDL-34321-master' of git://github.com/phalacee/moodle 2013-12-17 08:48:08 +13:00
Sam Hemelryk
2b08f90aca Merge branch 'MDL-36984-master' of git://github.com/phalacee/moodle 2013-12-17 08:45:05 +13:00
Frederic Massart
545b310c84 MDL-42212 mod_lesson: Use autoloading for mod_lesson_file_info 2013-12-16 07:03:46 +01:00
Frederic Massart
89133afae6 MDL-42212 mod_lesson: Localise area names 2013-12-16 06:49:05 +01:00
Frederic Massart
b47dc5ffea MDL-42212 mod_lesson: Fix callbacks retrieving activity files 2013-12-16 06:49:05 +01:00
Damyon Wiese
f268fb5d20 MDL-43250 Assign: separate groups mode fix
When in separate groups mode, only get graders in a group that is in the course module grouping.
2013-12-16 10:54:38 +08:00
Sam Hemelryk
9f5b319345 Merge branch 'MDL-34432-master' of git://github.com/damyon/moodle 2013-12-16 15:46:56 +13:00
Damyon Wiese
c7a7368958 MDL-34432: Allow comment inline (stripping embedded images version) 2013-12-16 10:38:23 +08:00
Marina Glancy
2a73cfb011 Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle 2013-12-16 12:27:38 +11:00
Sam Hemelryk
3b94d80c20 Merge branch 'MDL-40096-master' of git://github.com/damyon/moodle 2013-12-16 13:52:16 +13:00