14418 Commits

Author SHA1 Message Date
Dan Poltawski
d1050e406f Merge branch 'MDL-42013_master' of git://github.com/dmonllao/moodle 2013-10-07 11:26:37 +08:00
Frederic Massart
eb665c34ef MDL-41611 mod_quiz: Offer to return to course when supported 2013-10-04 18:21:56 +08:00
Frederic Massart
98e9e91505 MDL-41611 mod_forum: Display inline available when supported 2013-10-04 18:21:14 +08:00
David Monllao
8b30d05557 MDL-42013 behat: Fixing related tests
We had no false positives because of this
issue, but some checking have been restricted
to specific DOM parts.
2013-10-04 14:38:11 +08:00
Sam Hemelryk
cf8943779e NOBUG: Fixed file access permissions 2013-10-04 15:43:58 +13:00
Sam Hemelryk
9b70e68445 NOBUG: Fixed SVG browser compatibility 2013-10-04 15:43:53 +13:00
Damyon Wiese
9f5193a4b8 MDL-42023 Assign: Edit PDF plugin - fix unit tests 2013-10-03 14:05:28 +08:00
Damyon Wiese
5c3864723a MDL-42023 assign: Edit PDF plugin - Damyon's contributions 2013-10-03 09:30:32 +08:00
Barbara Ramiro
95dfde5549 MDL-42023 assign: Edit PDF plugin - Barbara's contributions 2013-10-03 09:29:54 +08:00
Jerome Mouneyrac
e0cc92c650 MDL-42023 assign: Edit PDF plugin - Jerome's contributions 2013-10-03 09:29:54 +08:00
Davo Smith
1ce2ce7cb0 MDL-42023 assign: Add Edit PDF plugin to core.
This plugin is heavily based on the uploadpdf plugin from
Davo Smith <git@davosmith.co.uk>. This is a fantastic plugin
that provides a great benefit for teachers marking assignments.

A big thankyou to Davo for writing the plugin and helping us to
get it integrated to core.

The plugin provides a pdf editing interface in the teachers browser
that lets them add comments and annotations to a students assignment
submission. The comment and annotations are then added to a pdf version
of the students submission which is send back to the student so they can
download it, or read it online.

This plugin has been primarily worked on by Damyon Wiese, Jerome Mouneyrac
and Barbara Ramiro. We have also had great feedback and suggestions from others
including the entire frontend team, Martin and Frederic Massart.
2013-10-03 09:29:54 +08:00
Sam Hemelryk
0fcedc7c73 MDL-41039 mod_quiz: version bump 2013-10-02 12:10:43 +13:00
Sam Hemelryk
18f04ab625 Merge branch 'MDL-41039-master' of git://github.com/FMCorz/moodle 2013-10-02 12:10:08 +13:00
Sam Hemelryk
6579a7b791 Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle 2013-10-02 11:36:16 +13:00
Eloy Lafuente (stronk7)
9d4ff1e5f4 Merge branch 'MDL-41798' of git://github.com/rwijaya/moodle 2013-10-02 00:26:20 +02:00
Eloy Lafuente (stronk7)
3667a8ce7f Merge branch 'MDL-40047-master' of git://github.com/ankitagarwal/moodle 2013-10-01 23:59:05 +02:00
Eloy Lafuente (stronk7)
d1ed736f1d Merge branch 'wip-MDL-40049-master-i' of git://github.com/abgreeve/moodle 2013-10-01 23:42:00 +02:00
Sam Hemelryk
28a6f665f4 Merge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle 2013-10-02 10:27:54 +13:00
Eloy Lafuente (stronk7)
098723aabb Merge branch 'mdl41996-master' of https://github.com/tlock/moodle 2013-10-01 20:01:33 +02:00
Eloy Lafuente (stronk7)
46e11c6690 Merge branch 'wip-MDL-41921-master' of git://github.com/marinaglancy/moodle 2013-10-01 19:55:30 +02:00
Eloy Lafuente (stronk7)
52e9827495 Merge branch 'MDL-42001-master' of git://github.com/FMCorz/moodle 2013-10-01 19:41:10 +02:00
Eloy Lafuente (stronk7)
164e90dd70 Merge branch 'MDL-42003-master' of git://github.com/FMCorz/moodle 2013-10-01 19:36:37 +02:00
Eloy Lafuente (stronk7)
91c49b8cf4 Merge branch 'MDL-41752-master' of git://github.com/jamiepratt/moodle 2013-10-01 19:18:36 +02:00
Eloy Lafuente (stronk7)
00a6df6b02 Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle 2013-10-01 15:59:06 +02:00
Petr Škoda
92911ef1b8 MDL-41999 fix setting of USER in chat 2013-10-01 09:23:42 +02:00
Adrian Greeve
8a94144332 MDL-40049 mod_choice: Replaced old add_to_log calls with event triggers.
Also added a generator for unit tests.
2013-10-01 10:36:13 +08:00
Ankit Agarwal
808f8480eb MDL-40047 chat: Fix classname typo in generator tests 2013-10-01 10:13:20 +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
Sam Hemelryk
9b2fdfab44 Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle 2013-10-01 14:06:28 +13:00
Sam Hemelryk
a0a63fa526 Merge branch 'MDL-41894-master' of git://github.com/ankitagarwal/moodle 2013-10-01 13:45:18 +13:00
Eloy Lafuente (stronk7)
b1698e9ac5 Merge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle 2013-10-01 01:52:53 +02:00
Marina Glancy
e6ec2366a8 Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle
Conflicts:
	mod/upgrade.txt
2013-09-30 17:57:30 +10:00
Mark Nielsen
50ae8814e4 MDL-40248 mod: Allow xxx_get_types() to use default display
* Added new constant: MOD_SUBTYPE_NO_CHILDREN
* When MOD_SUBTYPE_NO_CHILDREN is returned from xxx_get_types()
  then default display is used for activity chooser.
* Updated mod/upgrade.txt
* Removed dead code from navigationlib.php instead of updating
  it for new behavior of xxx_get_types
* Updated lib/upgrade.txt
2013-09-30 16:49:37 +10:00
Marina Glancy
f13511451c Merge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle 2013-09-30 16:09:40 +10:00
Sam Hemelryk
00a2879412 Merge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle 2013-09-30 12:09:50 +13:00
Paul Charsley
e8b443df33 MDL-41738 added web service function mod_assign_set_user_flags 2013-09-30 08:20:52 +13:00
Jamie Pratt
d50b05e696 MDL-41751 changes to api of question_response_analyser
and code refactoring and clean up.
2013-09-27 17:38:13 +07:00
Jamie Pratt
59abb70716 MDL-41752 question statistics class moved and improved
quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.
2013-09-27 16:24:18 +07:00
Rossiani Wijaya
43601cdf73 MDL-41798 imscp module: fix heading levels. 2013-09-27 17:22:41 +08:00
Marina Glancy
47164284f7 MDL-41921 mod_url: less restrictions on URL field
Restoring functionality from 2.4 accidentally removed in MDL-34311
2013-09-27 18:33:27 +10:00
Jamie Pratt
515b3ae6a7 MDL-41752 question statistics class moved and improved
quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.
2013-09-27 14:10:53 +07:00
Jamie Pratt
522bef8030 MDL-41888 More comments 2013-09-27 14:08:16 +07:00
Jamie Pratt
933ac7497a MDL-41888 allow for a blank string as format to mean not to show stat
as in MDL-41929 which applies to older stable branches.
2013-09-27 14:08:16 +07:00
Jamie Pratt
7de1e35b75 MDL-41888 separate out quiz statistics calculations from report code
also code clean up.
2013-09-27 14:08:15 +07:00
Frederic Massart
c8135e8b18 MDL-42001 mod_chat: Transforming handlers to observers 2013-09-27 13:38:27 +08:00
Sam Hemelryk
322d9c8cda Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/db/upgrade.php
2013-09-27 11:32:05 +12:00
Dan Marsden
8d29a8c3bc MDL-39910 SCORM: set correct site level defaults. 2013-09-27 10:49:54 +12:00