Rajesh Taneja [Fri, 21 Nov 2014 02:39:42 +0000 (10:39 +0800)]
MDL-48302 behat: Reverted temp fix added by MDL-48251
Rajesh Taneja [Thu, 20 Nov 2014 07:42:32 +0000 (15:42 +0800)]
MDL-48302 behat: Reset all data, before starting behat suite
Rajesh Taneja [Thu, 20 Nov 2014 07:39:39 +0000 (15:39 +0800)]
MDL-48302 behat: Make sure to clear php file cache
Rajesh Taneja [Thu, 20 Nov 2014 07:37:10 +0000 (15:37 +0800)]
MDL-48302 behat: Reset cache before scenario
Dan Poltawski [Thu, 20 Nov 2014 08:38:12 +0000 (08:38 +0000)]
weekly release 2.9dev
Dan Poltawski [Thu, 20 Nov 2014 08:38:09 +0000 (08:38 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 20 Nov 2014 07:03:48 +0000 (07:03 +0000)]
Revert "MDL-46531 Make atto foreground colors and background colors configurable"
This reverts commit
cb6e1d527093bb955946498850ef8a51276a13a4.
This reverts commit
7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to
7b9fb265d20e53580a64dcd2be8546ff5b49bd26.
This reverts commit
06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to
0f87473fed2da15a8ba72ac9a578734fe2548f10.
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Thu, 20 Nov 2014 03:47:33 +0000 (16:47 +1300)]
NOBUG: fixed commit message typo
Andrew Nicols [Thu, 20 Nov 2014 02:46:04 +0000 (10:46 +0800)]
MDL-46531 editor_atto: fontcolor -> backcolor
Sam Hemelryk [Wed, 19 Nov 2014 21:18:09 +0000 (10:18 +1300)]
MDL-43628 mod_assign: fixed formatting of statement
Eloy Lafuente (stronk7) [Wed, 19 Nov 2014 20:18:37 +0000 (21:18 +0100)]
Merge branch '48206-29' of git://github.com/samhemelryk/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Wed, 19 Nov 2014 20:12:14 +0000 (09:12 +1300)]
Merge branch 'MDL-46531-fixes' of git://github.com/andrewnicols/moodle
Rajesh Taneja [Wed, 19 Nov 2014 08:23:58 +0000 (16:23 +0800)]
MDL-48251 behat: Shuffling activity creation fix quiz behat
Dan Poltawski [Wed, 19 Nov 2014 11:37:35 +0000 (11:37 +0000)]
MDL-29585 wiki: fix unit test fails
Dan Poltawski [Wed, 19 Nov 2014 10:29:10 +0000 (10:29 +0000)]
Merge branch 'MDL-29585-master-fixup' of https://github.com/FMCorz/moodle
Frederic Massart [Wed, 19 Nov 2014 09:24:38 +0000 (17:24 +0800)]
MDL-29585 mod_wiki: Prevent broken links in editable sections
When a section name ended with a URL, the '<a' part of [edit] link
that is appended to the section was considered as part of the URL
in the section, thus causing the [edit] link to be broken.
Andrew Nicols [Wed, 19 Nov 2014 06:42:02 +0000 (14:42 +0800)]
MDL-46531 editor_atto: Handle a null selection better on colour change
Sadly, there is no easy way to do this. When a range is empty, we need to
create a new span, make the changes there, and then select it. Rangy does
not provide a helper to do this yet (will be in 1.3) so we have to do it
manually in the mean time.
Dan Poltawski [Wed, 19 Nov 2014 06:39:35 +0000 (06:39 +0000)]
Merge branch 'wip-mdl-46865' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 19 Nov 2014 02:17:32 +0000 (10:17 +0800)]
MDL-46865 report_log: Fixed site name in behat step
Sam Hemelryk [Tue, 18 Nov 2014 20:38:55 +0000 (09:38 +1300)]
MDL-33606 event: moved upgrade notice
Sam Hemelryk [Tue, 18 Nov 2014 20:37:19 +0000 (09:37 +1300)]
Merge branch 'MDL-33606_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 18 Nov 2014 20:18:36 +0000 (09:18 +1300)]
Merge branch 'MDL-47587' of git://github.com/jmvedrine/moodle
Mary Evans [Tue, 28 Oct 2014 18:30:54 +0000 (18:30 +0000)]
MDL-47915 theme: use id='page-content' rather than 'content'.
Also added JS fallback for themes using copied layouts in scorm
Gilles-Philippe Leblanc [Fri, 3 Oct 2014 15:09:46 +0000 (11:09 -0400)]
MDL-47501 gradebook: Add an indication that the grade letters was overridden
Helen Foster [Tue, 18 Nov 2014 16:30:40 +0000 (16:30 +0000)]
MDL-47800 admin: improved strings
Dan Poltawski [Tue, 18 Nov 2014 16:32:57 +0000 (16:32 +0000)]
Merge branch 'wip_MDL-47800_m28_pwchange2' of git://github.com/skodak/moodle
AMOS bot [Tue, 18 Nov 2014 16:05:38 +0000 (00:05 +0800)]
Automatically generated installer lang files
Dan Poltawski [Tue, 18 Nov 2014 13:54:05 +0000 (13:54 +0000)]
Merge branch 'MDL36874_Text_navigation_for_Books' of git://github.com/Dave-B/moodle
Conflicts:
mod/book/version.php
mod/book/db/upgrade.php
Dan Poltawski [Tue, 18 Nov 2014 13:22:41 +0000 (13:22 +0000)]
Merge branch '47434-29-1' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 18 Nov 2014 13:10:57 +0000 (13:10 +0000)]
Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 18 Nov 2014 12:04:48 +0000 (12:04 +0000)]
Merge branch 'MDL-48146' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 18 Nov 2014 10:15:06 +0000 (10:15 +0000)]
Merge branch 'wip_MDL-47803_m28_usersessions2' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 18 Nov 2014 10:04:33 +0000 (10:04 +0000)]
Merge branch 'MDL-47700-master' of git://github.com/xow/moodle
Jean-Michel Vedrine [Tue, 21 Oct 2014 16:30:37 +0000 (18:30 +0200)]
MDL-47587 Lesson: Display progress bar on the end of lesson page
Sam Hemelryk [Tue, 18 Nov 2014 04:37:57 +0000 (17:37 +1300)]
Merge branch 'wip-mdl-48250' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 18 Nov 2014 03:48:27 +0000 (16:48 +1300)]
Merge branch 'wip-MDL-43205-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 18 Nov 2014 03:47:24 +0000 (16:47 +1300)]
Merge branch 'MDL-29585-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 18 Nov 2014 02:41:28 +0000 (03:41 +0100)]
Merge branch '48070-29' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 17 Nov 2014 20:48:17 +0000 (09:48 +1300)]
MDL-47803 Add report that lists user sessions
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
Petr Skoda [Wed, 22 Oct 2014 01:11:11 +0000 (14:11 +1300)]
MDL-47800 auth: Add option to logout on pw change
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.
David Monllao [Tue, 11 Nov 2014 06:51:10 +0000 (14:51 +0800)]
MDL-33606 course: Adding section info to course_viewed log
Also changing references to section id to
section number, that it is what it really is.
Rajesh Taneja [Mon, 17 Nov 2014 06:40:46 +0000 (14:40 +0800)]
MDL-48250 enrol_ldap: set default category
As in other enrol plugins (database), set default
category to 1 (pointing to Miscellaneous)
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
Frederic Massart [Tue, 11 Nov 2014 08:13:56 +0000 (16:13 +0800)]
MDL-29585 mod_wiki: Handle special characters in headings/sections
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 [Wed, 12 Nov 2014 22:53:43 +0000 (11:53 +1300)]
MDL-48206 block_comments: textarea width 100%
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
Sam Hemelryk [Mon, 10 Nov 2014 22:07:37 +0000 (11:07 +1300)]
MDL-47434 format_topics: section 0 navigation tweak
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
Sam Hemelryk [Mon, 10 Nov 2014 22:07:37 +0000 (11:07 +1300)]
MDL-47434 format_weeks: section 0 navigation tweak
Section 0 is now only shown in the navigation block if it contains
activities.
If there are no activities then the section is removed.
This mimicks the display on the course page.
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
John Okely [Thu, 13 Nov 2014 06:26:31 +0000 (14:26 +0800)]
MDL-47700 Grades: Fix incorrect config for overview report showrank
Tim Lock [Wed, 15 Oct 2014 22:04:53 +0000 (08:34 +1030)]
MDL-47700 Grades: Sitewide overview report isn't visible in some cases
Showing a overview report rank sitewide isn't visible to student in same cases
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
Tim Hunt [Mon, 10 Nov 2014 17:34:22 +0000 (17:34 +0000)]
MDL-48146 quiz settings: fix non-percent feedback boundaries
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