Commit graph

13038 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
e507b363ca MDL-33166 Forum: whitespace fix 2012-09-19 00:53:33 +02:00
Eloy Lafuente (stronk7)
a9c31deea8 Merge branch 'wip-mdl-33166' of git://github.com/rajeshtaneja/moodle 2012-09-19 00:38:41 +02:00
Eloy Lafuente (stronk7)
1f8ee5ce22 Merge branch 'MDL-35226-master' of git://github.com/ankitagarwal/moodle 2012-09-18 20:10:46 +02:00
Eloy Lafuente (stronk7)
05b7836ff7 Merge branch 'MDL-33198-master' of git://github.com/ankitagarwal/moodle 2012-09-18 20:04:58 +02:00
Damyon Wiese
ba30fe35b9 MDL-35202: Allow for language files that contain non-ascii for actions in assignment 2012-09-18 15:11:48 +08:00
Dan Poltawski
7783373b99 Merge branch 'MDL-30909-master' of git://github.com/FMCorz/moodle 2012-09-18 15:07:49 +08:00
Frederic Massart
0da2ae21d1 MDL-30909 Accessibility: Improved access to reply form in forums 2012-09-18 14:54:24 +08:00
Damyon Wiese
6664b2c0d0 MDL-35398: Quick grading feedback is now pushed to the gradebook 2012-09-18 14:49:52 +08:00
Rossiani Wijaya
b1fec412e3 MDL-34777 grading: add label to select and input tag
Conflicts:

	mod/assign/lang/en/assign.php
	mod/assign/locallib.php
2012-09-18 13:18:57 +08:00
Damyon Wiese
b32868bed3 MDL-35427: Remove resetting of $_POST - use $mform->setConstant to force update to rownum instead. 2012-09-18 11:17:18 +08:00
Damyon Wiese
b3de95afb4 MDL-35337: Fixes for restoring a course backup with no data for teamassignments and extensionsdates 2012-09-18 10:20:53 +08:00
Ankit Agarwal
98e8c0c76d MDL-33198 book: Adding h tags to book title to increase accessibility 2012-09-18 09:43:47 +08:00
Dan Poltawski
0272a0cc6c Merge branch 'master_MDL-34644' of git://github.com/danmarsden/moodle 2012-09-18 09:27:09 +08:00
Eloy Lafuente (stronk7)
b18816beae Merge branch 'MDL-34841' of git://github.com/timhunt/moodle 2012-09-18 01:15:14 +02:00
Dan Poltawski
d3dbb5ce6a Merge branch 'MDL-35388' of git://github.com/netspotau/moodle-mod_assign 2012-09-17 15:40:52 +08:00
Ankit Agarwal
6f51394b94 MDL-33198 book: Adding h tags to book titles to increase accessibility while printing a book 2012-09-17 11:29:28 +08:00
Dan Poltawski
5481ce028e Merge branch 'MDL-35163-master' of git://github.com/micaherne/moodle 2012-09-17 10:51:30 +08:00
Ankit Agarwal
d42bc7dc18 MDL-35226 lesson: Adding strings to page titles of lesson administrative pages to make it more accessible 2012-09-17 10:24:33 +08:00
Ankit Agarwal
27affa2622 MDL-35226 lesson: Adding $extrapagetitle to the api mod_lesson_renderer::header() 2012-09-17 10:24:32 +08:00
Rex Lorenzo
1659b1d1a8 MDL-33166 Forum: Adding capability mod/forum:allowforcesubscribe
Conflicts:

	mod/forum/version.php
2012-09-17 10:06:26 +08:00
Eric Merrill
7aa1a4fab2 MDL-35411 assign Include plugin (submission/feedback) info, even when there is no user data.
assign_plugin_config data was only included in backups/imports if user data was included in
the backup. This patch moves it out with the standard structure of the assign backup.
2012-09-16 17:58:20 -04:00
Charles Fulton
b4de35e632 MDL-28616 wiki: use class variable for toc header depth 2012-09-14 05:49:14 -07:00
Charles Fulton
2264828fd0 MDL-28616 wiki: html format toc rendering should match nwiki and creole 2012-09-14 05:49:14 -07:00
Michael Aherne
8d9abcf02d MDL-35163 quiz Make quiz report options available to attempts form 2012-09-14 10:03:20 +01:00
Eloy Lafuente (stronk7)
bb96b9df18 Revert "MDL-34794: Add reset course feature in mod_assign (new assignment (2.3))"
This reverts commit 72429a10da.
2012-09-14 10:48:07 +02:00
Eloy Lafuente (stronk7)
8be3eeecfe Revert "MDL-34794 mod_assign: Fixed up style after integration"
This reverts commit 20b133e7a3.
2012-09-14 10:47:04 +02:00
Eloy Lafuente (stronk7)
60cb1a5f70 Revert "MDL-32125 mod_forum: updating subscription mode not reflected"
This reverts commit bee9656ca9.
2012-09-14 10:37:10 +02:00
Eloy Lafuente (stronk7)
464df58811 Revert "MDL-32125 mod_forum: updating subscription mode not reflected"
This reverts commit cf3b9054ba.
2012-09-14 10:36:58 +02:00
Simon Coggins
cf0387ff08 MDL-34644 SCORM fix completion when only completion on view is selected. 2012-09-13 14:38:36 +12:00
Damyon Wiese
49d83b9d96 MDL-35388: Change get_output to get_renderer to remove duplicated function 2012-09-13 10:06:09 +08:00
Damyon Wiese
fd637d38ac Merge branch 'MDL-35388' of git://github.com/Lightwork-Marking/moodle into integration
Conflicts:
	mod/assign/locallib.php
2012-09-13 10:03:40 +08:00
Paul Charsley
2cffef9f41 MDL-35388 modifications to allow php unit tests to be run 2012-09-13 13:44:05 +12:00
Sam Hemelryk
36b76c1ff9 Merge branch 'master_MDL-32125_forum_subscription_change_reflected' of git://github.com/kanikagoyal/moodle 2012-09-13 11:25:47 +12:00
Eloy Lafuente (stronk7)
7f34030583 Merge branch 'master_MDL-33755' of git://github.com/danmarsden/moodle 2012-09-12 12:17:04 +02:00
Dan Marsden
29b244545b MDL-33755: SCORM fix spacing/coding guidelines 2012-09-12 20:19:44 +12:00
Dan Marsden
812bdaeb12 MDL-33755 SCORM: fix the way launch is triggered
fixes bug with the way it handles skipview set to first time.
2012-09-12 20:16:57 +12:00
Dan Marsden
410b7c9bcc MDL-33755 SCORM: new quick function to check if a user has scorm data/tracks - better/quicker way to check as full track info isn't needed. 2012-09-12 19:53:56 +12:00
Dan Marsden
234415c4ea MDL-33755 SCORM: use correct constants for skipview instead of magic numbers 2012-09-12 19:38:49 +12:00
David Monllao
1fa2dfbcb6 MDL-35264 mod_chat Bigger frame for text input 2012-09-12 13:52:50 +08:00
Sam Hemelryk
37d3caac51 Merge branch 'MDL-34088' of git://github.com/raymondAntonio/moodle 2012-09-12 11:35:41 +12:00
Sam Hemelryk
4b7377847f MDL-34568 mod_quiz: Fixed up whitespace issue 2012-09-12 11:20:35 +12:00
Sam Hemelryk
6aa130499b Merge branch 'wip-mdl-34568' of git://github.com/rajeshtaneja/moodle 2012-09-12 11:08:56 +12:00
Sam Hemelryk
939d182d1e Merge branch 'wip-MDL-34223-master' of git://github.com/marinaglancy/moodle 2012-09-12 10:50:57 +12:00
Sam Hemelryk
223285a640 Merge branch 'MDL-34692' of git://github.com/raymondAntonio/moodle 2012-09-12 10:22:54 +12:00
Eloy Lafuente (stronk7)
ae066a4691 Merge branch 'master_MDL-34544' of git://github.com/danmarsden/moodle 2012-09-11 21:33:06 +02:00
Tim Hunt
cacb8fa08a MDL-34841 error importing questions with long names.
The problem was with the non-UTF-8-safe way that a question name
was being constructed from the question text.

I have done a proper fix with methods in the base class to
carefully construct a question name that is reasonable, and
which will fit in the database column. Then I have changed all
importers to use the new methods.

I also remembered not to break the lesson in the process.
2012-09-11 15:04:00 +01:00
Aparup Banerjee
875d0e5916 MDL-31276 mod_assign Phpdocs polish 2012-09-11 16:53:56 +08:00
Aparup Banerjee
f4f1fd0b6c Merge branch 'MDL-31276-NOCSVLIB' of git://github.com/netspotau/moodle-mod_assign 2012-09-11 16:39:30 +08:00
Damyon Wiese
7a2b911c6b MDL-31276: Phpdocs cleanup for offline grading feature 2012-09-11 15:48:19 +08:00
Aparup Banerjee
27fec8650b Merge branch 'wip-MDL-29463-master' of git://github.com/phalacee/moodle 2012-09-11 14:46:44 +08:00