mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 16:40:07 +01:00
Code Issues Projects Releases Wiki Activity
71,430 Commits 36 Branches 527 Tags
Commit Graph

16234 Commits

Author SHA1 Message Date
Dan Poltawski
065fa16e75 Merge branch 'MDL-48410' of git://github.com/timhunt/moodle 2014-12-08 15:19:11 +00:00
David Monllao
cbebd40dfb MDL-47246 mod_forum: Limit last post restriction to Q and A 2014-12-08 14:51:36 +08:00
Tim Hunt
8fec847ca7 MDL-48410 behat, quiz: step for efficiently adding questions 2014-12-05 12:22:28 +00:00
Andrew Nicols
06e23acc88 MDL-48309 mod_forum: Do not escape ampersands in plain text email 2014-12-04 12:14:32 +00:00
Eloy Lafuente (stronk7)
38ea5e0a39 MDL-21724 course: change remaining tests to new "Save and display" 2014-12-04 12:14:31 +00:00
Sam Hemelryk
101348192b Merge branch 'MDL46116_IMSCP_container_items.updates_2014-11-11' of https://github.com/Dave-B/moodle 
Conflicts:
	mod/imscp/module.js
 2014-12-04 12:14:26 +00:00
Dan Poltawski
2852a9a0aa Merge branch 'MDL-34627_master' of https://github.com/dmonllao/moodle 2014-12-04 12:04:10 +00:00
Dan Poltawski
67a51a5bed Merge branch 'MDL-48342' of git://github.com/jmvedrine/moodle 2014-12-04 11:37:52 +00:00
David Balch
c57617dac1 MDL-46116 mod_imscp: Fix some jshint issues. 2014-12-02 10:33:11 +00:00
Charles Fulton
f885712200 MDL-34627 feedback: Convert default format value during restore 2014-12-01 10:53:15 +08:00
Sam Hemelryk
0893f8d399 Merge branch 'wip-MDL-48377-master' of git://github.com/marinaglancy/moodle 2014-12-01 14:02:08 +13:00
Sam Hemelryk
0c3b2180d6 Merge branch 'MDL-48382' of git://github.com/timhunt/moodle 2014-12-01 13:58:13 +13:00
Sam Hemelryk
783d96c6da Merge branch 'MDL-48309-master' of git://github.com/andrewnicols/moodle 2014-12-01 11:10:25 +13:00
Sam Hemelryk
2d1df7a3be Merge branch 'MDL-48227-master' of git://github.com/ankitagarwal/moodle 2014-12-01 09:14:46 +13:00
Andrew Nicols
64e7aa4de1 MDL-28286 JavaScript: Convert all uses of M.str to M.util.get_string 2014-12-01 08:32:04 +13:00
Jean-Michel Vedrine
762ee1393b MDL-48342 Question: qformat_default::readquestion is broken 2014-11-28 15:47:39 +01:00
Tim Hunt
b8871eff04 MDL-48382 quiz behat: make add question step more robust. 2014-11-28 13:45:36 +00:00
Ankit Agarwal
9ef82a9a0e MDL-48227 forum: Update the message shown in emails 
AMOS BEGIN
 MOV [deleteoriginalonreply,mod_forum],[replytopostbyemail,mod_forum]
AMOS END
 2014-11-28 14:31:18 +05:30
Damyon Wiese
3e116130b0 Revert "Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle" 
This reverts commit 861a0fd92a9a8ae3f970707a8e39a4ba96fbdaba.

This reverts commit f376c2ffd7d8304bafff851ead3ed10dee34c805, reversing
changes made to abe9be7240d7bda36bd3831b3638795466987745.
 2014-11-28 15:07:31 +08:00
David Monllao
861a0fd92a MDL-38128 mod_assign: Changes in grading summary page using team submissions 
If there is an active group and (groupmode != NOGROUPS)
the displayed info is related with that single group.
 2014-11-27 18:08:43 +08:00
Andrew Nicols
72590a5139 MDL-48148 mod_forum: Use correct original subject when handling replies 2014-11-26 15:58:05 +08:00
Marina Glancy
28c0c4af5d MDL-48377 forum: do not swallow spaces in notification emails 2014-11-26 12:18:11 +08:00
Sam Hemelryk
55dc0eb979 Merge branch 'MDL-47329-master' of git://github.com/jethac/moodle 2014-11-26 08:56:27 +13:00
Eloy Lafuente (stronk7)
4ef19b1789 Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:38:24 +01:00
Ashley Holman
e629bd3ff3 MDL-46356 assign: remove unnecessary get_area_files call 2014-11-25 14:27:17 +00:00
Dan Poltawski
b56f00d057 Merge branch 'MDL-41155-master' of git://github.com/gurgus/moodle 2014-11-25 13:18:13 +00:00
Dan Poltawski
0da32b82d7 Merge branch 'MDL-43483_master' of https://github.com/dmonllao/moodle 2014-11-25 11:28:19 +00:00
Dan Poltawski
f376c2ffd7 Merge branch 'MDL-38128_master' of https://github.com/dmonllao/moodle 2014-11-25 11:07:50 +00:00
Sam Hemelryk
22fc0d15dd Merge branch 'MDL-22043-master' of git://github.com/andrewnicols/moodle 2014-11-25 15:54:12 +13:00
David Monllao
ec802d8ef6 MDL-38128 mod_assign: Adding group selector to grading summary page 
Thanks to Pau Ferrer Ocaña and Avi Levy for
their work on this issue.
 2014-11-25 10:44:36 +08:00
Andrew Nicols
6220813776 MDL-48309 mod_forum: Handle discussion subscriptions correctly 2014-11-25 09:23:51 +08:00
Andrew Nicols
5eddcfee34 MDL-48309 mod_forum: Add discussion subscription to the navigation 2014-11-25 09:16:08 +08:00
Sam Hemelryk
4cbf997db0 Merge branch 'MDL-48197-master' of git://github.com/andrewnicols/moodle 2014-11-25 11:02:19 +13:00
Sam Hemelryk
9e921abaff Merge branch 'm29_MDL-48265' of https://github.com/totara/moodle 2014-11-25 09:42:46 +13:00
Dan Poltawski
1f182f95e7 Merge branch 'MDL9443_Filter_XHTML_files.2014-11-19' of git://github.com/Dave-B/moodle 2014-11-24 17:26:30 +00:00
Dan Poltawski
dca771127a Merge branch 'MDL-48274-master' of git://github.com/andrewnicols/moodle 2014-11-24 15:37:56 +00:00
Dan Poltawski
e1a826e205 Merge branch 'MDL-48180-master' of git://github.com/FMCorz/moodle 2014-11-24 11:53:53 +00:00
Sam Hemelryk
d148da7e56 Merge branch 'MDL-48148-master' of git://github.com/andrewnicols/moodle 2014-11-24 15:57:59 +13:00
Andrew Nicols
338ee3d6bb MDL-48148 mod_forum: Use the standard forum reply subject as default 
When a user replies by e-mail, the course name has been included in the
original e-mail. As a result, the reply subject becomes longer and longer.

In cases whether either:
* the discussion name; or
* the replied-to-post subject

is present in the mail subject, the standard reply subject is instead used.
 2014-11-24 09:10:54 +08:00
Matteo Scaramuccia
8e1f21d47b MDL-43483 mod_chat: Fixed race condition issues, including not useful logs. 2014-11-24 08:58:38 +08:00
Jetha Chan
d8389cd6f8 MDL-47329 mod_book: missing RTL styles, added page body selectors 2014-11-21 10:34:24 +08:00
Jetha Chan
15b3c4e0a4 MDL-47329 mod_book: use embedded pagetype instead of hardcoded HTML 2014-11-21 10:34:24 +08:00
Dave Cooper
0a6a254351 MDL-41155 Lesson: Fixed multiple question attempts logic 
Thanks to Rajneel Totaram for providing this patch.
 2014-11-20 14:43:12 +08:00
Dave Cooper
22cd6b3c8b MDL-41155 Lesson: Added behat tests for multiple question attempts 2014-11-20 14:42:11 +08:00
Sam Hemelryk
11b5e41b0c NOBUG: fixed commit message typo 2014-11-20 16:47:33 +13:00
Sam Hemelryk
2949dedcda MDL-43628 mod_assign: fixed formatting of statement 2014-11-20 10:18:28 +13:00
David Balch
112aed6035 MDL-9443 core_files: Also filter .xhtml resources. 
Change the filters to treat .xhtml files the same as .html,
so they are filtered by both "All files" and "HTML files only".
 2014-11-19 14:14:50 +00:00
Dan Poltawski
72e3cb9ad2 MDL-29585 wiki: fix unit test fails 2014-11-19 11:37:35 +00:00
Frederic Massart
414f7ef8ff MDL-29585 mod_wiki: Prevent broken links in editable sections 
When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.
 2014-11-19 17:28:36 +08:00
Mario Wehr
772e9dc17e MDL-48274 mod_forum: Add missing context to has_capability call 2014-11-19 14:06:07 +08:00