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

15340 commits

Author SHA1 Message Date
Damyon Wiese
4b6e01cd76 Merge branch 'MDL-44629-B' of https://github.com/bostelm/moodle 2014-04-16 14:23:07 +08:00
Dan Poltawski
63eb19cbdf Merge branch 'MDL-45089_chat' of https://github.com/andyjdavis/moodle 2014-04-16 13:00:46 +08:00
Marina Glancy
cf051cc46e Revert "MDL-41283 report_participation: Fixed legacy actions returned from api's" 
This reverts commit 7b7bb92d42.
 2014-04-15 17:14:57 +08:00
Marina Glancy
c733401634 Merge branch 'MDL-45035-master' of git://github.com/ankitagarwal/moodle 2014-04-15 14:34:36 +08:00
Marina Glancy
fdb8bae241 Merge branch 'wip-mdl-41283' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	mod/upgrade.txt
 2014-04-15 14:34:28 +08:00
Rajesh Taneja
7b7bb92d42 MDL-41283 report_participation: Fixed legacy actions returned from api's 2014-04-15 13:31:03 +08:00
Rajesh Taneja
b2b4ec308e MDL-41283 report_participation: Added phpdoc about function not used 
In new logging api, xxx_get_view_actions() and xxx_get_post_actions()
will not be used to identify the paticipation of user. Event's crud
and edulevel status will define user's participation.
 2014-04-15 13:31:03 +08:00
Andrew Davis
a2505cfdaa MDL-45089 mod_chat: changed the page type on the accessible popup 2014-04-15 09:04:33 +08:00
Marina Glancy
72f5bfc22b Merge branch 'MDL-45047-module-notation-deprecated' of git://github.com/mudrd8mz/moodle 2014-04-14 17:10:31 +08:00
Marina Glancy
dd5e6ad03a Merge branch 'MDL-45057_master' of git://github.com/markn86/moodle 2014-04-14 17:10:02 +08:00
Petr Škoda
1bfb41f45a MDL-44366 fix use of cm->uservisible in glossary concept cache 2014-04-14 15:16:28 +08:00
David Mudrák
09027084a7 MDL-45047 Put the deprecation warning into mod/upgrade.txt, too 
It is already in the main lib/upgrade.txt but it should be mentioned here as
well.
 2014-04-14 08:58:50 +02:00
Mark Nelson
92089e0ecc MDL-45057 mod_quiz: restored the user/group override deleted events 2014-04-13 22:32:06 -07:00
Petr Škoda
1e83288de7 MDL-44366 improve glossary filter performance 
This should have when there are no glossaries in course or
when there are no linked entries in existing glossaries.
 2014-04-14 09:42:40 +08:00
Petr Škoda
86286bdb7e MDL-44366 bump up glossary and filter version 2014-04-14 09:42:40 +08:00
Petr Škoda
37625e2abb MDL-44366 rework glossary filter caching 2014-04-14 09:42:39 +08:00
Dan Poltawski
97c274ded7 MDL-40063/MDL-45057 quiz: disable related unit tests 
I kept the commit number format same as the last commit just
to annoy Fred.
 2014-04-11 17:36:40 +08:00
Dan Poltawski
c5e5f1b786 MDL-40063/MDL-45057 quiz: disable firing of override events 
This hacky solution is brought to you by the the motivation to
release.
 2014-04-11 16:58:10 +08:00
Dan Poltawski
34f7e31ffb Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle 2014-04-11 14:31:27 +08:00
Ankit Agarwal
3610ad436c MDL-45035 events: Fix @package and @since tags in Moodle 2.7 events 2014-04-11 13:45:33 +08:00
Ankit Agarwal
9638600bbb MDL-45035 events: Fix @package and @since tags in Moodle 2.6 events 2014-04-11 13:32:33 +08:00
Dan Poltawski
9d1eed69a0 Merge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle 2014-04-11 13:01:38 +08:00
Dan Poltawski
d6a756a949 Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle 2014-04-11 12:55:15 +08:00
Mark Nelson
9d65d3e70b MDL-40063 mod_quiz: created 'override_created' events 2014-04-10 20:42:44 -07:00
Mark Nelson
e8365f27e5 MDL-40063 mod_quiz: replaced ‘manualgrade’ add_to_log call with an event 2014-04-10 20:42:24 -07:00
Mark Nelson
a2caf56dff MDL-40063 mod_quiz: replaced 'attempt' add_to_log call with an event 2014-04-10 20:41:56 -07:00
Mark Nelson
45e1e3bd76 MDL-40063 mod_quiz: replaced 'preview' add_to_log call with an event 2014-04-10 20:41:54 -07:00
Mark Nelson
e0114708af MDL-40063 mod_quiz: replaced 'continue attempt' add_to_log call with an event 2014-04-10 20:41:39 -07:00
Mark Nelson
8de2eb3582 MDL-40063 mod_quiz: replaced 'delete override' add_to_log call with events 2014-04-10 20:41:09 -07:00
Mark Nelson
e7d80a059a MDL-40063 mod_quiz: replaced 'edit override' add_to_log call with events 2014-04-10 20:40:51 -07:00
Mark Nelson
68758eff12 MDL-40063 mod_quiz: removed 'close attempt' add_to_log call 2014-04-10 20:40:27 -07:00
Mark Nelson
60ab03eb10 MDL-40063 mod_quiz: replaced 'view summary' add_to_log call with an event 2014-04-10 20:40:25 -07:00
Mark Nelson
2a3f82041f MDL-40063 mod_quiz: replaced 'review' add_to_log call with an event 2014-04-10 20:40:13 -07:00
Mark Nelson
2ec79ad996 MDL-40063 mod_quiz: replaced 'report' add_to_log call with an event 2014-04-10 20:39:56 -07:00
Mark Nelson
7dad3d95fd MDL-40063 mod_quiz: replaced 'delete attempt' add_to_log call with an event 2014-04-10 20:39:15 -07:00
Mark Nelson
58940b190a MDL-40063 mod_quiz: replaced 'addcategory' add_to_log call with an event 2014-04-10 20:38:34 -07:00
Mark Nelson
5e8f736565 MDL-40063 mod_quiz: replaced 'editquestions' add_to_log call with an event 2014-04-10 20:34:27 -07:00
Mark Nelson
b332fc6c8c MDL-40063 mod_quiz: replaced 'view' and 'view all' add_to_log calls with events 2014-04-10 20:34:14 -07:00
Damyon Wiese
5582fe49cc MDL-44170 LTI - fix unit tests. 2014-04-10 14:15:02 +08:00
Damyon Wiese
5f5d4e9e69 Merge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle 2014-04-10 13:33:50 +08:00
Damyon Wiese
21fd2384de Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle 2014-04-09 15:44:39 +08:00
Mark Nelson
f68fee244a MDL-42462 mod_feedback: added $OUTPUT to list of global variables used to avoid error 2014-04-09 15:37:21 +08:00
Marina Glancy
488bbfb720 MDL-40843 chat: fixed bug in SQL query in recent activity block 2014-04-09 15:31:49 +08:00
Damyon Wiese
f1dce5734e MDL-44268 Assign: Fix behat test for assigned marker filter 2014-04-09 14:29:46 +08:00
Damyon Wiese
d6a3f559db MDL-44268 Assign: Improve the "not submitted" filter 2014-04-09 14:29:46 +08:00
Jonathon Fowler
c80d59f269 MDL-44268 assign: add 'not submitted' and 'no marker' filter options 2014-04-09 14:29:46 +08:00
Damyon Wiese
43968c9f10 Merge branch 'mdl44669-master' of https://github.com/tlock/moodle 2014-04-09 13:05:46 +08:00
Sam Hemelryk
6ef3728805 Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle 2014-04-09 10:15:50 +12:00
Dan Poltawski
a5cd92574d Merge branch 'MDL-42462-Feedback-Fix-for-WCAG-2-0-issue-with-Informational-and-Error-Content-Displayed-in-red' of https://github.com/michael-milette/moodle 2014-04-08 14:11:59 +08:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
 2014-04-08 13:30:41 +08:00