Commit graph

74303 commits

Author SHA1 Message Date
AMOS bot
121cfa76c2 Automatically generated installer lang files 2015-05-30 00:04:03 +08:00
David Monllao
b3e6802cf8 MDL-42192 caches: Adding simpledata tests 2015-05-29 17:18:31 +08:00
Martin Mastny
96a2e00d42 MDL-39319 langimport: Javascript confirmation when uninstalling 2015-05-29 13:08:33 +08:00
Martin Mastny
6ddf92c774 MDL-39319 langimport: Able to delete more languages at once 2015-05-29 13:08:33 +08:00
Martin Mastny
069d0f1733 MDL-50322 mod_forum: Added validation when spliting discussions 2015-05-29 09:11:39 +08:00
AMOS bot
9277e79e2a Automatically generated installer lang files 2015-05-29 00:03:56 +08:00
jinhofer
aa65ecea98 MDL-50304 atto/plugins/table: Fixed _addRowAfter function 2015-05-28 07:53:10 -05:00
jinhofer
0fa9b33463 MDL-50140 grade/import: Added CSH buttons to import grades
CSH buttons have been added to CSV Import as well as Paste
from spreadsheet in the following areas:
Encoding, Separator (csv only), Verbose, Preview, Map to,
and Map from.

The heading of Import CSV had a CSH button added as well.

All CSH buttons were given associated language strings.
2015-05-28 07:51:50 -05:00
AMOS bot
62bdf9b779 Merge branch 'master' into install_master 2015-05-28 14:21:55 +08:00
Simey Lameze
e9588b7e68 MDL-50380 mod_wiki: fix missing parameter on wiki edit files page
Also fixing a typo on the $referer variable.
2015-05-28 12:40:43 +08:00
Mark Nelson
2b7b0bae62 MDL-50309 core_upgrade: fixed undefined '$customusermenuitems' notice 2015-05-27 21:29:39 -07:00
Martin Mastny
9cf1b21127 MDL-50186 forms: Removed special characters from id attribute 2015-05-28 11:41:51 +08:00
David Monllao
0c6faf4b51 weekly on-sync release 3.0dev 2015-05-28 11:41:36 +08:00
David Monllao
187c4d47be Merge branch 'MDL-50373' of git://github.com/timhunt/moodle 2015-05-28 09:27:30 +08:00
Tim Hunt
e7df2335b6 MDL-50373 questions: random Qs must not pick deleted or sub- questions
This was a regression caused by MDL-6340. I missed the necessary
    AND parent = 0 AND hidden = 0
in one query of the question table.
2015-05-27 20:32:47 +01:00
Eloy Lafuente (stronk7)
e987eeef75 Merge branch 'wip-mdl-49806' of https://github.com/rajeshtaneja/moodle 2015-05-27 12:20:50 +02:00
Ankit Agarwal
648cddcbca MDL-46479 enrol_plugin: Final deprecation of instance_deletable() 2015-05-27 14:03:21 +05:30
David Monllao
c5954f64ae MDL-50330 blog: Make other users blogs accessible 2015-05-27 14:03:34 +08:00
David Monllao
de6b4e9dac Merge branch 'MDL-50340-master' of git://github.com/ankitagarwal/moodle 2015-05-27 11:58:22 +08:00
David Monllao
9d1593d686 Merge branch 'wip-mdl-49772' of git://github.com/rajeshtaneja/moodle 2015-05-27 11:50:01 +08:00
Rajesh Taneja
b7861ddab3 MDL-49772 behat: Removed optimization as it's not required
This api is called very few times in behat
initilisation process, so such optimization
is an over engineer. Hence removing it.
2015-05-27 11:20:48 +08:00
Rajesh Taneja
e2e37bc510 MDL-49806 behat: Ensure user is marked complete before runnning cron 2015-05-27 09:24:18 +08:00
David Monllao
1bd2c8ad01 Merge branch 'MDL-49611' of git://github.com/srynot4sale/moodle-fixes 2015-05-27 08:49:23 +08:00
jinhofer
36231b6cd5 MDL-49732 atto/plugins/link: Added CTRL+K for creating a link 2015-05-26 15:45:05 -05:00
Eloy Lafuente (stronk7)
777cb3ece8 Merge branch 'wip-mdl-49772' of https://github.com/rajeshtaneja/moodle 2015-05-26 18:48:03 +02:00
Eloy Lafuente (stronk7)
84152b676a Merge branch 'wip-MDL-50191-master' of https://github.com/marinaglancy/moodle 2015-05-26 18:19:42 +02:00
AMOS bot
c472077460 Automatically generated installer lang files 2015-05-27 00:03:51 +08:00
Dan Poltawski
502bcf9738 Merge branch 'MDL-50318-master-courseresources' of git://github.com/mudrd8mz/moodle 2015-05-26 13:05:16 +01:00
Dan Poltawski
2a72614f53 Merge branch 'MDL-49787_email_attachments_symlink_fix' of https://github.com/iamandrew/moodle 2015-05-26 12:57:12 +01:00
Dan Poltawski
450b0f1dfd Merge branch 'MDL-49776-master' of git://github.com/lameze/moodle 2015-05-26 11:53:34 +01:00
Dan Poltawski
aa55e70382 Merge branch 'MDL-49560-master' of git://github.com/gurgus/moodle 2015-05-26 11:33:26 +01:00
Dan Poltawski
e0db4c775e Merge branch 'MDL-50271-master' of git://github.com/jleyva/moodle 2015-05-26 11:31:38 +01:00
David Monllao
9b7c42eac7 Merge branch 'MDL-50344-master' of git://github.com/ankitagarwal/moodle 2015-05-26 17:29:22 +08:00
David Monllao
74c32f21e2 Merge branch 'MDL-48664-master' of git://github.com/jethac/moodle 2015-05-26 14:45:34 +08:00
David Monllao
fb00b083ce Merge branch 'MDL-46550-master' of git://github.com/ankitagarwal/moodle 2015-05-26 12:28:59 +08:00
David Monllao
c8f92d487a Merge branch 'MDL-50289-master-notes' of git://github.com/mudrd8mz/moodle 2015-05-26 12:23:03 +08:00
Jetha Chan
b146b6a8c3 MDL-48664 output: change paging_bar to not use non-breaking spaces 2015-05-26 12:13:14 +08:00
Daniel Neis
2108ac8a4f MDL-30960 messages: add option to set authtype 2015-05-25 13:40:48 -03:00
Dan Poltawski
9dbe663dbf Merge branch 'MDL-50313-master-featureidnumber' of git://github.com/mudrd8mz/moodle 2015-05-25 13:54:04 +01:00
Dan Poltawski
3b88ce4bce Merge branch 'MDL-50321-master-modupgradetxt' of git://github.com/mudrd8mz/moodle 2015-05-25 12:30:34 +01:00
Dan Poltawski
cd580ee337 Merge branch 'MDL-40592_master' of https://github.com/nadavkav/moodle 2015-05-25 12:28:38 +01:00
Dan Poltawski
e2a472e024 Merge branch 'MDL-49493-master' of git://github.com/mastnym/moodle 2015-05-25 12:00:44 +01:00
David Mudrák
e9acc1d6c5 MDL-50289 notes: No navigation to notes if the feature is disabled 2015-05-25 12:35:26 +02:00
David Monllao
5362e3ca3a Merge branch 'wip-MDL-49572-master' of git://github.com/marinaglancy/moodle 2015-05-25 17:54:00 +08:00
Damien Bezborodov
e604d38fc7 MDL-50285 gradereport_user: Grade categories calculate wrong with suspended users (Student's view) 2015-05-25 17:43:48 +08:00
David Monllao
d34a865a61 Merge branch 'wip-MDL-50330-master' of git://github.com/abgreeve/moodle 2015-05-25 16:37:06 +08:00
Marina Glancy
d08f2f1175 MDL-49560 webservice: avoid recursion in soap
Thanks to El Leonidych for providing a patch
2015-05-25 15:57:23 +08:00
Ankit Agarwal
f987afbc2c MDL-50344 restore: Make restore file required 2015-05-25 12:02:16 +05:30
Ankit Agarwal
2d3fcda8ec MDL-50340 adminstration: Fix restore course links 2015-05-25 11:11:20 +05:30
spvickers
058cd1c1d0 MDL-49776 mod_lti: Set parameter in privacy check
Moved sending of the lis_result_sourcedid parameter to within the block
which checks that grades are being accepted for the link.
2015-05-25 13:01:33 +08:00