mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 11:32:42 +01:00
Code Issues Projects Releases Wiki Activity
72,443 Commits 36 Branches 527 Tags
6230f717bf
Commit Graph

16507 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
6230f717bf Merge branch 'MDL-48984' of git://github.com/jmvedrine/moodle 2015-03-03 12:52:20 +01:00
Dan Poltawski
6a4caa0128 Merge branch 'MDL-34006_m29v6' of https://github.com/sbourget/moodle 
Conflicts:
	mod/lesson/version.php
	mod/lesson/db/upgrade.php
	mod/lesson/db/install.xml
 2015-03-03 11:40:17 +00:00
Dan Poltawski
8eed9a9f42 Merge branch 'MDL-49160-master' of git://github.com/merrill-oakland/moodle 2015-03-03 08:34:31 +00:00
Dan Poltawski
3d25edb5d9 Merge branch 'MDL-35995-master' of git://github.com/xow/moodle 2015-03-03 08:33:02 +00:00
Andrew Nicols
ebb18182a6 MDL-49285 mod_quiz: Remove unnecessary linebreak 2015-03-03 16:23:13 +08:00
Andrew Nicols
aa0de891d1 Merge branch 'MDL-49285-master' of git://github.com/merrill-oakland/moodle 2015-03-03 16:22:01 +08:00
Andrew Nicols
596b86d6b2 Merge branch 'MDL-49075-master' of https://github.com/lucisgit/moodle 2015-03-03 15:32:13 +08:00
Jean-Michel Vedrine
a1300e98bb MDL-48984 mod_lesson: some lesson_answers answers should be plain text 
Branch tables jump descriptions, short answer question answers
and numerical question answers should be plain text, and no editor
should be available here.
 2015-03-03 08:24:24 +01:00
Eloy Lafuente (stronk7)
900aa6e5fe Merge branch 'MDL-49328-master' of https://github.com/lucisgit/moodle 2015-03-02 18:12:28 +01:00
Dan Poltawski
dab0d47632 Merge branch 'master_MDL-49303' of https://github.com/danmarsden/moodle 2015-03-02 16:57:52 +00:00
Marina Glancy
1edd3d6fbf MDL-48804 core: do not set current course until login validated 2015-03-02 16:48:15 +01:00
Dan Poltawski
add310ab44 Merge branch 'MDL-23273-master' of git://github.com/zbdd/moodle 2015-03-02 09:33:40 +00:00
Tony Butler
d312bb70b4 MDL-49328 mod_choice: Include 'showpreview' field in module backup 2015-02-27 09:46:57 +00:00
Tony Butler
5047b0ea8f MDL-49075 mod_assign: Add assertions to marking workflow unit test 
Make sure grades aren't pushed to gradebook for marking workflow
states other than 'released'.
 2015-02-26 11:52:46 +00:00
Tony Butler
251d85c013 MDL-49075 mod_assign: Keep unreleased assign grades out of gradebook 2015-02-26 11:52:46 +00:00
Dan Marsden
5e437bc0c0 MDL-49303 mod_scorm: Initialise student preferences on re-entry. 2015-02-26 20:36:48 +13:00
John Okely
e562a244b6 MDL-35995 mod_glossary: Allow rating of unapproved glossary items 2015-02-26 11:01:57 +08:00
Stephen Bourget
60742fdad1 MDL-34006 Lesson: Behat tests 2015-02-25 10:22:59 -05:00
Stephen Bourget
6695d5947f MDL-34006 Lesson: Resume lesson loads wrong page. 2015-02-25 10:22:41 -05:00
Eric Merrill
2909c04408 MDL-49285 quiz: Include lib.php for phpunit test 2015-02-24 14:53:46 -05:00
Eric Merrill
1245bfd5f0 MDL-49160 quiz: Make sure to not select an outcome grade item 
When we are computing completion, make sure we select only the true
grade_item, not outcome grade items.
 2015-02-24 14:40:36 -05:00
Dan Poltawski
86e5b0a707 Merge branch 'MDL-49220-master' of https://github.com/lucisgit/moodle 2015-02-24 16:54:58 +00:00
Dan Poltawski
4a3b900698 Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle 2015-02-24 16:50:12 +00:00
Tony Butler
f1399fb8e7 MDL-49220 mod_choice: Add behat scenario to test choice preview option 2015-02-24 16:25:18 +00:00
Dan Poltawski
73d8a50d73 Merge branch 'master-18177' of https://github.com/timpricecatalyst/moodle-1 2015-02-24 11:18:37 +00:00
Dan Poltawski
6856894efe Merge branch 'wip_MDL-49184_m29_choice' of https://github.com/skodak/moodle 2015-02-24 10:43:15 +00:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Dan Poltawski
e09bd104b9 Merge branch 'MDL-49216-master' of git://github.com/andrewnicols/moodle 2015-02-24 08:31:53 +00:00
David Monllao
fdc30bd7c5 Merge branch 'MDL-49183_m29v5' of git://github.com/sbourget/moodle 2015-02-24 16:07:18 +08:00
Zachary Durber
5b83949ad1 MDL-23273 mod_choice: error continue button redirects back to choice 
Locks only occur when a choice is using limits.
 2015-02-24 12:14:15 +08:00
Andrew Nicols
78f26c076c Merge branch 'MDL-34375_m29v2' of https://github.com/sbourget/moodle 2015-02-24 11:40:27 +08:00
Andrew Nicols
ad80b121ad Merge branch 'master_MDL-46408' of https://github.com/danmarsden/moodle 2015-02-24 11:34:27 +08:00
Andrew Nicols
38ec3fb080 MDL-49216 mod_forum: Move subquery to outer component 
It is not possible to order sub-query results with some RDBMs, and the
subquery is not necessary anyway.
 2015-02-24 08:29:43 +08:00
Andrew Nicols
94802d3518 MDL-49216 mod_forum: Add tests for discussion reply count 2015-02-24 08:29:43 +08:00
Zachary Durber
e776b415f4 MDL-23273 mod_choice: Using locks to ensure choice limits 2015-02-23 10:47:46 +08:00
Zachary Durber
3547f186a8 MDL-35392 mod_assign: Push feedback to gradebook when releasing grades 
When bulk changing workflow status a mismatch in variable
names meant that feedback wasn't being sent to the gradebook.
 2015-02-23 09:14:05 +08:00
Tony Butler
c30dbd69e7 MDL-49220 mod_choice: Add option to allow students to preview choices 2015-02-20 14:27:55 +00:00
Stephen Bourget
1cf8ca343f MDL-49183 Lesson: Add additional events 2015-02-19 21:16:26 -05:00
Dan Marsden
a544661398 MDL-46408 mod_scorm: check param is set before using. 
The default org is only set if it exists in the imsmanifest.xml
 2015-02-20 14:41:07 +13:00
Tim Price
e1de40f7f7 MDL-18177 backup: adding PHPdocs blocks 2015-02-20 11:45:23 +11:00
Tim Price
d7891c83dd MDL-18177 backup: addressing coding standards 2015-02-20 11:45:23 +11:00
Matt Sammarco
868b086c4a MDL-18177 backup: Add backup option to include groups and groupings 2015-02-20 11:45:22 +11:00
David Monllao
c1d1c435f7 MDL-48883 mod_lesson: Updating mod_lesson version 
Updating it to today's date instead of using
stable branches version convention.
 2015-02-18 12:30:15 +08:00
David Monllao
caaeabd0f4 Merge branch 'MDL-48883_m29v5' of git://github.com/sbourget/moodle 2015-02-18 12:26:40 +08:00
Rajesh Taneja
6628ea3f0c MDL-47172 print_overview: Fixed behat for overview changes 2015-02-18 11:37:50 +08:00
Eloy Lafuente (stronk7)
40156b3bec Merge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle 2015-02-17 21:14:50 +01:00
Eloy Lafuente (stronk7)
2d4d68073d Merge branch 'MDL-48221-master' of git://github.com/andrewnicols/moodle 2015-02-17 15:51:59 +01:00
David Monllao
02838257f3 Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle 2015-02-17 14:43:49 +08:00
Andrew Nicols
719f7345ee Merge branch 'MDL-18553_master' of git://github.com/dmonllao/moodle 2015-02-17 14:35:38 +08:00
Petr Skoda
5fb2315a8b MDL-49184 choice: fix block actions 
The problems was that blocks editing breaks if you redirect
after if (data_submitted()) - all form actions must make sure
it is really their form, otherwise they may hijack the post from
block actions.

Note that this is not a problem for mforms, only legacy forms
are affected.

# Conflicts:
#	mod/choice/view.php
 2015-02-17 17:00:15 +13:00