Commit graph

67179 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
acfc4c0b4d Merge branch 'MDL-42953-26' of git://github.com/phalacee/moodle into MOODLE_26_STABLE 2014-06-03 12:11:52 +02:00
Damyon Wiese
65f3549893 Merge branch 'MDL-45592_26' of git://github.com/grabs/moodle into MOODLE_26_STABLE 2014-06-03 16:22:07 +08:00
Damyon Wiese
50df05ef78 Merge branch 'm26_MDL-44098' of git://github.com/greg-or/moodle-mod_assign into MOODLE_26_STABLE 2014-06-03 13:10:16 +08:00
Damyon Wiese
322a1fa453 Merge branch 'MDL-45781_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-06-03 11:58:52 +08:00
Jetha Chan
15601a33d9 MDL-42782 usability: fix for extreme course page indenting 2014-06-03 11:16:36 +08:00
Sam Hemelryk
42a1546bf8 Merge branch 'MDL-18162-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-06-03 15:00:31 +12:00
Eric Merrill
0babaf208d MDL-45714 backup: Less aggressive removal of old backup dirs
The old 4 hour standard was too aggressive and can cause backup files
to be removed while they were still in use. Now the same as cron,
1 week.
2014-06-02 21:50:54 -04:00
Eloy Lafuente (stronk7)
9514d99333 Merge branch 'm26_MDL-45726' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-06-03 02:20:02 +02:00
Sam Hemelryk
b51ee5ac52 Merge branch 'MDL-33763-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE 2014-06-03 08:57:35 +12:00
Eric Merrill
2f4815a05b MDL-45763 question Random qtype should use '0' or '1' question text.
Some time ago, it when from using '0' for no-subcategories to blank.
Change to properly define '0' or '1', update old questions, and make
sure to fix newly restored questions.

Conflicts:
	mod/quiz/editlib.php
	question/type/random/version.php
2014-06-02 15:35:40 -04:00
Albert Gasset
1a997d4b11 MDL-35514 mod_forum: Fixed warning message to students in forums with groups 2014-06-02 18:25:40 +02:00
Tim Hunt
d03434111a MDL-45781 quiz autosave: detect and report when the session is lost.
and also other errors.
2014-05-30 16:30:16 +01:00
AMOS bot
888d681014 Automatically generated installer lang files 2014-05-30 01:24:34 +00:00
AMOS bot
2dbb5e22f7 Automatically generated installer lang files 2014-05-30 01:24:34 +00:00
Ciaran Irvine
49c4454cec MDL-45726 SCORM: Correct check for forcenewattempt 2014-05-30 09:49:18 +12:00
Sam Hemelryk
19a43c48bf MDL-45333 output: navbar is now wrapped in a <nav> tag 2014-05-30 08:41:39 +12:00
Andreas Grabs
4532c861e1 MDL-45592 mod_feedback - unwanted linebreak after import or duplicating a feedback 2014-05-29 17:15:48 +02:00
Eloy Lafuente (stronk7)
1132d30d1f weekly release 2.6.3+ 2014-05-29 12:51:33 +02:00
Eloy Lafuente (stronk7)
6e415f6a59 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-05-29 12:51:28 +02:00
Damyon Wiese
a42f023698 MDL-45654 Cron: Fix for unit test that was causing integer overflow in 32 bit php 2014-05-29 16:30:06 +12:00
Sam Hemelryk
18c31e25b6 Merge branch 'wip-mdl-45698-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE 2014-05-29 14:28:07 +12:00
Rajesh Taneja
6a46c626d6 MDL-45698 behat: Fixed behat and symfony versions 2014-05-29 09:49:20 +08:00
Sam Hemelryk
321a4a90ab MDL-45654 cron: fixed dataprovider timestamp issue 2014-05-29 11:21:05 +12:00
Sam Hemelryk
bc389ac7c8 Merge branch 'wip-mdl-45565-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE 2014-05-29 08:12:37 +12:00
Andrew Nicols
54c9783e5c MDL-45560 report_log: Close sessions before download only
If the session is closed too early, then preferences made in the body of
the page will not be saved to the session.
2014-05-29 01:02:25 +08:00
Andrew Nicols
646021e728 MDL-18162 mod_forum: Correct phpdoc for forum_clean_search_terms 2014-05-28 09:36:02 +08:00
Dan Poltawski
56f23662b1 Merge branch 'MDL-45544-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-05-27 07:50:03 +01:00
David Monllao
e002c90dab MDL-44620 behat: Automate MDLQA-7
- MDLQA-7: By default, a new course contains a Latest
News block which displays a specific number of recent
discussions from the news forum
2014-05-27 13:13:48 +07:00
David Monllao
94ba162660 MDL-44620 behat: Automates MDLQA-6
- MDLQA-6: By default, a new course contains a news
forum in which only teachers can post and subscription
is forced
2014-05-27 13:13:48 +07:00
Rajesh Taneja
b24571ea7d MDL-45565 phpunit: Changed testsuite_name, so as to avoid class collision 2014-05-27 09:50:21 +08:00
Rajesh Taneja
d160b700e8 MDL-45565 core_message: Reset internal users in phpunit 2014-05-27 09:50:21 +08:00
Gregory Faller
33f29f5adc MDL-44098: Late submissions with extension calculate period of lateness incorrectly 2014-05-27 11:08:29 +09:30
Dan Poltawski
c5549ab475 Merge branch 'MDL-45676_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE 2014-05-26 12:02:43 +01:00
Dan Poltawski
1ec46dca1d Merge branch 'MDL-45675_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE 2014-05-26 11:59:26 +01:00
Marina Glancy
a8b6eaa3c4 Merge branch 'MDL-45661-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-05-26 14:46:55 +08:00
Marina Glancy
25f6bc111d Merge branch 'MDL-44482-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-05-26 14:46:47 +08:00
Simey Lameze
7874aa6eb7 MDL-45544 events: Add event user_profile_viewed trigger to user/profile.php 2014-05-26 14:10:59 +08:00
Jetha Chan
addeb650b9 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:01:05 +08:00
Damyon Wiese
c3131a4ac2 Merge branch 'wip-MDL-45688-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-05-26 12:48:33 +08:00
Damyon Wiese
d60e4f6684 MDL-45661 Assign: Clean bad data from DB after MDL-42526
Conflicts:
	mod/assign/db/upgrade.php
	mod/assign/version.php
2014-05-26 12:37:19 +08:00
Damyon Wiese
cd2297972b Merge branch '45499-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-05-26 12:13:02 +08:00
Marina Glancy
7c399a1ba0 Merge branch 'MDL-44014-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-05-26 11:59:47 +08:00
Ankit Agarwal
1b308f725a MDL-33763 notes: Fix issue with incorrect node highlighting in the nav tree 2014-05-26 10:41:51 +08:00
Mark Nelson
47235557d2 MDL-45675 mod_data: initialise options as an empty array to avoid error when there are none 2014-05-25 19:29:39 -07:00
Sam Hemelryk
5abf0019f5 Merge branch 'MDL-45650_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE 2014-05-26 13:59:14 +12:00
Sam Hemelryk
7ec197fd64 Merge branch 'MDL-45192_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-05-26 13:23:06 +12:00
Sam Hemelryk
967d16dd52 Merge branch 'MDL-45660_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-05-26 11:52:35 +12:00
Sam Hemelryk
5b4b64fc58 Merge branch 'MDL-45686_26' of git://github.com/jmvedrine/moodle into MOODLE_26_STABLE 2014-05-26 10:55:14 +12:00
Sam Hemelryk
362598367c Merge branch 'MDL-45635-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
Conflicts:
	lib/yui/src/notification/js/confirm.js
2014-05-26 10:38:22 +12:00
Sam Hemelryk
43b611f566 Merge branch 'm26_MDL-45623' of git://github.com/totara/moodle into MOODLE_26_STABLE 2014-05-26 09:58:59 +12:00