68654 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
8888451ed5 Merge branch 'MDL-45870-master' of git://github.com/FMCorz/moodle 2014-06-17 00:51:26 +02:00
Eloy Lafuente (stronk7)
bfc66dd983 Merge branch 'MDL-45936_master' of https://github.com/markn86/moodle 2014-06-17 00:18:15 +02:00
Eloy Lafuente (stronk7)
d519545a54 Merge branch '45884-28' of https://github.com/samhemelryk/moodle 2014-06-17 00:09:50 +02:00
Marina Glancy
db8071a7f9 Merge branch 'MDL-45940-master' of git://github.com/damyon/moodle 2014-06-16 17:28:15 +08:00
Marina Glancy
c126413655 Merge branch 'MDL-45901_Quiz_master' of git://github.com/nadavkav/moodle 2014-06-16 17:27:20 +08:00
Rajneel Totaram
8fb7520095 MDL-45967 admin lang: Fix typo 2014-06-16 17:26:34 +08:00
Marina Glancy
14422ae946 Merge branch 'MDL-43274-master' of git://github.com/xow/moodle 2014-06-16 17:23:53 +08:00
Damyon Wiese
a3d7a82b64 Merge branch 'MDL-42531-alt' of https://github.com/jonof/moodle 2014-06-16 16:26:06 +08:00
John Okely
fbd449509e MDL-43274 Course: Remove message about course logs from upgrade.txt 2014-06-16 16:25:27 +08:00
Damyon Wiese
de06ce7ed3 MDL-45940 Assign: Improved access check
Call can_edit() instead of repeating a (slightly wrong) access check.
2014-06-16 16:20:11 +08:00
Damyon Wiese
070d5b17e1 MDL-31409 Grading form webservice: Whitespace fixes 2014-06-16 16:14:43 +08:00
Damyon Wiese
be08fd134e Merge branch 'MDL-31861' of https://github.com/Lightwork-Marking/moodle 2014-06-16 16:13:38 +08:00
Marina Glancy
4a61670aed Merge branch 'MDL-35648' of git://github.com/danielneis/moodle 2014-06-16 14:02:38 +08:00
Marina Glancy
6581e387a0 Merge branch 'MDL-45935-master' of git://github.com/andrewnicols/moodle 2014-06-16 14:02:17 +08:00
Damyon Wiese
b3f297df31 Merge branch 'MDL-31998_master' of git://github.com/grabs/moodle 2014-06-16 12:04:02 +08:00
Damyon Wiese
bf4c212284 Merge branch 'wip-mdl-46001' of https://github.com/rajeshtaneja/moodle 2014-06-16 11:24:29 +08:00
Rajesh Taneja
96b86e038e MDL-46001 atto_clear: modfied behat test to work on xvfb 2014-06-16 11:09:43 +08:00
Damyon Wiese
1df546a77e Merge branch 'MDL-45803_master' of https://github.com/markn86/moodle 2014-06-16 11:00:26 +08:00
Damyon Wiese
70b58992b8 Merge branch 'wip-MDL-45395-master' of git://github.com/abgreeve/moodle 2014-06-16 10:07:00 +08:00
John Okely
bb8d6e1a81 MDL-43274 Course: Remove ability to delete logs on a course during reset 2014-06-16 09:10:05 +08:00
Mark Nelson
e0e6d931f3 MDL-45936 auth_db: use core functions when creating/updating a user 2014-06-14 15:59:45 -07:00
Nadav Kavalerchik
c9976d96a5 MDL-45901 - Quiz - Display random questions (from category) on RTL mode. 2014-06-13 12:20:23 +03:00
Paul Charsley
0ff4ebb4a3 MDL-31861 add web service function save_definitions 2014-06-13 15:36:25 +12:00
Andreas Grabs
16ee970c94 MDL-31998 mod_feedback - Feedback depend questions bug 2014-06-13 01:45:23 +02:00
Sam Hemelryk
99f041ebfa MDL-45884 navigation: changed to positive setting phrasing 2014-06-13 10:16:25 +12:00
Sam Hemelryk
aab6438ca1 MDL-45884 navigation: tidied up code and added behat tests 2014-06-13 10:16:25 +12:00
Syxton
4d378e9f70 MDL-45884 navigation: setting that allows sites to collapse My Courses by default 2014-06-13 10:16:25 +12:00
Eloy Lafuente (stronk7)
337075d17b weekly release 2.8dev 2014-06-12 18:58:54 +02:00
Eloy Lafuente (stronk7)
0272001830 Merge branch 'MDL-44871-master' of git://github.com/damyon/moodle 2014-06-12 11:38:10 +02:00
Eloy Lafuente (stronk7)
1a32e1d446 Merge branch 'MDL-42835-master' of http://github.com/damyon/moodle 2014-06-12 09:51:11 +02:00
Rajesh Taneja
c2c5d57790 MDL-45808 enrol_self: Fixed behat to observe the group key policy 2014-06-12 14:20:02 +08:00
Damyon Wiese
c48c9bf02f MDL-42835 Scorm: Fix for JS error because no nodes are selected in the toc. 2014-06-12 13:57:34 +08:00
Damyon Wiese
d27c8d924a MDL-44871 Atto: Add missing tags to behat tests @editor and @editor_atto 2014-06-12 11:14:21 +08:00
Adrian Greeve
4051685ba0 MDL-45395 lib: Removal of excel 5 spreadsheet creation files.
The excel 5 writer files were using OLE licensing which is GPL incompatible.
These classes are not used in core.
2014-06-12 10:41:42 +08:00
Mark Nelson
b4cfcf5e53 MDL-45803 mod_quiz: removed the quiz_fire_attempt_started function
Also commented in mod/quiz/upgrade.txt to inform developers.
2014-06-11 13:53:59 -07:00
Mark Nelson
62a3472e24 MDL-45803 mod_quiz: removed usage of the function quiz_fire_attempt_started_event 2014-06-11 13:53:03 -07:00
Damyon Wiese
ca4f7f6105 MDL-45763 Question types: Allow saving '0' as question text. 2014-06-11 17:28:52 +08:00
Rajesh Taneja
49d82f905e MDL-44871 behat: Hack to make equation editor visible 2014-06-11 17:20:18 +08:00
Marina Glancy
84dc90034a MDL-39726 backup: fix SQL syntax for Oracle 2014-06-11 17:16:45 +08:00
Damyon Wiese
162e050c66 MDL-44871 Atto behat: Use one less page load to get to profile edit page 2014-06-11 16:29:38 +08:00
Damyon Wiese
e3adee555b MDL-44871 Atto: Move custom select text step to atto specific step definition. 2014-06-11 15:29:20 +08:00
Damyon Wiese
7d8f825bbf MDL-44871 Atto behat tests: Modified the tests to work around focus bugs with workspaces
The main changes here are that the "select the text in" step was modified to select only the
first text node in the editor field, and to focus on it's parent instead of the entire editable div.

Some tests had to be modified to match the new behaviour, and another "real" bug was found in the table plugin.
2014-06-11 14:34:48 +08:00
Marina Glancy
b9329e0cfe MDL-39726 backup: fix SQL syntax for Oracle 2014-06-11 12:14:16 +08:00
Marina Glancy
5528117324 MDL-45763 question: fix SQL syntax for Oracle 2014-06-11 12:13:19 +08:00
Frederic Massart
13a13c1178 MDL-45870 mod_assign: Behat test covering some outcome usage 2014-06-11 10:33:57 +08:00
Eloy Lafuente (stronk7)
ea8541d0f9 Merge branch 'm28_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle 2014-06-11 01:32:24 +02:00
Eloy Lafuente (stronk7)
a834119d81 Merge branch 'MDL-45808-master' of git://github.com/FMCorz/moodle 2014-06-10 22:47:54 +02:00
Eloy Lafuente (stronk7)
ffce783fcd Merge branch 'MDL-45579-master' of git://github.com/FMCorz/moodle 2014-06-10 20:56:14 +02:00
Eloy Lafuente (stronk7)
ed16bf3724 Merge branch 'MDL-45418' of git://github.com/stronk7/moodle 2014-06-10 20:12:58 +02:00
Barbara Ramiro
1e2e5d83e9 MDL-45943: Replacement for publisher icons 2014-06-10 19:20:35 +02:00