67080 Commits

Author SHA1 Message Date
Rajesh Taneja
ac8976c8b5 MDL-43681 report_log: Modified log report to use log readers 2014-03-24 17:24:12 +08:00
Marina Glancy
9b8555fbea weekly release 2.7dev 2014-03-20 16:00:08 +08:00
Marina Glancy
5cff835bd6 Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle 2014-03-19 21:22:25 +01:00
Jetha Chan
3c9535dd94 MDL-44582 installer: added check for php json extension 2014-03-19 21:22:24 +01:00
Sam Hemelryk
84e8be12e5 Merge branch 'wip-mdl-44552' of https://github.com/rajeshtaneja/moodle 2014-03-19 21:22:24 +01:00
Marina Glancy
ef3bffdec4 MDL-42025 behat: changed behat tag _only_local to _file_upload 2014-03-19 21:22:24 +01:00
Marina Glancy
4158a6f5ed Merge branch 'MDL-43341' of git://github.com/nobelium/moodle 2014-03-19 21:22:23 +01:00
Sam Hemelryk
89381287ce Merge branch 'MDL-44608-master-fix1' of http://github.com/damyon/moodle 2014-03-19 21:22:23 +01:00
Ankit Agarwal
2f4cf9a1da MDL-42890 backups: Updated help string to indicate logging is required 2014-03-19 15:40:53 +08:00
Rajesh Taneja
b54696395d MDL-44552 Events: Fixed wrong id returned in get_url 2014-03-19 09:57:44 +08:00
Marina Glancy
4826ed1177 Merge branch 'MDL-44141-master' of git://github.com/sammarshallou/moodle 2014-03-19 09:49:00 +08:00
Damyon Wiese
9be8583ac5 MDL-44608 task scheduler: Make unit test case insensitive 2014-03-19 09:24:50 +08:00
Eloy Lafuente (stronk7)
2c36f83422 MDL-41760 move upgrade steps to match 04 version.
In previous (merge) commit, version was moved, on conflict
to 04 (coz 01) was already in use. This commit moves the 3
upgrade steps to 02, 03 and 04, matching that final version.
2014-03-19 02:15:17 +01:00
Eloy Lafuente (stronk7)
1c774322ba Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle
Conflicts:
	version.php
2014-03-19 02:14:00 +01:00
Eloy Lafuente (stronk7)
b9add57766 Merge branch 'MDL-41216' of https://github.com/nobelium/moodle 2014-03-19 01:23:08 +01:00
Eloy Lafuente (stronk7)
a4627988fd Merge branch 'MDL-44328-M27' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-03-19 01:02:51 +01:00
sam marshall
ddf368a213 MDL-44141 Completion: System updates data during restore
The completion system has code which is supposed to prevent it
updating completion status while grades are being restored. This
code was a nasty hack and had not worked for some time. As a result
completion dates were restored incorrectly.

This commit implements a 'proper' way to find out if a restore is
currently running, replacing the previous hack.
2014-03-18 13:31:34 +00:00
James Pratt
038014c415 MDL-41760 quiz_statistics : response analysis for first/last/all tries 2014-03-18 18:47:19 +07:00
Andreas Grabs
e68fc3c6f1 MDL-44653 mod_feedback - Include additional name fields using user_picture::fields() 2014-03-18 18:24:18 +08:00
Marina Glancy
efd727063f Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle 2014-03-18 18:00:42 +08:00
Ankit Agarwal
e1b2a0b4ef MDL-42892 logging: Refactor logstore_legacy to group all legacy related changes together 2014-03-18 17:50:48 +08:00
Marina Glancy
aa1f1b75fb Merge branch 'MDL-38636-master' of git://github.com/roelmann/moodle 2014-03-18 17:39:40 +08:00
Ankit Agarwal
536c0865ef MDL-42892 logging: Remove usage of logtable from can_delete_course 2014-03-18 17:35:59 +08:00
Marina Glancy
7019e15e60 MDL-42025 behat: renamed deprecated method 2014-03-18 17:15:36 +08:00
Jerome Mouneyrac
9e103d6e15 MDL-42025 assignfeedback_editpdf: add behat tests 2014-03-18 17:14:31 +08:00
Marina Glancy
3aa71904a1 Merge branch 'w12_MDL-44191_m27_mysql56' of git://github.com/skodak/moodle 2014-03-18 16:03:47 +08:00
David Monllao
0176d12dd6 MDL-44246 behat: New mod_quiz test when JS is disabled
Also including a modification in behat_question_base
to make the internal method work with both JS and non-JS.
2014-03-18 15:32:58 +08:00
Marina Glancy
5a22864234 Merge branch 'MDL-44416' of git://github.com/appalachianstate/moodle 2014-03-18 14:45:55 +08:00
Marina Glancy
09f019ddb1 Merge branch 'MDL-44148-master' of git://github.com/jethac/moodle 2014-03-18 14:33:17 +08:00
Jetha Chan
93075bf073 MDL-44148 portfolio: set_user_config usage fix
Amended user/portfolio.php's use of portfolio_plugin_base::set_user_config to be consistent with the API.
2014-03-18 14:19:36 +08:00
Marina Glancy
fabc88f0bb Merge branch 'MDL-29807' of git://github.com/jleyva/moodle 2014-03-18 13:52:45 +08:00
Juan Leyva
2e1eda559e MDL-44444 Add fileurl to mod_assign_get_submissions webservice response parameters 2014-03-18 13:46:16 +08:00
Sam Hemelryk
f3516ad3b8 Merge branch 'wip-MDL-44542-master' of git://github.com/marinaglancy/moodle 2014-03-18 17:04:57 +13:00
Marina Glancy
d2097020b4 MDL-44524 feedback: fix bug in sql under oracle
Thanks to Rob King"
2014-03-18 12:00:14 +08:00
Sam Hemelryk
c98edede85 Merge branch 'MDL-44505' of https://github.com/bostelm/moodle 2014-03-18 15:00:24 +13:00
Sam Hemelryk
319633a0c6 Merge branch 'MDL-44502' of https://github.com/bostelm/moodle 2014-03-18 14:40:56 +13:00
Sam Hemelryk
72d80b598d Merge branch 'MDL-44433-master' of git://github.com/danpoltawski/moodle 2014-03-18 14:35:55 +13:00
Sam Hemelryk
dbedde8d86 Merge branch 'MDL-44381-M27' of git://github.com/lazydaisy/moodle 2014-03-18 14:32:37 +13:00
Sam Hemelryk
b02d88d98c Merge branch 'mdl44499-master' of https://github.com/tlock/moodle 2014-03-18 14:26:56 +13:00
Sam Hemelryk
224f8dfda1 Merge branch 'w12_MDL-44527_m27_cacert' of https://github.com/skodak/moodle 2014-03-18 12:52:19 +13:00
Sam Hemelryk
43301757eb Merge branch 'w12_MDL-44515_m27_phpexcel' of https://github.com/skodak/moodle 2014-03-18 11:48:47 +13:00
Sam Hemelryk
0406fb9a4b Merge branch 'w12_MDL-44516_m27_purifier' of https://github.com/skodak/moodle 2014-03-18 11:48:21 +13:00
Sam Hemelryk
1c6dff6f1c Merge branch 'w12_MDL-44521_m27_tcpdf' of https://github.com/skodak/moodle 2014-03-18 11:48:11 +13:00
Sam Hemelryk
7286f5923d Merge branch 'w12_MDL-44522_m27_markdown' of https://github.com/skodak/moodle 2014-03-18 10:17:04 +13:00
Sam Hemelryk
114d1ccf32 Merge branch 'MDL-44550-master' of git://github.com/damyon/moodle 2014-03-18 09:43:42 +13:00
Sam Hemelryk
c16fc19461 Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle 2014-03-18 09:30:39 +13:00
Sam Hemelryk
c961d9626e Merge branch 'w12_MDL-44609_m27_taskcomponent' of https://github.com/skodak/moodle 2014-03-18 09:16:09 +13:00
Sam Hemelryk
7aafc49c18 Merge branch 'MDL-44585-master' of https://github.com/StudiUM/moodle 2014-03-18 09:03:21 +13:00
Juan Leyva
eb625bcf64 MDL-29807 Fixed invalid add_record_snapshot references and also inexistent check of empty short names 2014-03-17 12:35:20 +01:00
Marina Glancy
e65825830f Merge branch 'MDL-44588' of git://github.com/timhunt/moodle 2014-03-17 18:18:36 +08:00