Commit graph

15322 commits

Author SHA1 Message Date
Sam Hemelryk
26c9c586c9 Merge branch 'MDL-41572-master' of git://github.com/jamiepratt/moodle 2013-09-17 14:30:16 +12:00
Sam Hemelryk
23eed08e1a Merge branch 'MDL-41540-master-v2' of git://github.com/jamiepratt/moodle 2013-09-17 14:02:47 +12:00
Marina Glancy
9f21d24895 Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle 2013-09-17 11:10:44 +10:00
Eloy Lafuente (stronk7)
ba57caa349 Merge branch 'MDL-41595_M26' of git://github.com/lazydaisy/moodle 2013-09-17 02:15:06 +02:00
Sam Hemelryk
29b56cfd09 MDL-38489 mod_scorm: added require to be explicit 2013-09-17 09:12:02 +12:00
Sam Hemelryk
77365f7ff6 Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle 2013-09-17 09:02:32 +12:00
Sam Hemelryk
f34af1167a Merge branch 'MDL-41667' of git://github.com/timhunt/moodle 2013-09-17 08:59:08 +12:00
Sam Hemelryk
82b2bb5eca Merge branch 'MDL-37148-master' of git://github.com/damyon/moodle 2013-09-17 08:50:38 +12:00
Rossiani Wijaya
b2970f963a MDL-41612 scorm: fix heading levels 2013-09-16 15:40:01 +08:00
Marina Glancy
4ead355143 Merge branch 'MDL-41621' of git://github.com/rwijaya/moodle 2013-09-16 17:14:18 +10:00
Marina Glancy
81673647a9 Merge branch 'MDL-41315-master' of git://github.com/damyon/moodle 2013-09-16 15:31:20 +10:00
Sam Hemelryk
31dea4fea4 Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle 2013-09-16 15:07:57 +12:00
Damyon Wiese
91327d96ca MDL-37148 assign: Fix missing parameter for submit_for_grading webservice.
It is required to specify if the user has accepted the submission statement
to make sure it goes in the log/event.
2013-09-16 09:34:32 +08:00
Sam Hemelryk
9034f94d07 Merge branch 'master_MDL-37524' of git://github.com/danmarsden/moodle 2013-09-16 10:42:47 +12:00
Dan Marsden
b98dcd7dd6 MDL-38489 SCORM: use course_get_format to obtain info 2013-09-16 10:17:51 +12:00
Vinnie Monaco
011ae52a91 MDL-38489 SCORM: added check for course display format 2013-09-16 10:17:51 +12:00
Dan Marsden
36136454b7 MDL-32506 SCORM: remove obsolete setting. 2013-09-16 10:16:16 +12:00
Dan Marsden
39355b46f9 MDL-37524 SCORM: mode not calculated correctly. 2013-09-16 10:12:49 +12:00
Dan Marsden
b33e466550 MDL-41434 SCORM: add new sortorder field to allow better ordering of scos 2013-09-16 10:11:16 +12:00
Jamie Pratt
764f6153d1 MDL-41572 pass through question behaviour vars with correct prefix
Through prepare_simulated_post_data. Also includes unit tests for
multiple attempts and tries.
2013-09-15 17:52:18 +07:00
Tim Hunt
ca6fa1216e MDL-41667 quiz: Fix CSS rules.
Thanks to Renaat Debleu for spotting this problem.
2013-09-13 11:16:05 +01:00
Henning Bostelmann
df0671f0d2 MDL-29987 File resource: fix problem with PDF display on mobile devices
Setting the default display option for PDF files from DISPLAY_EMBED to DISPLAY_OPEN
2013-09-13 10:30:41 +01:00
Damyon Wiese
20b7dcfc2c MDL-41315 assign: Add unit test for groupmembersonly 2013-09-13 16:43:26 +08:00
Adrian Greeve
82d05bc63f MDL-41772 - mod_data: Fixed database_module comments not being restored. 2013-09-13 15:26:13 +08:00
Damyon Wiese
a0e59f04dd MDL-41315 assign: Dont show users not in the current grouping
This is for separate groups mode. Note - this will be slower - but
this feature is experimental and groupslib does not provide a nicer api.
2013-09-13 14:47:01 +08:00
Damyon Wiese
1561a37cab MDL-37148 assign: Fix all phpdocs warnings from moodlecheck (except tests) 2013-09-13 13:30:02 +08:00
Damyon Wiese
539af60201 MDL-37148 assign: codechecker cleanups 2013-09-13 13:30:02 +08:00
Damyon Wiese
05a6445a14 MDL-37148 Assignment: Lots more webservices
This patch adds lots of webservices to the assignment module.
* mod_assign_revert_submissions_to_draft
* mod_assign_lock_submissions
* mod_assign_unlock_submissions
* mod_assign_save_submission
* mod_assign_submit_for_grading
* mod_assign_save_grade
* mod_assign_save_user_extensions
* mod_assign_reveal_identities
* mod_assign_copy_previous_attempt

All features such as reopening attempts and marking workflow are supported through
the save_grade and save_submission functions.

Uploading files is supported by sending draft item ids for the files_filemanager param the same functions.
2013-09-13 13:29:51 +08:00
Rossiani Wijaya
f7bfb405cb MDL-41288 wiki: fix missing .rtl class for deleting comment button and improve page display for deleting comment 2013-09-13 12:56:41 +08:00
Rossiani Wijaya
14cdc25731 MDL-41288 Wiki: add additional fix for heading level 2013-09-13 11:04:08 +08:00
Damyon Wiese
7f43748f18 MDL-37804 assign: Return proper notice when submissions closed.
MDL-38267 was returning the html page when it should have been adding to the list
of notices and returing false.
2013-09-12 10:34:02 +08:00
Dan Poltawski
e3a1fa4be8 MDL-40733 forum: fix duplciate headings
two integration patches collided..
2013-09-11 16:14:37 +08:00
Rajesh Taneja
3aa3de0db7 MDL-41711 Glossary: Fixed seach label alignment 2013-09-11 14:34:24 +08:00
prateeksachan
9054c04d45 MDL-38267 assign: No Submit button after cut-off date 2013-09-11 12:17:59 +08:00
Sam Hemelryk
b3602b3e5e Merge branch 'MDL-40687' of git://github.com/rwijaya/moodle 2013-09-11 09:47:41 +12:00
Marina Glancy
341e2460cd MDL-41288 Bugfix of error occuring when subwiki is not set 2013-09-10 22:02:24 +10:00
Dan Poltawski
261dc01734 Merge branch 'MDL-40733_forum_name' of https://github.com/andyjdavis/moodle 2013-09-10 17:35:40 +08:00
Dan Poltawski
50d7cc8463 Merge branch 'MDL-41566' of git://github.com/rwijaya/moodle 2013-09-10 17:30:04 +08:00
Rossiani Wijaya
b25e7d8599 MDL-41562 file resource: fix page heading levels.
Also removing printheading options setting.
2013-09-10 17:22:08 +08:00
Rossiani Wijaya
d184f9bd4a MDL-41567 url resource: fix page heading levels.
Also removing printheading options setting.
2013-09-10 17:13:18 +08:00
Jamie Pratt
707825265d MDL-41540 remove use of $USER
by quiz_create_attempt internally.
2013-09-10 14:36:30 +07:00
Dan Poltawski
c219df86d1 Merge branch 'MDL-41564' of git://github.com/rwijaya/moodle 2013-09-10 15:29:23 +08:00
Dan Poltawski
f2ee9b5c27 Merge branch 'MDL-39992-master' of git://github.com/damyon/moodle 2013-09-10 14:58:54 +08:00
Dan Poltawski
92d92606ba Merge branch 'MDL-40631-master' of git://github.com/damyon/moodle 2013-09-10 14:33:41 +08:00
Rossiani Wijaya
876c0ac382 MDL-41288 wiki: improve heading levels and styling 2013-09-10 14:08:34 +08:00
Damyon Wiese
b10ce36806 Merge branch 'MDL-40736' of git://github.com/rwijaya/moodle 2013-09-10 13:48:01 +08:00
Dan Poltawski
e025a2fc43 Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 13:39:01 +08:00
Damyon Wiese
bfcc07504e MDL-23335 forum: Fix whitespace 2013-09-10 12:59:49 +08:00
Damyon Wiese
6aca3fc419 Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle 2013-09-10 12:56:40 +08:00
Marina Glancy
44ddd2a115 MDL-41219 course: Make properties of course_modinfo read-only
added phpdocs and unittests
2013-09-10 14:11:37 +10:00