moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 18:36:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72335 commits 37 branches 544 tags 1.3 GiB
Commit graph

16468 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
f4160a8e52 Merge branch 'MDL-43387' of git://github.com/jmvedrine/moodle 2015-02-03 01:17:03 +01:00
Jean-Michel Vedrine
ebf5ad4fa2 MDL-43387 mod_lesson: add an editor for essay grading comments 2015-02-01 19:01:40 +01:00
Stephen Bourget
a1556aaf86 MDL-48963 Lesson: File support to true/false answers 2015-02-01 09:32:52 -05:00
Zachary Durber
75d08f0291 MDL-31036 mod_assign: Don't strip quickgrading feedback of special chars 2015-01-30 14:43:35 +08:00
Rajesh Taneja
dec3a05cb3 MDL-48403 behat: Select text in atto editor before inserting image 2015-01-30 10:02:57 +08:00
Rajesh Taneja
2b44d328c3 MDL-49002 behat: Added @_file_upload tag to avoid random fails 2015-01-30 09:00:36 +08:00
Rajesh Taneja
15aacd0454 MDL-49105 mod_lesson: Removed unused image insert step in behat 2015-01-30 08:57:50 +08:00
Rajesh Taneja
d0c36ce621 MDL-49015 mod_lesson: Don't rely on external links in behat 2015-01-30 08:57:49 +08:00
Rajesh Taneja
8fe8df4a8b MDL-48624 behat: Added page load check in workshop step 
i_allocate_submissions_in_workshop_as step sometimes
fails because of server speed. Added page load check
with extended timout.
 2015-01-30 08:54:11 +08:00
Andrew Nicols
6738ad643b MDL-8626 mod_data: Only show select/delete options when entries present 2015-01-29 10:26:44 +08:00
Andrew Nicols
5310179939 Merge branch 'MDL-36877' of https://github.com/jmvedrine/moodle 2015-01-29 09:08:53 +08:00
Tim Hunt
a6099a7a13 MDL-49006 admin: activity descriptions shouldn't be required by default 2015-01-28 21:52:58 +00:00
Jean-Michel Vedrine
59d7a9dc75 MDL-36877 mod_lesson: Fix while MDL-38578 is not solved 2015-01-28 20:54:38 +01:00
Eloy Lafuente (stronk7)
941ea6b2ff Merge branch 'MDL-48898' of git://github.com/timhunt/moodle 2015-01-28 12:27:07 +01:00
John Okely
5cb440f936 MDL-8626 database: Move search and sort controls to top of page 
Credit to Andrew Walbran for the patch.
 2015-01-28 09:06:30 +08:00
Eloy Lafuente (stronk7)
8181ab5865 Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
 2015-01-28 01:02:54 +01:00
Eloy Lafuente (stronk7)
f271b113a6 Merge branch 'MDL-40285_master' of git://github.com/markn86/moodle 2015-01-27 12:09:58 +01:00
Mark Nelson
d2e1c5f5fc MDL-40285 mod_assign: added extra group submissions behat scenario 
Thanks a lot to Jody Steele for providing the basis for the scenario.
 2015-01-27 00:36:49 -08:00
Mark Nelson
e43f1d514c MDL-40285 mod_assign: show details for all default group members 2015-01-27 00:36:49 -08:00
Eloy Lafuente (stronk7)
65d2f8e3f9 Merge branch 'wip-MDL-48325-master' of git://github.com/abgreeve/moodle 2015-01-27 00:22:36 +01:00
Eloy Lafuente (stronk7)
3195a1f91f Merge branch 'MDL-48939-master' of git://github.com/andrewnicols/moodle 2015-01-26 23:57:33 +01:00
Eloy Lafuente (stronk7)
13abbea83b Merge branch 'MDL-48407-master' of git://github.com/gurgus/moodle 2015-01-26 23:41:17 +01:00
Eloy Lafuente (stronk7)
2a5ecfa975 Merge branch 'MDL-48720-master' of git://github.com/andrewnicols/moodle 2015-01-26 19:08:21 +01:00
Eloy Lafuente (stronk7)
50b7b15894 Merge branch 'MDL-40286' of git://github.com/jmvedrine/moodle 2015-01-26 18:32:43 +01:00
Andrew Davis
64d45dafa1 MDL-48942 mod_survey: fixed coding style problems in mod/survey/view.php 2015-01-26 15:27:24 +01:00
Andrew Davis
9767d69680 MDL-48942 mod_survey: synced security checks in view.php and graph.php 2015-01-26 14:56:27 +01:00
Ankit Agarwal
9bb71899c0 MDL-48212 messages: show reply allowed message only when needed 2015-01-26 08:16:03 +05:30
Jean-Michel Vedrine
ccf2a054ae MDL-36877 Lesson: final page not displayed if show gradebook set to no 2015-01-25 18:46:00 +01:00
Jean-Michel Vedrine
b69d512a90 MDL-40286 mod_lesson: non-editing teacher should see Grade analysis 2015-01-23 20:21:08 +01:00
Tim Hunt
52540a51fa MDL-48898 quiz: use admin_setting_configduration 
Now this setting type is available, it is a better UI.

This required a new setting class
admin_setting_configduration_with_advanced.

Also, I took the liberty of shortening the default auto-save delay to 1
minute, and re-wording the description of that setting, now that it can
be changed to any value.
 2015-01-23 11:56:08 +00:00
Andrew Nicols
557f44d970 MDL-48620 JavaScript: Updated shifted files to comply with coding style 2015-01-23 14:51:24 +08:00
Dan Poltawski
79d6c46df3 Merge branch 'MDL-48949' of git://github.com/timhunt/moodle 2015-01-22 17:52:20 +00:00
Tim Hunt
0065f02469 MDL-48949 mod_lti: tidy mod/lti/upgrade.txt 2015-01-22 17:28:08 +00:00
Andrew Nicols
2f19417319 MDL-48939 core: Depreacte search_generate_text_SQL 
This has never been used outside of forum, where it was introduced in
Moodle 1.8 and required manual creation of an index.
 2015-01-22 15:10:00 +08:00
Adrian Greeve
4cac2470bb MDL-48325 mod_data: Export to portfolio button uses capability. 
The Export to portfolio button now checks the mod/data:exportownentry
capability to see if the export button should be shown.
 2015-01-22 14:49:21 +08:00
Dave Cooper
b02f473cfb MDL-48407 mod_forum: Updated text email notification template 2015-01-22 13:28:18 +08:00
Andrew Nicols
1cb5f61213 Revert "Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle" 
This reverts commit e08f58288a, reversing
changes made to 782ea98c59.
 2015-01-22 12:13:35 +08:00
Andrew Nicols
7cd4a0f6d5 MDL-41851 mod_forum: Use noreply user when sending forum notifications 2015-01-22 09:42:12 +08:00
Andrew Nicols
5f9997ae95 MDL-48720 mod_forum: Tidy up whitespace to comply with coding style 2015-01-21 12:15:12 +08:00
Andrew Nicols
9ddb376645 MDL-48720 mod_forum: Only copy discussion preferences when moving posts 
Rather than adding discussion preferences to a user based upon their
subscription to the source forum, only respect any actively selected
preference. That is to say that:
* if a user has opted into a discussion and following a move would be
  unsubscribed, re-subscribe them;
* if a user has opted out of a discussion and following a move would be
  subscribed once more, unsubscribe them; and
* if a user has not made an active choice, follow the discussion preference
  for the target forum.
 2015-01-21 12:15:12 +08:00
Andrew Nicols
e2a036b4a9 Merge branch 'MDL-348' of https://github.com/bostelm/moodle 2015-01-21 11:46:22 +08:00
Eloy Lafuente (stronk7)
fac7cff3e2 Merge branch 'MDL-48813_m29' of git://github.com/sbourget/moodle 2015-01-20 19:20:26 +01:00
Dan Poltawski
9f0c24120f Merge branch 'wip-mdl-48831' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:20:58 +00:00
Dan Poltawski
cde9fece2f Merge branch 'MDL-48829' of git://github.com/timhunt/moodle 2015-01-20 17:07:52 +00:00
Eloy Lafuente (stronk7)
e08f58288a Merge branch 'wip-mdl-48624-m' of https://github.com/rajeshtaneja/moodle 2015-01-20 17:07:34 +01:00
David Monllao
97b2e747ac Merge branch 'wip-MDL-20053-master' of git://github.com/abgreeve/moodle 2015-01-20 16:43:24 +08:00
Andrew Nicols
a2209774ce Merge branch 'MDL-44560-master' of git://github.com/xow/moodle 2015-01-20 12:57:41 +08:00
Andrew Nicols
81a5c2b672 Merge branch 'MDL-38277_m29v2' of https://github.com/sbourget/moodle 2015-01-20 12:34:07 +08:00
Andrew Nicols
b4d70adb9e Merge branch 'MDL-43163' of git://github.com/jmvedrine/moodle 2015-01-20 11:23:41 +08:00
Andrew Nicols
a8ed2e50ea Merge branch 'MDL-48596' of git://github.com/jmvedrine/moodle 2015-01-20 10:54:19 +08:00