Eloy Lafuente (stronk7) [Tue, 18 Nov 2014 02:41:28 +0000 (03:41 +0100)]
Merge branch '48070-29' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Tue, 18 Nov 2014 00:34:29 +0000 (13:34 +1300)]
Merge branch 'MDL-47527_master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Mon, 17 Nov 2014 22:12:28 +0000 (11:12 +1300)]
Merge branch 'MDL-47618' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 17 Nov 2014 21:57:29 +0000 (10:57 +1300)]
Merge branch 'MDL-47777_master' of https://github.com/Syxton/moodle
Sam Hemelryk [Mon, 17 Nov 2014 21:48:31 +0000 (10:48 +1300)]
Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 17 Nov 2014 20:55:36 +0000 (09:55 +1300)]
MDL-48070 navbar: ensure navigation initialised
Dan Poltawski [Mon, 17 Nov 2014 16:48:27 +0000 (16:48 +0000)]
Merge branch 'MDL-30619_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 17 Nov 2014 16:42:34 +0000 (16:42 +0000)]
Merge branch 'MDL-48199-master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Mon, 17 Nov 2014 16:22:26 +0000 (16:22 +0000)]
Merge branch '48070-29' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 17 Nov 2014 15:39:48 +0000 (15:39 +0000)]
Merge branch 'MDL-47648' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 17 Nov 2014 15:33:45 +0000 (15:33 +0000)]
Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 17 Nov 2014 15:20:17 +0000 (15:20 +0000)]
Merge branch 'm29_MDL-48023_Theme_Setting_Files_Cacheable_By_Both_Browsers_And_Proxies' of https://github.com/scara/moodle
Dan Poltawski [Mon, 17 Nov 2014 15:12:56 +0000 (15:12 +0000)]
Merge branch 'MDL-48042_wip' of git://github.com/ppichet/moodle
Dan Poltawski [Mon, 17 Nov 2014 13:52:39 +0000 (13:52 +0000)]
Merge branch 'MDL-42756' of git://github.com/aolley/moodle
Dan Poltawski [Mon, 17 Nov 2014 13:30:57 +0000 (13:30 +0000)]
Merge branch 'wip-MDL-36240-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 17 Nov 2014 13:17:40 +0000 (13:17 +0000)]
Merge branch 'MDL-43987-master' of git://github.com/xow/moodle
Dan Poltawski [Mon, 17 Nov 2014 12:52:35 +0000 (12:52 +0000)]
Merge branch 'MDL-46640-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 17 Nov 2014 11:32:04 +0000 (11:32 +0000)]
Merge branch 'wip-mdl-48032-m' of git://github.com/rajeshtaneja/moodle
Andrew Nicols [Mon, 10 Nov 2014 06:56:25 +0000 (14:56 +0800)]
MDL-48150 mod_forum: Generate message inbound keys for all posts
This code was previously misplaced so that only posts in discussion which
had not yet been processed in the current cron run would have keys
generated. If two posts were generated in the same discussion and sent out
on the same cron cycle, only the first post to be processed would have a
key generated.
Mark Nelson [Mon, 10 Nov 2014 05:04:27 +0000 (21:04 -0800)]
MDL-30619 mod_data: fixed deletion of files on reset
Frederic Massart [Fri, 14 Nov 2014 09:23:00 +0000 (17:23 +0800)]
MDL-46640 navigation: Handle block contexts within a category
Sam Hemelryk [Mon, 17 Nov 2014 02:06:58 +0000 (15:06 +1300)]
MDL-48196 phpunit: fixed the fail after this change
John Okely [Tue, 11 Nov 2014 08:06:30 +0000 (16:06 +0800)]
MDL-43987 core: Remove port numbers in cleanremoteaddr
Sam Hemelryk [Mon, 17 Nov 2014 01:37:49 +0000 (14:37 +1300)]
Merge branch 'MDL-48115_master' of https://github.com/totara/openbadges
Adrian Greeve [Wed, 12 Nov 2014 05:58:08 +0000 (13:58 +0800)]
MDL-36240 backup: Activity calendar events backed up.
Activity calendar events can now be backed up and restored
when no user data is selected.
Sam Hemelryk [Mon, 17 Nov 2014 00:39:03 +0000 (13:39 +1300)]
Merge branch 'MDL-48194-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 17 Nov 2014 00:21:02 +0000 (13:21 +1300)]
Merge branch 'MDL-48171-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 16 Nov 2014 23:48:04 +0000 (12:48 +1300)]
Merge branch 'MDL-48179-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 16 Nov 2014 23:34:02 +0000 (12:34 +1300)]
Merge branch 'MDL-48196-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 16 Nov 2014 23:19:14 +0000 (12:19 +1300)]
Merge branch 'master_MDL-47993' of https://github.com/totara/moodle
Sam Hemelryk [Sun, 16 Nov 2014 22:44:57 +0000 (11:44 +1300)]
Merge branch 'MDL-43628' of https://github.com/scyrma/moodle
Sam Hemelryk [Sun, 16 Nov 2014 20:50:26 +0000 (09:50 +1300)]
Merge branch 'MDL-35638-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 16 Nov 2014 20:46:35 +0000 (09:46 +1300)]
Merge branch 'MDL-47590' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 16 Nov 2014 20:34:25 +0000 (09:34 +1300)]
Merge branch 'MDL-44657-master' of git://github.com/FMCorz/moodle
Matteo Scaramuccia [Sun, 9 Nov 2014 07:06:46 +0000 (08:06 +0100)]
MDL-48023 Files API: Theme files must be cache-able by shared proxies.
The profile image AKA user icon will be cache-able by shared proxies too,
under its specific accessibility constraints/conditions.
Pierre Pichet [Fri, 7 Nov 2014 14:54:43 +0000 (09:54 -0500)]
MDL-48042 Questions: Reset Calculated qtype comments on datasets
Reset back the modifications of Calculated qtype comments on datasets
done by MDL-47224
Signed-off-by: Pierre Pichet <pichet.pierre@uqam.ca>
Mary Evans [Fri, 14 Nov 2014 18:52:28 +0000 (18:52 +0000)]
MDL-48199 theme_bootstrapbase: Page padding left is wrong when in RTL
sam marshall [Tue, 11 Nov 2014 16:38:26 +0000 (16:38 +0000)]
MDL-48179 Backup progress: Can time out when compressing large backup
Tim Hunt [Tue, 11 Nov 2014 19:18:01 +0000 (19:18 +0000)]
MDL-47590 question backup: include response file only with userdata
Ankit Agarwal [Fri, 14 Nov 2014 07:55:04 +0000 (13:25 +0530)]
MDL-48171 gradebook: Use proper apis to get item name
Sam Hemelryk [Thu, 6 Nov 2014 01:03:38 +0000 (14:03 +1300)]
MDL-48070 navigation: optimised the login page
The navigation and settings no longer get initialised on the login
page by default, this is achieved by calling to ignore the active
page on the navbar.
It is safe because the login page is not represented in either the
navigation or the settings.
This change saves a few MB or ram and a couple of database queries
Oleg Demeshev [Mon, 3 Nov 2014 23:52:19 +0000 (12:52 +1300)]
MDL-47993 calendar: Fix ical import Microsoft calendar issue
Eloy Lafuente (stronk7) [Thu, 13 Nov 2014 11:14:36 +0000 (12:14 +0100)]
weekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 13 Nov 2014 10:55:15 +0000 (11:55 +0100)]
Merge branch 'MDL-48214-master-enfix' of git://github.com/mudrd8mz/moodle
Helen Foster [Thu, 13 Nov 2014 10:22:49 +0000 (11:22 +0100)]
MDL-48214 Merge English strings from the en_fix language pack
Paul Holden [Thu, 13 Nov 2014 08:20:16 +0000 (16:20 +0800)]
MDL-44657 forms: Form identifiers should only contain basic characters
Rajesh Taneja [Tue, 19 Aug 2014 06:01:18 +0000 (14:01 +0800)]
MDL-46865 report_log: Fixed showuser and showcourse in report log
Andrew Nicols [Wed, 12 Nov 2014 07:04:17 +0000 (15:04 +0800)]
MDL-48196 phpunit: Set e-mail address for admin user at installation
Eugene Venter [Wed, 12 Nov 2014 20:34:37 +0000 (09:34 +1300)]
MDL-48204 mod_wiki: admin.php - fix syntax error
Dan Poltawski [Wed, 12 Nov 2014 11:33:20 +0000 (11:33 +0000)]
weekly release 2.9dev
Dan Poltawski [Wed, 12 Nov 2014 11:22:45 +0000 (11:22 +0000)]
MDL-48174 tool_langimport: info about skipped update
So admins can work out why the task might not be having an effect.
Dan Poltawski [Wed, 12 Nov 2014 11:03:43 +0000 (11:03 +0000)]
Merge branch 'wip-mdl-48174' of https://github.com/rajeshtaneja/moodle
David Monllao [Wed, 12 Nov 2014 03:53:14 +0000 (11:53 +0800)]
MDL-30968 mod_forum: No picture link to group when no groups mode
Andrew Nicols [Wed, 12 Nov 2014 03:46:03 +0000 (11:46 +0800)]
MDL-48194 testing: Adjust naming of testsuites in phpunit.xml
This will make it easier to run phpunit for a specific component by making
all testsuite names consistent, guessable, and in-line with the naming of
the parameter (testsuite vs. test suite).
Adam Olley [Mon, 10 Nov 2014 00:04:21 +0000 (10:34 +1030)]
MDL-42756 dock: Trigger actionmenu enhance when showing dock panel
Additionally fixes the styling for the actionmenu icon size in
bootstrapbase'd themes.
Sam Hemelryk [Tue, 11 Nov 2014 23:33:25 +0000 (12:33 +1300)]
Merge branch 'MDL-47391_master' of github.com:ninelanterns/moodle
Sam Hemelryk [Tue, 11 Nov 2014 20:41:58 +0000 (09:41 +1300)]
Merge branch 'MDL-39692-master' of git://github.com/FMCorz/moodle
Yuliya Bozhko [Tue, 11 Nov 2014 20:25:58 +0000 (09:25 +1300)]
MDL-48115 badges: Fix strtoupper() output in badges
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
Sam Hemelryk [Tue, 11 Nov 2014 19:58:52 +0000 (08:58 +1300)]
Merge branch 'MDL-30968-master-forum-group-link' of https://github.com/amandadoughty/moodle
Dan Poltawski [Tue, 11 Nov 2014 19:23:51 +0000 (19:23 +0000)]
MDL-47502 statslib tests: improve test
While integrating I noticed some problems which already existed in this
test:
* The enrolment data generator was not used
* The student roleid was hardocded
* The role assignment was at site level..
Eugene Venter [Sun, 19 Oct 2014 21:50:58 +0000 (10:50 +1300)]
MDL-47502 test_statslib_cron_daily: fix provider
Fiddling with the database in the data provider causes "out of sync"
errors when running suite tests.
Dan Poltawski [Tue, 11 Nov 2014 19:05:45 +0000 (19:05 +0000)]
Merge branch 'MDL-47975-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 11 Nov 2014 18:59:55 +0000 (18:59 +0000)]
Merge branch 'MDL-48093-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Tue, 11 Nov 2014 18:48:39 +0000 (18:48 +0000)]
Merge branch 'MDL-48168' of git://github.com/timhunt/moodle
Tim Hunt [Fri, 10 Oct 2014 14:17:10 +0000 (15:17 +0100)]
MDL-47618 quiz statistics: fatal error with groups.
The problem was that the names of query placeholders were changing. The
fix was to do things ourself, rather than using get_in_or_equal.
Dan Poltawski [Tue, 11 Nov 2014 17:21:09 +0000 (17:21 +0000)]
Merge branch 'MDL-39376-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 11 Nov 2014 17:16:00 +0000 (17:16 +0000)]
Merge branch 'MDL-48156-master-pluginisenabled' of git://github.com/mudrd8mz/moodle
Tim Hunt [Tue, 11 Nov 2014 14:02:51 +0000 (14:02 +0000)]
MDL-47648 admin unit tests: fix file perms on mimetex.exe
This was causing the
core_admintree_testcase::test_admin_setting_configexecutable unit test
to fail.
Rajesh Taneja [Tue, 11 Nov 2014 08:42:52 +0000 (16:42 +0800)]
MDL-48174 core_lang: support for ->skiplangupgrade in lang cron task
Similar to upgrade_language_pack(), update_langpacks_task should
respect skiplangupgrade config. Also, this should be added to behat
whitelist, so it can be disabled during on-sync period, when lang
pack for master is not available.
Dan Poltawski [Tue, 11 Nov 2014 08:07:19 +0000 (08:07 +0000)]
Merge branch 'MDL-48144' of git://github.com/stronk7/moodle
Ankit Agarwal [Mon, 10 Nov 2014 09:30:36 +0000 (15:00 +0530)]
MDL-35638 backup: Do not print headers during redirects
Mathieu Petit-Clair [Mon, 10 Nov 2014 20:31:24 +0000 (15:31 -0500)]
MDL-43628 assign: make submissionagreement usable on multilingual sites
Tim Hunt [Mon, 10 Nov 2014 18:46:53 +0000 (18:46 +0000)]
MDL-48168 quiz editing: max grade should be editable after attempts
Note that there was a lot of legacy code left from Moodle 2.7 which is
no longer required, and I took this opportunity to delete it.
Eloy Lafuente (stronk7) [Mon, 10 Nov 2014 17:08:15 +0000 (18:08 +0100)]
MDL-48144 upgrade: add v2.8.0 sep lines
Paula Ardanza Menéndez [Mon, 10 Nov 2014 16:26:42 +0000 (11:26 -0500)]
MDL-47527 gradebook: Allow access to overview report
Eloy Lafuente (stronk7) [Mon, 10 Nov 2014 16:39:54 +0000 (17:39 +0100)]
Merge branch 'MDL-48143' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 10 Nov 2014 16:32:34 +0000 (17:32 +0100)]
MDL-48143 backup: Bump release to 2.9 dev branch
sam marshall [Thu, 6 Nov 2014 11:54:09 +0000 (11:54 +0000)]
MDL-48093 HTML 5 video: Firefox now supports .mp4
David Mudrák [Mon, 10 Nov 2014 10:09:25 +0000 (11:09 +0100)]
MDL-48156 task: Skip the scheduled task only for really disabled plugins
Darko Miletic [Tue, 28 May 2013 21:30:41 +0000 (18:30 -0300)]
MDL-39376 enrol: Optimized setting for ldap and database
Frederic Massart [Mon, 10 Nov 2014 04:59:59 +0000 (12:59 +0800)]
MDL-39692 grade: Little code clean up of letter boundary deletion
Huy Hoang [Mon, 10 Nov 2014 04:14:31 +0000 (12:14 +0800)]
MDL-39692 grade: Ability to delete letter boundary
James Ballard [Wed, 24 Sep 2014 03:02:56 +0000 (13:02 +1000)]
MDL-47391 Update pagelayout for default profile configuration
Eloy Lafuente (stronk7) [Sun, 9 Nov 2014 03:04:17 +0000 (04:04 +0100)]
weekly back-to-dev release 2.9dev
Eloy Lafuente (stronk7) [Sat, 8 Nov 2014 22:30:59 +0000 (23:30 +0100)]
Moodle release 2.8
Eloy Lafuente (stronk7) [Sat, 8 Nov 2014 22:30:53 +0000 (23:30 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
AMOS bot [Sat, 8 Nov 2014 16:05:33 +0000 (00:05 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Sat, 8 Nov 2014 10:19:59 +0000 (11:19 +0100)]
Merge branch 'MDL-48107_master' of https://github.com/markn86/moodle
Mark Nelson [Sat, 8 Nov 2014 07:50:20 +0000 (23:50 -0800)]
MDL-48107 tool_monitor: extended automated tests
Also adjusted them so they will pass with these changes.
Mark Nelson [Sat, 8 Nov 2014 06:50:53 +0000 (22:50 -0800)]
MDL-48107 tool_monitor: prevent site rule removal when deleting a course
Mark Nelson [Sat, 8 Nov 2014 05:39:55 +0000 (21:39 -0800)]
MDL-48107 tool_monitor: added total subs to the delete rule string
Also made some minor language string changes.
Eloy Lafuente (stronk7) [Fri, 7 Nov 2014 15:59:39 +0000 (16:59 +0100)]
Moodle release 2.8rc2
Damyon Wiese [Fri, 7 Nov 2014 09:37:10 +0000 (17:37 +0800)]
MDL-47900 Event monitor: Fix name of cache lang string for event monitor
AMOS BEGIN
MOV [cachedef_rules, tool_monitor],[cachedef_eventsubscriptions, tool_monitor]
AMOS END
Damyon Wiese [Fri, 7 Nov 2014 08:58:52 +0000 (16:58 +0800)]
Merge branch 'MDL-47900_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Fri, 7 Nov 2014 08:37:32 +0000 (09:37 +0100)]
Merge branch 'wip-mdl-48035' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Fri, 7 Nov 2014 08:08:20 +0000 (16:08 +0800)]
Merge branch 'MDL-46986-master' of https://github.com/lameze/moodle
Simey Lameze [Fri, 7 Nov 2014 07:54:14 +0000 (15:54 +0800)]
MDL-46986 mod_assign: Change the asserting to false
John Okely [Fri, 31 Oct 2014 05:36:52 +0000 (13:36 +0800)]
MDL-47949 mod_wiki: Validate parameters for page deletion
Marina Glancy [Fri, 7 Nov 2014 07:03:32 +0000 (15:03 +0800)]
Merge branch 'MDL-47869-master' of git://github.com/lameze/moodle
Rajesh Taneja [Fri, 7 Nov 2014 05:43:19 +0000 (13:43 +0800)]
MDL-48035 mod_forum: Reverted string change in step to keep correct functionality