Commit graph

67193 commits

Author SHA1 Message Date
Jason Fowler
08f2855d64 MDL-45611 Questions: Fixing the layout of the 'points box' 2014-06-13 10:24:59 +08:00
AMOS bot
eb4b4c7ba0 Merge branch 'MOODLE_26_STABLE' into install_26_STABLE 2014-06-13 00:42:09 +00:00
Tim Lock
23c3ce59ff MDL-45982: Implement displaying of non error messages from a provider. 2014-06-13 10:08:03 +09:30
Andreas Grabs
87aa044351 MDL-31998 mod_feedback - Feedback depend questions bug 2014-06-13 01:44:35 +02:00
Tim Hunt
fa5cfedf4e MDL-45970 quiz editing: fix display of random questions.
The pass by reference meant the function was clobbering the variable in
the calling function. Once that was change, it was not strictly
necessary to rename the variable in the function, but I did anyway for
clarity.

Thanks to Rajesh Taneja for finding the problem, and identifying which
bit of code was broken. I really just made the patch.
2014-06-12 19:43:31 +01:00
Eloy Lafuente (stronk7)
89c7782a91 weekly release 2.6.3+ 2014-06-12 18:59:00 +02:00
Eloy Lafuente (stronk7)
e17dc7bcfa Merge branch 'MDL-42835-26' of http://github.com/damyon/moodle into MOODLE_26_STABLE 2014-06-12 10:00:01 +02:00
John Okely
64f2725233 MDL-10115 User profile: Allow full list of courses to be viewed on a user's profile 2014-06-12 15:20:34 +08:00
Rajesh Taneja
6e5c445714 MDL-45808 enrol_self: Fixed behat to observe the group key policy
Conflicts:
	enrol/self/tests/behat/self_enrolment.feature
2014-06-12 14:39:42 +08:00
Damyon Wiese
95ef465948 MDL-42835 Scorm: Fix for JS error because no nodes are selected in the toc. 2014-06-12 14:00:04 +08:00
AMOS bot
0d893ad97b Automatically generated installer lang files 2014-06-12 00:43:43 +00:00
Damyon Wiese
1110aed46a MDL-45763 Question types: Allow saving '0' as question text. 2014-06-11 17:29:55 +08:00
Marina Glancy
86fdc9dd64 MDL-39726 backup: fix SQL syntax for Oracle 2014-06-11 17:16:15 +08:00
Marina Glancy
d66cfec3f0 MDL-39726 backup: fix SQL syntax for Oracle 2014-06-11 12:19:15 +08:00
Marina Glancy
677267791a MDL-45763 question: fix SQL syntax for Oracle 2014-06-11 12:19:15 +08:00
Eloy Lafuente (stronk7)
8e9115725e Merge branch 'm26_MDL-29708_Typo_Extra_Slashes' of https://github.com/scara/moodle into MOODLE_26_STABLE 2014-06-11 01:46:08 +02:00
Frederic Massart
179515b4de MDL-45808 group: Observe the group key policy upon group creation 2014-06-10 23:03:37 +02:00
Eloy Lafuente (stronk7)
871c0ec7c5 Merge branch 'MDL-45579-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-06-10 22:26:12 +02:00
Eloy Lafuente (stronk7)
e7bc2568a6 Merge branch 'MDL-45418_26' of git://github.com/stronk7/moodle into MOODLE_26_STABLE 2014-06-10 20:13:58 +02:00
Barbara Ramiro
9fca4525dc MDL-45943: Replacement for publisher icons 2014-06-10 19:38:35 +02:00
Jason Fowler
5fd16a3761 MDL-45418 Files: Adding upgrade steps for publisher docs
Conflicts:
	lib/db/upgrade.php
	lib/db/upgradelib.php
	version.php
2014-06-10 19:37:29 +02:00
James McLean
af21acd472 MDL-45418 Files: Adding publisher docs to Filetypes 2014-06-10 19:34:08 +02:00
Eric Merrill
272878cab9 MDL-45763 question: Correct random question text if set to true or false 2014-06-10 20:08:35 +08:00
Marina Glancy
38083d7ff3 Merge branch 'MDL-20154-26' of git://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-06-10 15:42:27 +08:00
Damyon Wiese
86af5cb87c Merge branch '45524-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-06-10 15:31:25 +08:00
Marina Glancy
fde80766e2 Merge branch '26STABLE-wip-MDL45846' of git://github.com/jennymgray/moodle into MOODLE_26_STABLE 2014-06-10 14:20:34 +08:00
Damyon Wiese
2f3c3abc1f Merge branch 'wip-mdl-44309-m26' of https://github.com/deraadt/moodle into MOODLE_26_STABLE 2014-06-10 14:08:30 +08:00
Damyon Wiese
871a036c74 Merge branch 'MDL-45767_returnInstanceid_26' of https://github.com/moodlerooms/moodle into MOODLE_26_STABLE 2014-06-10 13:52:18 +08:00
Damyon Wiese
eb6e5390c9 Merge branch 'MDL-45763-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-06-10 13:14:38 +08:00
Andrew Nicols
ac86e96914 MDL-45935 tests: Specify step names during backup/restore tests 2014-06-10 12:18:24 +08:00
Frederic Massart
66f93d133a MDL-45870 mod_assign: Behat test covering some outcome usage 2014-06-10 11:58:19 +08:00
Michael de Raadt
ae527646a1 MDL-45719 mod_lti - Pass language strings to inline JS to allow for escaping 2014-06-10 11:40:28 +08:00
Eloy Lafuente (stronk7)
0034fd8816 Merge branch 'MDL-42782-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-06-10 01:10:40 +02:00
Eloy Lafuente (stronk7)
4c3f6d562f Merge branch 'MDL-42835_26' of git://github.com/nobelium/moodle into MOODLE_26_STABLE 2014-06-10 00:37:34 +02:00
Eloy Lafuente (stronk7)
b2d285491c Merge branch 'MDL-45574-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-06-09 21:49:44 +02:00
Eloy Lafuente (stronk7)
4d7544a3a0 Merge branch 'wip-MDL-44501-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE 2014-06-09 18:59:37 +02:00
Jenny Gray
1d20e997a0 MDL-45846 Libraries custom user agent device detection unit test added 2014-06-09 14:04:36 +01:00
Marina Glancy
a9af7d94e1 Merge branch 'MDL-45560-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-06-09 17:25:22 +08:00
Jetha Chan
3a6f3f906a MDL-38693 themes: amended z-indexes
Amended #dock z-index level from 11000 to 5000 across all themes; amended z-index style of #page-header in Overlay theme such that elements no longer occlude TinyMCE.
2014-06-09 14:09:55 +08:00
Damyon Wiese
8beb255c10 Merge branch 'MDL-39726-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-06-09 12:43:04 +08:00
Damyon Wiese
c800196f03 Merge branch 'MDL-45714-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-06-09 09:20:09 +08:00
Sam Hemelryk
7a684b732c MDL-45524 navigation: fixed non-expandable node behat tests 2014-06-09 09:33:59 +12:00
Sam Hemelryk
82358535df MDL-44711 navigation: improved expandable course calculation 2014-06-09 09:33:59 +12:00
Matteo Scaramuccia
6637cf27b9 MDL-29708 Fixed file_exception() arguments in rename(). 2014-06-07 09:59:01 +02:00
Matteo Scaramuccia
874db754ce MDL-29708 Fixed extra slashes in $string['storedfilenotcreated']. 2014-06-07 09:58:59 +02:00
sam marshall
7aa0860eca MDL-45574 Backup progress: Can time out with large number of files
When there are many files inside a single resource, it's possible
for the backup to time out because it does not report progress
while adding entries to the backup_ids table.
2014-06-06 10:44:19 +01:00
Jenny Gray
807c670765 MDL-45846 Libraries Reinstate custom user agent device detection 2014-06-06 10:04:27 +01:00
Frederic Massart
36cef83e08 MDL-45870 mod_assign: Outcomes are saved for each group member 2014-06-06 12:26:27 +08:00
Daniel Neis Araujo
877ce4a64d MDL-35648 (backport) adding missing distinct selector in sql on participation report 2014-06-05 20:45:12 -03:00
Nobelium
a5a3c48851 MDL-42835 mod_scorm: Close tree nodes using TreeView API 2014-06-05 22:30:29 +00:00