15501 Commits

Author SHA1 Message Date
Frederic Massart
885650c70c MDL-45546 mod_forum: Login the user before getting its context 2014-05-20 10:25:07 +08:00
Dan Poltawski
0c722830d9 Merge branch 'MDL-44449' of git://github.com/timhunt/moodle 2014-05-20 09:50:43 +08:00
Sam Hemelryk
adb5d8a5d6 Merge branch 'MDL-45135-master' of git://github.com/danpoltawski/moodle 2014-05-20 08:47:16 +12:00
Tim Hunt
35cbe84bf7 MDL-44449 quiz access rules should have a delete hook.
So they can clean up their settings when the quiz is deleted.

See
babf149c2c
for an example of using this.
2014-05-19 16:59:04 +01:00
Damyon Wiese
cc3dfc2c5f Merge branch 'MDL-43833' of git://github.com/timhunt/moodle 2014-05-19 20:11:50 +08:00
Damyon Wiese
0cce8af367 Merge branch 'MDL-45455' of git://github.com/timhunt/moodle 2014-05-19 19:54:42 +08:00
Dan Poltawski
c1e3f99249 Merge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle 2014-05-19 18:43:15 +08:00
Damyon Wiese
50f0658804 Merge branch 'MDL-23566' of https://github.com/aolley/moodle 2014-05-19 12:45:21 +08:00
Frederic Massart
2507b7e060 MDL-45537 mod_assign: Requiring locallib for class assign 2014-05-19 12:40:17 +08:00
Marina Glancy
1de6c62dc7 Merge branch 'wip-MDL-45483-master' of https://github.com/kwiliarty/moodle 2014-05-19 12:37:10 +08:00
Tim Hunt
6f988b712d MDL-45455 quiz cron must rollback transaction on error. 2014-05-15 15:09:58 +01:00
Tim Hunt
69d8094f83 MDL-43833 quiz reports: persist states settings between pages. 2014-05-15 15:09:12 +01:00
Eric Merrill
81d48fb907 MDL-45523 quiz Cleanup duplicate question instances. 2014-05-13 14:47:12 +08:00
Eric Merrill
6794a98f6c MDL-45522 quiz Check that sumgrade is valid before saving. 2014-05-13 14:35:43 +08:00
Dan Poltawski
d3934a4ffe MDL-45135 mod_glossary: fix RTL alignment of table
Tablelib has a specific 'hook' to allow alignment to be corrected for
RTL languages, but needs to be specified direction in lowercase.
2014-05-12 17:08:06 +08:00
Kevin Wiliarty
7a98bbab51 MDL-45483 mod_forum: corrects values for maxattachments in forum settings 2014-05-09 00:52:42 -04:00
Dan Poltawski
a5fd1a13c8 Merge branch 'MDL-45486' of git://github.com/stronk7/moodle 2014-05-09 10:50:26 +08:00
John Okely
6d90ef2b4a MDL-45296 mod_assign: Revert changes to lock_submission and unlock_submission events 2014-05-09 09:58:55 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Eloy Lafuente (stronk7)
2fe085b284 MDL-45296 tests: ensure all submissions exist
The changes performed with the change from
create_from_user() to create_from_submission()
in practice enforce a new restriction about
submissions having to exist in order to fire
their lock/unlock events.

This did not exist before the change and, also,
it seems that the assign api itself, submission->lock() ...
also accepts non existing submissions.

So I was not 100% sure about how to fix these events:

1) enforcing submission to exist.
2) firing them only if the submission exist.

I've gone with 1) for now, making tests to pass. But will
raise the question in the Tracker, just in case we have
to move to the 2) approach for any reason.
2014-05-08 20:03:34 +02:00
Eloy Lafuente (stronk7)
b95db263ca MDL-45296 tests: Fix unit tests to have objectid
In order to create the needed subscriptions to
make the event tests reliable a subscriptions
generator has been added. It performs raw-sql
subscriptions because by using the forum API
events would be fired (and that's something
we don't want to happen).
2014-05-08 20:03:17 +02:00
Eloy Lafuente (stronk7)
b8f0ec297d Merge branch 'MDL-45296' of git://github.com/stronk7/moodle 2014-05-08 15:58:46 +02:00
Eloy Lafuente (stronk7)
b8ac973a21 MDL-45296 phpdoc: add some missing params 2014-05-08 15:52:07 +02:00
John Okely
9c94ca5843 MDL-45296 events: Fix objecttable and ids
Various events had them incorrectly set or missing:
  - submission_locked
  - submission_unlocked
  - subscription_created
  - subscription_deleted
2014-05-08 15:30:03 +02:00
Marina Glancy
9a9b5257fa Merge branch 'MDL-45373-master' of git://github.com/jamiepratt/moodle 2014-05-08 15:41:20 +08:00
Marina Glancy
317e98badd MDL-45414 wiki: blank image for page index icons 2014-05-08 12:12:50 +08:00
Tony Butler
b887c262bc MDL-45432 mod_assign Declare character encoding in onlinetext export
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-05-07 13:07:04 +01:00
Dan Poltawski
917ceadbd7 Merge branch 'wip-MDL-45319-master' of git://github.com/marinaglancy/moodle 2014-05-07 17:51:31 +08:00
Dan Poltawski
fb3f578f41 Merge branch 'MDL-45410-en_fix' of git://github.com/mudrd8mz/moodle 2014-05-07 16:38:00 +08:00
Mark Nelson
e687396a1e MDL-45319 events: trivial changes 2014-05-07 16:28:59 +08:00
Adam Olley
c3af87ac64 MDL-23566 mod_lesson: Float answers so paragraphs line up correctly next to the inputs 2014-05-07 15:44:36 +09:30
Damyon Wiese
0cd720fe51 MDL-44606 assign: disable sesskey protection for unit test. 2014-05-07 14:06:08 +08:00
Damyon Wiese
46b56588ae MDL-44606 Assign: Some grading functions are missing sesskey protection 2014-05-07 12:36:38 +08:00
Dan Poltawski
fa00be94b1 Merge branch 'wip-MDL-45414-master' of git://github.com/marinaglancy/moodle 2014-05-07 12:05:17 +08:00
Helen Foster
f15fa7a281 MDL-45410 Merge English strings from the en_fix language pack 2014-05-07 00:16:51 +02:00
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Andrew Nicols
4d87e5c109 MDL-45357 events: Normalise event description names 2014-05-06 16:44:04 +08:00
James Pratt
96a0b9aaaa MDL-45373 quiz response analysis : count all tries at question
don't filter repeated tries.
2014-05-06 12:26:02 +07:00
Marina Glancy
c3625f5ba3 MDL-45414 wiki: fix broken image 2014-05-06 11:34:01 +08:00
Dan Poltawski
5bf52355ea Merge branch 'MDL-30106' of git://github.com/jleyva/moodle 2014-05-06 10:25:48 +08:00
Juan Leyva
fb8840d291 MDL-30106 forum: get_posts WS fixes in data generator and def. values 2014-05-05 11:56:43 +02:00
Juan Leyva
4ed1546154 MDL-30106 forum: Bump version number (upgrading service and installing new ws) 2014-05-05 11:56:43 +02:00
Juan Leyva
e2ede4262f MDL-30106 forum: New web service mod_forum_get_forum_discussion_posts 2014-05-05 11:55:43 +02:00
Marina Glancy
6df154bd20 Merge branch 'MDL-34904-master' of git://github.com/ankitagarwal/moodle 2014-05-05 17:41:01 +08:00
Marina Glancy
4cbe8be96d Merge branch 'MDL-45342-master' of git://github.com/ankitagarwal/moodle 2014-05-05 17:17:45 +08:00
Marina Glancy
16feb870d4 Merge branch 'MDL-45357_master' of git://github.com/markn86/moodle 2014-05-05 16:09:53 +08:00
Mark Nelson
c5cfb3ca98 MDL-45357 events: changed event descriptions to ensure consistency in core 2014-05-05 00:55:50 -07:00
Marina Glancy
a128a24fca Merge branch 'wip-MDL-45127-master' of git://github.com/abgreeve/moodle 2014-05-05 10:18:03 +08:00
Adrian Greeve
028f535fd9 MDL-45127 mod_lesson: Behat test for reviewing a lesson. 2014-05-02 16:09:06 +08:00
Adrian Greeve
0aec842e58 MDL-45127 mod_lesson: Fixed reviewing lesson answers changing the lesson grade. 2014-05-02 16:09:06 +08:00