Adrian Greeve [Fri, 14 Aug 2015 01:25:32 +0000 (09:25 +0800)]
MDL-27177 roles: Update to behat full profile tests.
Adrian Greeve [Wed, 10 Jun 2015 08:32:13 +0000 (16:32 +0800)]
MDL-27177 roles: Unit test for newly created function.
Adrian Greeve [Wed, 10 Jun 2015 06:40:26 +0000 (14:40 +0800)]
MDL-27177 roles: Allow students to see co-students profiles.
If the student shares a course with another student then let them
see the same detail on the full profile page as they do on the
course profile page.
Dan Poltawski [Thu, 20 Aug 2015 13:24:28 +0000 (14:24 +0100)]
weekly release 3.0dev
David Monllao [Thu, 20 Aug 2015 07:41:07 +0000 (15:41 +0800)]
Merge branch 'wip-mdl-42634' of git://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 20 Aug 2015 07:37:13 +0000 (15:37 +0800)]
Merge branch 'MDL-50801_master-unexisting-caption' of git://github.com/dmonllao/moodle
David Monllao [Thu, 20 Aug 2015 07:25:44 +0000 (15:25 +0800)]
MDL-50801 atto_table: Caption node might not be present
Users may not use atto table (which always adds a caption) to set
HTML tables, this patch addresses that case.
Andrew Nicols [Thu, 20 Aug 2015 07:15:00 +0000 (15:15 +0800)]
MDL-42634 theme: Increase margin on activity instance to not cover controls
David Monllao [Thu, 20 Aug 2015 04:56:11 +0000 (12:56 +0800)]
MDL-49280 auth: Rewording duplicate emails setting
From allowuserstoshareemailaddresses to allowaccountssameemail, also
changing lang strings.
Damyon Wiese [Wed, 22 Jul 2015 05:02:01 +0000 (13:02 +0800)]
MDL-50150 Mustache: Update to 2.9.0 version of mustache.php
And enable the BLOCKS pragma (we need it for reusable templates).
Damyon Wiese [Thu, 7 May 2015 08:13:22 +0000 (16:13 +0800)]
MDL-50150 Mustache: Add "BLOCKS" feature to javascript mustache engine.
Pull request: https://github.com/janl/mustache.js/pull/473
David Monllao [Thu, 20 Aug 2015 02:31:20 +0000 (10:31 +0800)]
Merge branch 'MDL-50880-master' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 20 Aug 2015 01:49:22 +0000 (09:49 +0800)]
MDL-50391 mod_lti: Fixing indentation
Eloy Lafuente (stronk7) [Wed, 19 Aug 2015 17:14:00 +0000 (19:14 +0200)]
Merge branch 'MDL-50801_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Wed, 19 Aug 2015 02:00:13 +0000 (10:00 +0800)]
MDL-42634 theme: Increase margin on sectionname to not cover controls
Eloy Lafuente (stronk7) [Tue, 18 Aug 2015 23:04:23 +0000 (01:04 +0200)]
Merge branch 'MDL-49085_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 18 Aug 2015 22:59:42 +0000 (00:59 +0200)]
Merge branch 'MDL-46078-master' of git://github.com/damyon/moodle
Barry Oosthuizen [Fri, 14 Aug 2015 12:36:50 +0000 (13:36 +0100)]
MDL-41944 block_onlines_users: Add unit tests
Barry Oosthuizen [Fri, 14 Aug 2015 12:36:16 +0000 (13:36 +0100)]
MDL-41944 block_onlines_users: Improve performance
Dan Poltawski [Tue, 18 Aug 2015 13:37:33 +0000 (14:37 +0100)]
Merge branch 'wip-MDL-49746-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 18 Aug 2015 12:20:01 +0000 (13:20 +0100)]
Merge branch 'wip-MDL-30315-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 18 Aug 2015 11:19:41 +0000 (13:19 +0200)]
Merge branch 'MDL-47449-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 18 Aug 2015 11:31:56 +0000 (12:31 +0100)]
MDL-46387 shifter: missing built changes
Dan Poltawski [Tue, 18 Aug 2015 11:22:15 +0000 (12:22 +0100)]
Merge branch 'MDL-46387-master' of https://github.com/dthies/moodle
Dan Poltawski [Tue, 18 Aug 2015 10:02:59 +0000 (11:02 +0100)]
Merge branch 'MDL-49841-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 18 Aug 2015 08:54:05 +0000 (09:54 +0100)]
Merge branch 'MDL-50127-master-squashed' of git://github.com/xow/moodle
Dan Poltawski [Tue, 18 Aug 2015 08:29:19 +0000 (09:29 +0100)]
Merge branch 'MDL-33365-master-3' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 18 Aug 2015 08:28:06 +0000 (09:28 +0100)]
Merge branch 'MDL-46167-master' of https://github.com/mackensen/moodle
David Monllao [Tue, 18 Aug 2015 04:09:49 +0000 (12:09 +0800)]
Merge branch 'MDL-50391-master' of git://github.com/aspark21/moodle
David Monllao [Tue, 18 Aug 2015 02:18:28 +0000 (10:18 +0800)]
Merge branch 'MDL-51102-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 19 Aug 2015 08:01:42 +0000 (16:01 +0800)]
MDL-50880 message: correctly compare with empty string
Thanks to David Herney Bernal for providing a fix
David Monllao [Thu, 9 Jul 2015 02:06:35 +0000 (12:06 +1000)]
MDL-50801 atto_table: Allow caption position to be set
Adrian Greeve [Tue, 18 Aug 2015 07:22:41 +0000 (15:22 +0800)]
MDL-30315 grades: Fix up function doc block.
This was annoying me no end so here is a commit
to set it right.
Adrian Greeve [Tue, 18 Aug 2015 03:28:24 +0000 (11:28 +0800)]
MDL-30315 grades: Unit tests for grade import.
Adrian Greeve [Fri, 5 Jun 2015 02:49:26 +0000 (10:49 +0800)]
MDL-30315 gradebook: Uploading feedback doesn't override grades.
Andrew Nicols [Fri, 24 Jul 2015 01:09:18 +0000 (09:09 +0800)]
MDL-33365 core: Move JS output to body
It turns out that, after all these years, we've been doing it wrong.
The YUI Loader should be loaded at the top of the body, not in the head.
Having it in the head means that the body has not yet loaded, and we see
a number of minor issues for scripts which happen very early in the load
process. One of these is the creation of invalid HTML from the YUI loader
because it is not able to insert in the body as it has not yet been
created.
To be safe, we must move all JS to the same point (because of unknown
dependencies between them). These should be placed as early in the body as
possible.
We also change the way in which the legacy YUI css modules are loaded.
David Monllao [Wed, 22 Jul 2015 18:29:48 +0000 (20:29 +0200)]
MDL-49085 block_tag_youtube: Using Youtube data api v3
Marina Glancy [Tue, 18 Aug 2015 01:24:45 +0000 (09:24 +0800)]
MDL-50683 user: add default choice
David Monllao [Tue, 18 Aug 2015 01:47:38 +0000 (09:47 +0800)]
Merge branch 'MDL-50990_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/base/style/blocks.css
Dan Poltawski [Mon, 17 Aug 2015 14:17:11 +0000 (15:17 +0100)]
Merge branch 'MDL-49891-master-2' of git://github.com/xow/moodle
Dan Poltawski [Mon, 17 Aug 2015 14:03:59 +0000 (15:03 +0100)]
Merge branch 'MDL-49280-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 17 Aug 2015 13:24:57 +0000 (14:24 +0100)]
Merge branch 'MDL-44828-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 17 Aug 2015 10:44:57 +0000 (11:44 +0100)]
Merge branch 'MDL-42634-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 17 Aug 2015 07:06:15 +0000 (15:06 +0800)]
Merge branch 'wip-MDL-50303-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 17 Aug 2015 06:56:14 +0000 (14:56 +0800)]
Merge branch 'wip-MDL-50962-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 17 Aug 2015 06:21:00 +0000 (14:21 +0800)]
Merge branch 'MDL-51016-m' of git://github.com/micaherne/moodle
David Monllao [Mon, 17 Aug 2015 05:56:18 +0000 (13:56 +0800)]
Merge branch 'MDL-50637' of git://github.com/sk-unikent/moodle
David Monllao [Mon, 17 Aug 2015 04:06:47 +0000 (12:06 +0800)]
Merge branch 'wip-MDL-51095-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 17 Aug 2015 04:03:23 +0000 (12:03 +0800)]
Merge branch 'wip-MDL-50881-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 17 Aug 2015 03:58:28 +0000 (11:58 +0800)]
Merge branch 'MDL-50911_master' of git://github.com/StudiUM/moodle
David Monllao [Mon, 17 Aug 2015 03:43:42 +0000 (11:43 +0800)]
Merge branch 'wip-MDL-50932-master' of git://github.com/marinaglancy/moodle
Bruce Silver [Mon, 17 Aug 2015 02:30:47 +0000 (10:30 +0800)]
MDL-50962 user: Profile fields display properly
The department and idnumber fields were not displaying
properly on the user profile pages.
David Monllao [Mon, 17 Aug 2015 01:53:21 +0000 (09:53 +0800)]
Merge branch 'MDL-51057-M30' of git://github.com/lazydaisy/moodle
David Monllao [Mon, 17 Aug 2015 01:44:53 +0000 (09:44 +0800)]
Merge branch 'MDL-51077-master' of git://github.com/sammarshallou/moodle
David Monllao [Mon, 17 Aug 2015 01:24:55 +0000 (09:24 +0800)]
Merge branch 'MDL-51088-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 17 Aug 2015 01:01:45 +0000 (09:01 +0800)]
Merge branch 'wip-mdl-51106' of git://github.com/rajeshtaneja/moodle
David Monllao [Mon, 17 Aug 2015 00:50:49 +0000 (08:50 +0800)]
Merge branch 'MDL-51100-master' of git://github.com/andrewnicols/moodle
Daniel Thies [Sun, 16 Aug 2015 20:10:02 +0000 (15:10 -0500)]
MDL-46387 editor_atto: Add behat test for sub/sup
sam marshall [Tue, 11 Aug 2015 13:36:07 +0000 (14:36 +0100)]
MDL-51077 Availability: Date restriction unit test static not cleared
John Okely [Tue, 11 Aug 2015 04:04:07 +0000 (12:04 +0800)]
MDL-49891 theme_bootstrapbase: Add meta data description to frontpage
Frederic Massart [Fri, 8 May 2015 07:56:38 +0000 (15:56 +0800)]
MDL-50127 mod_data: RTL styles for the required image
John Okely [Wed, 6 May 2015 08:51:12 +0000 (16:51 +0800)]
MDL-50127 mod_data: Fix required icons in add entry screen
Andrew Nicols [Fri, 6 Mar 2015 02:12:19 +0000 (10:12 +0800)]
MDL-47449 completion: Ignore timemodified when comparing
Andrew Nicols [Fri, 6 Mar 2015 02:32:26 +0000 (10:32 +0800)]
MDL-47449 phpunit: Add comparitor for isEqual with exceptions
We often do isEqual tests but where a field, may have a single exception.
Ordinarily we can handle this easily by breaking the test down, but when
dealing with mocked objects we can only pass an instance of a
PHPUnit_Framework_Constraint, or a single value (which is cast to an
instance of PHPUnit_Framework_Constraint_IsEqual).
To deal with instances of time-based exception, we need to be able to
compare simple objects and classes where one or two values may be
different.
Andrew Nicols [Tue, 14 Apr 2015 03:23:05 +0000 (11:23 +0800)]
MDL-49841 testing: Correct composer incantation
Jun Pataleta [Thu, 13 Aug 2015 09:35:06 +0000 (17:35 +0800)]
MDL-44828 filelib: Fix open error for force-downloaded files in mobile
Allow guessing of file's MIME type by default. Fallback to
application/octet-stream if MIME type cannot be determined.
Rajesh Taneja [Thu, 13 Aug 2015 06:31:37 +0000 (14:31 +0800)]
MDL-51100 behat: Remove javascript tag from usermenu steps
Andrew Nicols [Thu, 13 Aug 2015 05:12:24 +0000 (13:12 +0800)]
MDL-51100 behat: Remove javascript tag from usermenu steps
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.
Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
Andrew Nicols [Wed, 12 Aug 2015 11:35:09 +0000 (19:35 +0800)]
MDL-51088 mod_forum: Improve mod_forum behat performance
Andrew Nicols [Wed, 12 Aug 2015 11:34:49 +0000 (19:34 +0800)]
MDL-51088 completion: Do not require hover to confirm xpath
lazydaisy [Tue, 11 Aug 2015 12:10:51 +0000 (13:10 +0100)]
MDL-50990 theme_base: Fixed errors in CSS mark-up in style/blocks.css
lazydaisy [Wed, 12 Aug 2015 16:22:16 +0000 (17:22 +0100)]
MDL-51057 theme_base: RTL fix adds missing padding to block header h2.
Daniel Thies [Wed, 5 Aug 2015 11:56:47 +0000 (06:56 -0500)]
MDL-46387 editor-atto: Toggle sub/sup tags using rangy
In order to have a consistant browser behavior and prevent nesting of
subscripts and superscripts, tags are converted to CSS classes and then
the CSS classes in the selection are toggeled using the rangy crossbrowser
selection library already included in Atto without using an execCommand.
Alistair Spark [Tue, 11 Aug 2015 09:13:48 +0000 (10:13 +0100)]
MDL-50391 format_singleactivity: fix LTI Tool opens in existing window
Marina Glancy [Thu, 30 Jul 2015 03:16:31 +0000 (11:16 +0800)]
MDL-50391 format_singleactivity: fix activity_has_subtypes()
Dan Poltawski [Thu, 13 Aug 2015 12:12:52 +0000 (13:12 +0100)]
MDL-51110 badges: prevent duplicate award of badges
Previously duplicate users could be returned when they had
done duplicate badge criteria - this would lead to a duplicate
constraint being hit as they were attempted to be awarded twice.
Eloy Lafuente (stronk7) [Thu, 13 Aug 2015 10:16:31 +0000 (12:16 +0200)]
weekly release 3.0dev
Eloy Lafuente (stronk7) [Thu, 13 Aug 2015 10:16:24 +0000 (12:16 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Thu, 13 Aug 2015 07:56:22 +0000 (15:56 +0800)]
MDL-51102 behat: Add a non-JS version of wait
Rajesh Taneja [Thu, 13 Aug 2015 05:22:22 +0000 (13:22 +0800)]
MDL-51106 behat: Fixed misuse of javascript tag
Andrew Nicols [Thu, 13 Aug 2015 05:12:24 +0000 (13:12 +0800)]
MDL-51100 behat: Remove javascript tag where not required
These tests only needed the javascript tag because of the user menu.
Now that issue has been resolved, they do not need it.
Note: Some were also not using the singleselect feature, so would fail
without changes to use this too as they were not handling proper selection
of the singleselect element.
Marina Glancy [Thu, 13 Aug 2015 04:28:55 +0000 (12:28 +0800)]
MDL-51095 enrol_meta: add missing include
Thanks to Shaun Meyer for providing a patch
Marina Glancy [Wed, 12 Aug 2015 02:44:38 +0000 (10:44 +0800)]
MDL-50303 cache: removed unused cache definition
Andrew Nicols [Thu, 13 Aug 2015 00:35:17 +0000 (08:35 +0800)]
MDL-51100 behat: Correct javascript requirement of user menu step
Eloy Lafuente (stronk7) [Wed, 12 Aug 2015 22:38:41 +0000 (00:38 +0200)]
Merge branch 'MDL-50371' of https://github.com/danielneis/moodle
AMOS bot [Wed, 12 Aug 2015 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files
AMOS bot [Wed, 12 Aug 2015 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files
David Monllao [Wed, 12 Aug 2015 02:45:29 +0000 (10:45 +0800)]
Merge branch 'MDL-46860-master' of git://github.com/ryanwyllie/moodle
David Monllao [Wed, 12 Aug 2015 01:35:46 +0000 (09:35 +0800)]
Merge branch 'MDL-37864-master' of git://github.com/xow/moodle
David Monllao [Wed, 12 Aug 2015 00:49:14 +0000 (08:49 +0800)]
Merge branch 'MDL-46321-master' of git://github.com/tonyjbutler/moodle
David Monllao [Wed, 12 Aug 2015 00:39:07 +0000 (08:39 +0800)]
MDL-50839 user: realuseravatar should also read avatarsize
David Monllao [Wed, 12 Aug 2015 00:32:11 +0000 (08:32 +0800)]
Merge branch 'MDL-50839-master' of git://github.com/Dave-B/moodle
David Monllao [Wed, 12 Aug 2015 00:30:03 +0000 (08:30 +0800)]
Merge branch 'MDL-50947_master' of git://github.com/moodlerooms/moodle
David Monllao [Wed, 12 Aug 2015 00:27:09 +0000 (08:27 +0800)]
Merge branch 'MDL-50720' of git://github.com/bostelm/moodle
David Monllao [Wed, 12 Aug 2015 00:23:29 +0000 (08:23 +0800)]
Merge branch 'MDL-51053-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 11 Aug 2015 23:06:43 +0000 (01:06 +0200)]
Merge branch 'MDL-50062-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 11 Aug 2015 22:48:07 +0000 (00:48 +0200)]
Merge branch 'MDL-50430' of https://github.com/danielneis/moodle
Eloy Lafuente (stronk7) [Tue, 11 Aug 2015 22:11:42 +0000 (00:11 +0200)]
Merge branch 'MDL-50446-master' of git://github.com/ryanwyllie/moodle
Eloy Lafuente (stronk7) [Tue, 11 Aug 2015 21:44:50 +0000 (23:44 +0200)]
Merge branch 'MDL-50307-master-3' of git://github.com/xow/moodle
Eloy Lafuente (stronk7) [Tue, 11 Aug 2015 20:58:09 +0000 (22:58 +0200)]
Merge branch 'MDL-49293-master' of git://github.com/andrewnicols/moodle