Commit graph

505 commits

Author SHA1 Message Date
Marina Glancy
7f34b8e135 Merge branch 'MDL-42339' of git://github.com/rwijaya/moodle 2014-02-05 15:56:30 +08:00
Rossiani Wijaya
8c6ca6961a MDL-42339 - removed double formatting for set_title() and set_heading() 2014-02-05 14:47:23 +08:00
Marina Glancy
1b066c06c6 Merge branch 'MDL-43440-master' of git://github.com/mr-russ/moodle 2014-02-03 13:42:23 +08:00
Rajesh Taneja
623a32e50d MDL-43736 Events: Updated unit test to test context not used in event 2014-01-29 11:39:50 +08:00
Rajesh Taneja
fdc729ea57 MDL-43736 Events: event->contextinstanceid should be used where possible
While restoring event context might not be present (deleted)
So before using context api's check context or use event properties
2014-01-29 11:39:44 +08:00
Tomasz Muras
672ce966c6 MDL-43040 Replace $module with $plugin in all mod/*/version.php
Conflicts:
	mod/quiz/version.php
2014-01-29 00:36:12 +01:00
Russell Smith
74b63eae76 MDL-43440 unit testing: Use cmid in unit tests when it should be used.
instance is has been used instead of cmid.  This works as all id's are 1
in most cases, but not always.

accesslib_clear_all_caches_for_unit_testing was updated to clear the
$USER->access cache which would fail test when the wrong user's data was used.
2014-01-25 08:57:32 +11:00
Petr Škoda
32f906b677 MDL-43661 use new edulevel in all existing events 2014-01-21 16:12:35 +08:00
Damyon Wiese
4177d6a097 Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle 2014-01-20 17:10:38 +08:00
Tony Butler
802f85076a MDL-43632 mod_feedback: Use SSL for reCAPTCHA API request if Moodle is using it 2014-01-10 10:40:23 +00:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Eloy Lafuente (stronk7)
0601a82aff Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle 2014-01-08 01:32:28 +01:00
Rajesh Taneja
184afb6b73 MDL-43238 events: Added event other information in event php doc block 2014-01-03 15:03:48 +08:00
Michael Milette
a059b434f7 MDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls
Conflicts:
	mod/feedback/item/multichoice/lib.php
	mod/feedback/item/multichoicerated/lib.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
2014-01-03 10:24:49 +08:00
Ankit Agarwal
45faf15dfd MDL-43044 events: Deprecate and remove code duplication from instances_list_viewed events 2013-12-06 15:59:49 +08:00
Ankit Agarwal
e10ea84ed0 MDL-42962 events: Remove duplicate code from all course_module_viewed events 2013-12-03 14:24:32 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Eloy Lafuente (stronk7)
aa7bc816d9 Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle 2013-11-12 20:07:05 +01:00
Andreas Grabs
6d645211be MDL-41775 mod_feedback - Input fields are shown with a fixed width on bootstrap based themes 2013-11-08 10:42:49 +01:00
Marina Glancy
09af1e2864 MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course 2013-11-06 14:21:24 +11:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Andreas Grabs
73bbdce8c6 MDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme 2013-11-03 19:11:27 +01:00
Marina Glancy
7fbe33fcf1 MDL-42400 generator: module generators call add_moduleinfo instead of direct inserts 2013-10-26 14:00:23 +11:00
Andreas Grabs
bb4191ff4d MDL-42210 mod_feedback - convert tabs to space 2013-10-20 10:22:56 +02:00
Michael Milette
690266bcf7 MDL-42210-Feedback-Input-Labels
Adds labels to the input fields in the Feedback module including: multichoice, multichoicerated, numeric, textarea and textfield.
2013-10-20 10:22:54 +02:00
Dan Poltawski
4f0eaf18f4 Merge branch 'MDL-40493-master' of git://github.com/damyon/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2013-10-08 16:42:17 +08:00
Damyon Wiese
3d27180e94 MDL-40493 User preference: Allow users to set their preferred text editor.
This changes the setting htmleditor in the user table from a 0 or 1 column
to a user preference for the name of their preferred html editor.
2013-10-02 12:49:30 +08:00
Ankit Agarwal
3f6fd94140 MDL-40047 events: Replace add_to_logs with new events in feedback 2013-10-01 10:12:06 +08:00
Ankit Agarwal
9c515cdcfb MDL-40047 events: Add unit tests for feedback events 2013-10-01 10:12:06 +08:00
Ankit Agarwal
1f00818771 MDL-40047 feedback: Add a test generator for feedback 2013-10-01 10:12:06 +08:00
Ankit Agarwal
4df4a9b93e MDL-40047 events: Add events related to feedback responses
Adding following events related to feedback responses:-
/mod_feedback/event/response_deleted
/mod_feedback/event/response_submitted
/mod_feedback/event/instances_list_viewed
/mod_feedback/event/course_module_viewed
2013-10-01 10:12:05 +08:00
Ankit Agarwal
cbacf2e5e0 MDL-41894 feedback: Remove unused code, which is generating warnings 2013-09-24 14:45:54 +08:00
Ankit Agarwal
0f142ea0a8 MDL-41833 feedback: Fix setType() warning when deleting a response in feedback 2013-09-17 15:14:19 +08:00
Rossiani Wijaya
846cebe5b3 MDL-40687 Feedback: improve page heading levels and layouts 2013-09-09 09:48:05 +08:00
Helen Foster
86698a4c72 MDL-41568 Merge English strings from the en_fix language pack 2013-09-03 12:31:35 +02:00
Damyon Wiese
74df2951d1 Revert "MDL-39876 Change get_record('course') calls to get_course"
This reverts commit ab7632b74c.
2013-08-21 13:42:30 +08:00
sam marshall
ab7632b74c MDL-39876 Change get_record('course') calls to get_course 2013-08-15 11:31:20 +01:00
Petr Škoda
2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Sam Hemelryk
a2d847842e Merge branch 'MDL-40746_master' of git://github.com/grabs/moodle 2013-07-30 09:40:40 +12:00
Dan Poltawski
26c0773f7b MDL-40775 feeback: remove uncessary header 2013-07-29 13:30:14 +08:00
Dan Poltawski
0c69118fca Merge branch 'MDL-40775_master' of git://github.com/grabs/moodle 2013-07-29 13:28:22 +08:00
Andreas Grabs
dd67e1bfc4 MDL-40775 mod_feedback - Undefined variable in feedback activity 2013-07-26 19:43:44 +02:00
Andreas Grabs
28001450d2 MDL-40746 mod_feedback - Feedback forms display oddly in Clean theme 2013-07-26 19:43:39 +02:00
Tim Hunt
06ca6cc955 MDL-40863 feedback and LTI mods need get_extra_capabilities fn
Since moodle/site:accessallgroups is relevant to how them.
2013-07-26 10:39:55 +01:00
Ankit Agarwal
0601e0eef6 MDL-40402 libraries: Replace get_system_context() with context_system::instance() in core 2013-07-04 15:41:06 +08:00
Andreas Grabs
09c2ec4303 MDL-39570 mod_feedback - Missing privilege check 2013-07-02 13:37:10 +08:00
Russell Smith
725ab3d07f MDL-38079 mod_feedback - Hide "add question to activity" button 2013-06-17 19:50:13 +10:00
Andreas Grabs
e6e9bec3ee MDL-39932 mod_feedback - Mapping Feedback when Course is Deleted - thx to David N. Johnson 2013-05-30 23:10:33 +02:00