15524 Commits

Author SHA1 Message Date
Mark Nelson
be8fe65404 MDL-45804 mod_workshop: fixed objecttable specified for the submission_reassessed event 2014-06-02 16:33:54 -07:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Dan Poltawski
1ce76b900b Merge branch 'MDL-45676_master' of https://github.com/markn86/moodle 2014-05-26 12:02:40 +01:00
Dan Poltawski
c6e3d67934 Merge branch 'MDL-45675_master' of https://github.com/markn86/moodle 2014-05-26 11:58:50 +01:00
Marina Glancy
87c1a30b1f Merge branch 'MDL-45661-master' of git://github.com/damyon/moodle 2014-05-26 14:40:56 +08:00
Marina Glancy
8a564deb07 Merge branch 'MDL-44482-master' of git://github.com/jethac/moodle 2014-05-26 14:40:48 +08:00
Jetha Chan
101ec5fd3b MDL-44482 mod_lti: use localized dates
Fixed an issue where LTI external tools had creation datestamps of NaN/NaN/NaN under particular non-English languages.
2014-05-26 14:03:02 +08:00
Damyon Wiese
4e2bf2381f MDL-45661 Assign: Clean bad data from DB after MDL-42526 2014-05-26 12:36:21 +08:00
Marina Glancy
9e41209bba Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle 2014-05-26 11:58:50 +08:00
Mark Nelson
476999c722 MDL-45675 mod_data: initialise options as an empty array to avoid error when there are none 2014-05-25 19:28:07 -07:00
Sam Hemelryk
1912b5aa92 Merge branch 'MDL-45192_master' of git://github.com/dmonllao/moodle 2014-05-26 13:23:02 +12:00
Sam Hemelryk
c5eef789b9 Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle 2014-05-26 09:02:39 +12:00
Mark Nelson
1f386b13c7 MDL-45676 mod_data: added missing additional name fields 2014-05-22 21:59:52 -07:00
James Pratt
fdb6811224 MDL-42526 mod_assignment : fix record insert with assigment.id 0 2014-05-22 12:10:07 +07:00
Damyon Wiese
4e8a350c35 Merge branch 'MDL-45618' of git://github.com/timhunt/moodle 2014-05-20 14:59:48 +08:00
Mark Nelson
9d4b3d42fc MDL-45629 mod_assign: removed use of '$this->objectid' in the submission_status_viewed event 2014-05-19 23:51:09 -07:00
Marina Glancy
4d46c88b9f Merge branch 'MDL-44333' of git://github.com/timhunt/moodle 2014-05-20 14:10:03 +08:00
Dan Poltawski
c51ad7cbe2 Merge branch 'wip-MDL-45466-master' of git://github.com/marinaglancy/moodle 2014-05-20 11:51:53 +08:00
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
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01: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
Marina Glancy
69d570c130 MDL-45466 forum: performance improvement for mass (un)subscriptions 2014-05-19 13:37:05 +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
1c65d09f17 MDL-44333 quiz reports: use consitent name for user pref
The Marks for each question setting was not being saved properly as a
user preference.
2014-05-17 14:52:43 +01: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
David Monllao
b28b374f2e MDL-45192 behat: Replacing specific-selector steps by a generic one
Having a I click on we can use all our selectors rather
than having multiple steps for the same purpose. This
step allow us to manage JS native dialogues without
having to fail a scenario.

Credit for Mohamed Alsharaf.
2014-05-13 20:21:49 +07:00
Mohamed Alsharaf
bcad873102 MDL-45192 assign: added behat script & new definitions to handle alert dialog
The behat script is to test the batch action to lock and unlock submissions.
The new definitions are to prevent the "unexpected alert open" error in Selenium.
2014-05-13 20:10:53 +07: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