Commit graph

66458 commits

Author SHA1 Message Date
Mark Nelson
001f09548d MDL-40912 coursecat: replaced 'hide' and 'show' add_to_log calls with an event 2014-01-14 19:24:15 -08:00
Mark Nelson
d86c7206aa MDL-40912 coursecat: replaced 'move' add_to_log calls with an event 2014-01-14 19:24:14 -08:00
Mark Nelson
c4cea8cb5d MDL-40912 coursecat: replaced 'update' add_to_log call with an event 2014-01-14 19:24:14 -08:00
Mark Nelson
03ea10e6d3 MDL-40912 coursecat: replaced 'add' add_to_log call with an event 2014-01-14 19:24:08 -08:00
Eloy Lafuente (stronk7)
19c32aacea Merge branch 'MDL-43439_master-dateformat' of git://github.com/dmonllao/moodle 2014-01-15 03:59:51 +01:00
Rajesh Taneja
8acec2a693 MDL-43306 restore: Fix grade_item sortorder after restoring course
While restoring course/activity, restore will blindly insert grade_item
sortorder. Which cause dulicate sortorder and lead to unpredicatble sorting
results.

Now we will call grade_item::fix_duplicate_sortorder() after restore is finished
to fix duplicate sortorder and order grade items to the closest order possible
2014-01-15 10:28:00 +08:00
Damyon Wiese
7508094a87 Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle 2014-01-15 09:39:03 +08:00
David Monllao
4234011a1a MDL-43439 behat: Dir date without - separators 2014-01-15 09:17:44 +08:00
Dan Poltawski
852c34e509 Merge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle 2014-01-15 08:19:49 +08:00
Eloy Lafuente (stronk7)
75bdb2bfc7 Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle 2014-01-15 00:03:34 +01:00
Eloy Lafuente (stronk7)
7d4c752e31 Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle 2014-01-14 22:08:46 +01:00
Eloy Lafuente (stronk7)
988c6ba1b8 Merge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle
Conflicts:
	grade/tests/behat/behat_grade.php
	grade/tests/behat/grade_view.feature
2014-01-14 22:03:02 +01:00
Yuliya Bozhko
7f964cfdc7 MDL-43621 badges: Don't display deleted users in badge recipients list 2014-01-15 09:31:45 +13:00
Frederic Massart
f15aff3802 MDL-40533 block_html: Remove styles specific to the block 2014-01-14 19:00:31 +01:00
Ruslan Kabalin
534fc27649 MDL-43693: assignment: Fix JS error on grading page. 2014-01-14 16:19:40 +00:00
Eloy Lafuente (stronk7)
372a612221 Merge branch 'MDL-43332_master' of https://github.com/markn86/moodle 2014-01-14 16:48:22 +01:00
Eloy Lafuente (stronk7)
e5f7cce1c1 Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle 2014-01-14 16:44:11 +01:00
Eloy Lafuente (stronk7)
da47e297da Merge branch '35597-27' of git://github.com/samhemelryk/moodle 2014-01-14 16:39:00 +01:00
Eloy Lafuente (stronk7)
1b92203ef3 Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle 2014-01-14 16:01:27 +01:00
sam marshall
0f1882ed1f MDL-43619 Roles: reset_role_capabilities unit test, cache fix 2014-01-14 13:46:25 +00:00
sam marshall
3978da9e2f MDL-43619 Roles: reset_role_capabilities function destroys overrides 2014-01-14 13:46:24 +00:00
Frederic Massart
810a3da133 MDL-41506 theme_bootstrapbase: Implement highlight class 2014-01-14 11:19:43 +01:00
Dan Poltawski
473924dfd5 Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle 2014-01-14 16:50:07 +08:00
Damyon Wiese
718f42ae68 Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle 2014-01-14 16:21:21 +08:00
Dan Poltawski
824dccead3 Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle 2014-01-14 15:57:05 +08:00
Dan Poltawski
2c9c8c7f46 Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle 2014-01-14 15:48:49 +08:00
Dan Poltawski
00ae4c4ead Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle 2014-01-14 15:36:58 +08:00
Dan Poltawski
b901d0e9dd Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle 2014-01-14 15:26:52 +08:00
Damyon Wiese
a1ac22b815 Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle 2014-01-14 15:18:37 +08:00
David Monllao
5c0dfe32eb MDL-43439 behat: Save the screenshots to the specified location 2014-01-14 15:17:28 +08:00
Dan Poltawski
2be353c195 Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle 2014-01-14 15:00:11 +08:00
Dan Poltawski
88457992ba Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle 2014-01-14 14:46:55 +08:00
Dan Poltawski
4198f7f903 Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle 2014-01-14 14:43:45 +08:00
Damyon Wiese
761549816d Merge branch 'w02_MDL-43511_m27_bankcache' of https://github.com/skodak/moodle 2014-01-14 14:29:58 +08:00
Dan Poltawski
81f7090b0c MDL-40313 question: build shifter after js changes 2014-01-14 14:28:44 +08:00
Damyon Wiese
f27e462b5f Merge branch 'MDL-43302-master' of git://github.com/andrewnicols/moodle 2014-01-14 14:23:06 +08:00
Dan Poltawski
198b1facc3 Merge branch 'MDL-40313' of git://github.com/timhunt/moodle 2014-01-14 14:21:06 +08:00
Damyon Wiese
c98ee8cdc0 Merge branch 'MDL-43371-master' of git://github.com/FMCorz/moodle 2014-01-14 13:59:26 +08:00
Damyon Wiese
b6dc2b72b2 Merge branch 'MDL-43460-master' of git://github.com/FMCorz/moodle 2014-01-14 13:25:44 +08:00
Damyon Wiese
9289d5fe72 Merge branch 'w02_MDL-43488_m27_signreq' of https://github.com/skodak/moodle 2014-01-14 13:18:16 +08:00
Damyon Wiese
961f70adcd Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle 2014-01-14 13:14:09 +08:00
David Monllao
ff7139d6cb MDL-43461 testing: Avoid switching to .bat files when running MinGW
MinGW can not execute .bat files (http://sourceforge.net/p/mingw/bugs/1902)
so we should not switch to .bat files when running MinGW.
2014-01-14 13:11:07 +08:00
David Monllao
19a40b1468 MDL-43461 behat: Using linux-style directory separators when using cygwin 2014-01-14 13:10:40 +08:00
Damyon Wiese
f8a60dfe88 Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle
Conflicts:
	course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
	course/yui/dragdrop/dragdrop.js
2014-01-14 13:06:54 +08:00
Ankit Agarwal
0a61619043 MDL-40056 events: Replace old add_to_log calls with new events 2014-01-14 12:05:37 +08:00
Ankit Agarwal
25e8023d3d MDL-40056 events: Add unit tests for new events 2014-01-14 12:05:37 +08:00
Ankit Agarwal
a501fe1385 MDL-40056 events: Created Event classes to replace add_to_log() - mod_scorm
Created attempt_deleted event
Created interactions_viewed event
Created report_viewed event
Created sco_launched event
Created tracks_viewed event
Created user_report_viewed event
Created course module related events
2014-01-14 12:05:10 +08:00
Adrian Greeve
4e2ba4bb31 MDL-31597 gradebook: Update to gradebook behat tests to include testing grade weightings. 2014-01-14 11:59:01 +08:00
Adrian Greeve
1301a07a3e MDL-31597 gradebook: Removed the percentage symbol from weights in the gradebook. 2014-01-14 11:59:01 +08:00
Mark Nelson
8ff753857c MDL-43332 core_grades: automated basic grade viewing functionality performed in MDLQA-317 2014-01-14 11:59:01 +08:00