Dan Poltawski [Wed, 16 Apr 2014 05:00:46 +0000 (13:00 +0800)]
Merge branch 'MDL-45089_chat' of https://github.com/andyjdavis/moodle
Marina Glancy [Wed, 16 Apr 2014 03:51:57 +0000 (11:51 +0800)]
Merge branch 'MDL-45081-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 16 Apr 2014 03:33:14 +0000 (11:33 +0800)]
Merge branch 'MDL-44295' of https://github.com/scyrma/moodle
Damyon Wiese [Wed, 16 Apr 2014 03:12:36 +0000 (11:12 +0800)]
Merge branch 'MDL-43277-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Wed, 16 Apr 2014 02:57:46 +0000 (10:57 +0800)]
Merge branch 'MDL-45062' of git://github.com/jleyva/moodle
Damyon Wiese [Wed, 16 Apr 2014 02:55:58 +0000 (10:55 +0800)]
MDL-45062 webservices: fix unit test for update_grades
This fixes the broken unit test (which exposes a fail) and
the next patch from Juan fixes the fail.
Damyon Wiese [Wed, 16 Apr 2014 02:41:17 +0000 (10:41 +0800)]
Merge branch 'MDL-45055-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 16 Apr 2014 02:30:47 +0000 (10:30 +0800)]
Merge branch 'MDL-44941-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 16 Apr 2014 01:10:28 +0000 (09:10 +0800)]
Merge branch 'MDL-45076-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 15 Apr 2014 23:43:48 +0000 (11:43 +1200)]
Merge branch 'w16_MDL-45100_m27_coursecontext' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 15 Apr 2014 21:52:05 +0000 (09:52 +1200)]
Merge branch 'wip-MDL-45083-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 15 Apr 2014 21:46:54 +0000 (09:46 +1200)]
Merge branch 'wip-MDL-44998-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 15 Apr 2014 21:23:30 +0000 (09:23 +1200)]
Merge branch 'MDL-45034-master' of git://github.com/damyon/moodle
Conflicts:
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
Eloy Lafuente (stronk7) [Tue, 15 Apr 2014 14:33:14 +0000 (16:33 +0200)]
on-demand release 2.7beta+
Marina Glancy [Tue, 15 Apr 2014 10:07:10 +0000 (18:07 +0800)]
MDL-44826 atto: re-shifted js
Juan Leyva [Tue, 15 Apr 2014 09:59:44 +0000 (11:59 +0200)]
MDL-45062 web services: Description of method result value for update_grades_return is invalid
Marina Glancy [Tue, 15 Apr 2014 09:55:30 +0000 (17:55 +0800)]
Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle
Frederic Massart [Tue, 15 Apr 2014 09:25:46 +0000 (17:25 +0800)]
MDL-44941 core: Removing irrelevant assertion causing failures
The timemodified property is not called when the user logs in, and
so we should not be checking if its value matches the current time.
Rajesh Taneja [Tue, 15 Apr 2014 08:02:04 +0000 (16:02 +0800)]
MDL-45073 report_log: Fixed behat
Rajesh Taneja [Tue, 15 Apr 2014 08:11:02 +0000 (16:11 +0800)]
MDL-41283 report_participation: Fixed behat
Marina Glancy [Tue, 15 Apr 2014 09:14:57 +0000 (17:14 +0800)]
Revert "MDL-41283 report_participation: Fixed legacy actions returned from api's"
This reverts commit
7b7bb92d4206beac111fa0eed63a964fd9d20f4a.
Damyon Wiese [Fri, 11 Apr 2014 06:15:02 +0000 (14:15 +0800)]
MDL-45034 Atto: Image dialogue improvements.
1. Fix Nan bugs in auto width / height
2. Allow percentages in auto width / height
3. Change dialogue title
4. Prevent preview image resizing from changing the height of the dialogue.
5. Change wording to "Auto size"
6. Auto adjust size when the "Auto size" checkbox is toggled.
7. Add img-responsive to images with the original aspect ratio.
8. If the width and height fields are left blank, revert them to the image size.
Damyon Wiese [Tue, 15 Apr 2014 07:47:52 +0000 (15:47 +0800)]
MDL-44826 Atto: Set default image alignment to 'bottom'
Rajesh Taneja [Tue, 15 Apr 2014 07:46:03 +0000 (15:46 +0800)]
MDL-45073 report_log: setup table if log reader enabled
Petr Škoda [Tue, 15 Apr 2014 07:46:19 +0000 (15:46 +0800)]
MDL-45100 fix course_context classname PHPDdos typo in context API
Petr Škoda [Tue, 15 Apr 2014 06:56:51 +0000 (14:56 +0800)]
MDL-45035 add missing @since to \core\event\unknown_logged class
Damyon Wiese [Tue, 15 Apr 2014 06:46:40 +0000 (14:46 +0800)]
Merge branch 'w16_MDL-45070_m27_ubuntumaria' of https://github.com/skodak/moodle
Marina Glancy [Tue, 15 Apr 2014 06:34:36 +0000 (14:34 +0800)]
Merge branch 'MDL-45035-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 15 Apr 2014 06:34:28 +0000 (14:34 +0800)]
Merge branch 'wip-mdl-41283' of git://github.com/rajeshtaneja/moodle
Conflicts:
mod/upgrade.txt
Tony Levi [Wed, 2 Apr 2014 03:30:19 +0000 (14:00 +1030)]
MDL-44908: Fix upgrade_grade_item_fix_sortorder performance
Rajesh Taneja [Wed, 9 Apr 2014 08:06:40 +0000 (16:06 +0800)]
MDL-41283 report_participation: moved code to locallib
Rajesh Taneja [Thu, 3 Apr 2014 08:05:47 +0000 (16:05 +0800)]
MDL-41283 report_participation: Fixed legacy actions returned from api's
Rajesh Taneja [Thu, 3 Apr 2014 05:42:25 +0000 (13:42 +0800)]
MDL-41283 report_participation: Added phpdoc about function not used
In new logging api, xxx_get_view_actions() and xxx_get_post_actions()
will not be used to identify the paticipation of user. Event's crud
and edulevel status will define user's participation.
Rajesh Taneja [Tue, 18 Feb 2014 07:45:24 +0000 (15:45 +0800)]
MDL-41283 report_participation: Updated report to use logging api
Damyon Wiese [Tue, 15 Apr 2014 05:16:15 +0000 (13:16 +0800)]
Merge branch 'wip-mdl-44910' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 15 Apr 2014 04:47:38 +0000 (16:47 +1200)]
Merge branch 'MDL-40674_master' of https://github.com/nadavkav/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 15 Apr 2014 04:42:12 +0000 (16:42 +1200)]
Merge branch 'MDL-44826-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 15 Apr 2014 04:25:48 +0000 (12:25 +0800)]
MDL-44998 log_standard: review indexes
Damyon Wiese [Tue, 15 Apr 2014 04:23:31 +0000 (12:23 +0800)]
MDL-44826 Atto: Image alignment options
If an image has custom alignment or margins - don't overwrite
them unless a new alignment option is chosen.
Frederic Massart [Tue, 15 Apr 2014 03:06:36 +0000 (11:06 +0800)]
MDL-45076 theme_bootstrapbase: Clean up participants controls LESS
Frederic Massart [Tue, 15 Apr 2014 02:58:59 +0000 (10:58 +0800)]
MDL-45076 theme_bootstrapbase: Select placement in participants page
Usually the group selector is aligned with the label, but as we want
it to be consistent with the rest of the selects in the participants
page we need an override.
Dan Poltawski [Tue, 15 Apr 2014 03:57:51 +0000 (11:57 +0800)]
Merge branch 'wip-mdl-45073' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 15 Apr 2014 03:38:01 +0000 (11:38 +0800)]
Merge branch 'MDL-45074-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 15 Apr 2014 03:05:37 +0000 (11:05 +0800)]
Merge branch 'MDL-45084-master' of git://github.com/FMCorz/moodle
Rajesh Taneja [Tue, 15 Apr 2014 02:52:14 +0000 (10:52 +0800)]
MDL-44910 behat: Fixed log and livelog behat
As default log store is changed to standard, test should
now take care of it
Dan Poltawski [Tue, 15 Apr 2014 02:33:30 +0000 (10:33 +0800)]
Merge branch 'MDL-45003-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Tue, 15 Apr 2014 02:26:06 +0000 (10:26 +0800)]
Merge branch '44354-27' of git://github.com/samhemelryk/moodle
Andrew Nicols [Tue, 15 Apr 2014 02:24:32 +0000 (10:24 +0800)]
MDL-43277 block_navigation: Trim from the left for long names
Andrew Davis [Tue, 15 Apr 2014 01:04:33 +0000 (09:04 +0800)]
MDL-45089 mod_chat: changed the page type on the accessible popup
Sam Hemelryk [Tue, 15 Apr 2014 00:31:44 +0000 (12:31 +1200)]
Merge branch 'MDL-45040-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 14 Apr 2014 22:26:44 +0000 (10:26 +1200)]
Merge branch 'MDL-41891_master' of https://github.com/nadavkav/moodle
Sam Hemelryk [Mon, 14 Apr 2014 21:50:38 +0000 (09:50 +1200)]
Merge branch 'MDL-45086-master' of git://github.com/danpoltawski/moodle
Frederic Massart [Mon, 14 Apr 2014 09:39:30 +0000 (17:39 +0800)]
MDL-45081 curl: Prefer usage of CURLFile over @file arguments
Marina Glancy [Mon, 14 Apr 2014 09:10:31 +0000 (17:10 +0800)]
Merge branch 'MDL-45047-module-notation-deprecated' of git://github.com/mudrd8mz/moodle
Marina Glancy [Mon, 14 Apr 2014 09:10:02 +0000 (17:10 +0800)]
Merge branch 'MDL-45057_master' of git://github.com/markn86/moodle
Marina Glancy [Mon, 14 Apr 2014 09:09:49 +0000 (17:09 +0800)]
Merge branch 'w16_MDL-44911_m27_unknownevent' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 Apr 2014 08:34:41 +0000 (16:34 +0800)]
MDL-45086 lib: force upgrade
The availability changes change the course query for front page.
Ankit Agarwal [Mon, 14 Apr 2014 08:31:54 +0000 (16:31 +0800)]
MDL-45074 report_loglive Fix parameter typo
Frederic Massart [Mon, 14 Apr 2014 08:24:26 +0000 (16:24 +0800)]
MDL-45084 theme: File was not chunked on IE
This only applied when themedesignermode was disabled, because the
first chunk is 0, but 0 is resolved to false. We needed to compare
$chunk with null in order to know if it was set.
Dan Poltawski [Mon, 14 Apr 2014 07:22:59 +0000 (15:22 +0800)]
Merge branch 'wip-MDL-43719-master' of git://github.com/abgreeve/moodle
Marina Glancy [Mon, 14 Apr 2014 07:20:24 +0000 (15:20 +0800)]
MDL-45083 recent_activity: fixed debugging message on removed module type
Dan Poltawski [Mon, 14 Apr 2014 07:19:58 +0000 (15:19 +0800)]
Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle
Petr Škoda [Mon, 14 Apr 2014 07:16:28 +0000 (15:16 +0800)]
MDL-44366 fix use of cm->uservisible in glossary concept cache
David Mudrák [Thu, 10 Apr 2014 21:59:01 +0000 (23:59 +0200)]
MDL-45047 Put the deprecation warning into mod/upgrade.txt, too
It is already in the main lib/upgrade.txt but it should be mentioned here as
well.
Mark Nelson [Mon, 14 Apr 2014 01:37:06 +0000 (18:37 -0700)]
MDL-45057 mod_quiz: restored the user/group override deleted events
Rajesh Taneja [Mon, 14 Apr 2014 03:39:50 +0000 (11:39 +0800)]
MDL-45073 report_log: Fixed activity report
1. Wrong reader class check and api
2. Passing logreader parameter for graph
3. Using proper time from for all log and today's log
Dan Poltawski [Mon, 14 Apr 2014 04:23:57 +0000 (12:23 +0800)]
Merge branch 'MDL-45009-master' of git://github.com/damyon/moodle
Petr Škoda [Mon, 14 Apr 2014 03:40:36 +0000 (11:40 +0800)]
MDL-44911 use unknown_logged class when viewing unknown events in reports
Ankit Agarwal [Mon, 14 Apr 2014 03:12:03 +0000 (11:12 +0800)]
MDL-45055 events: Add debugging notice to events_trigger()
Damyon Wiese [Mon, 14 Apr 2014 03:38:46 +0000 (11:38 +0800)]
Merge branch 'MDL-44936-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 14 Apr 2014 02:53:56 +0000 (10:53 +0800)]
Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 14 Apr 2014 02:32:00 +0000 (10:32 +0800)]
Merge branch 'MDL-44844-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 14 Apr 2014 02:14:47 +0000 (10:14 +0800)]
Merge branch 'w16_MDL-44910_m27_logupgrade' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 14 Apr 2014 02:01:11 +0000 (10:01 +0800)]
Merge branch 'MDL-45048-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Fri, 11 Apr 2014 07:28:31 +0000 (15:28 +0800)]
MDL-45009 Tex filter: Add \( \) delimiters for 1:1 compatibility with MathJax
Petr Škoda [Mon, 14 Apr 2014 01:36:18 +0000 (09:36 +0800)]
MDL-45070 relax the mariaDB version checker to work with long Ubuntu versions
Example of Ubuntu version: 5.5.5-10.0.10-MariaDB-1~saucy-log
Petr Škoda [Sun, 6 Apr 2014 13:00:40 +0000 (21:00 +0800)]
MDL-44910 enable new logging during upgrade and installation
The legacy logging is now enabled for reading only
if legacy log data older than one day exists.
Petr Škoda [Mon, 7 Apr 2014 06:04:31 +0000 (14:04 +0800)]
MDL-44366 improve glossary filter performance
This should have when there are no glossaries in course or
when there are no linked entries in existing glossaries.
Petr Škoda [Sun, 6 Apr 2014 12:36:56 +0000 (20:36 +0800)]
MDL-44366 bump up glossary and filter version
Petr Škoda [Fri, 28 Mar 2014 07:02:46 +0000 (15:02 +0800)]
MDL-44366 rework glossary filter caching
Dan Poltawski [Fri, 11 Apr 2014 09:41:36 +0000 (17:41 +0800)]
Moodle release 2.7beta
Dan Poltawski [Fri, 11 Apr 2014 09:36:40 +0000 (17:36 +0800)]
MDL-40063/MDL-45057 quiz: disable related unit tests
I kept the commit number format same as the last commit just
to annoy Fred.
Dan Poltawski [Fri, 11 Apr 2014 08:55:59 +0000 (16:55 +0800)]
MDL-40063/MDL-45057 quiz: disable firing of override events
This hacky solution is brought to you by the the motivation to
release.
Frederic Massart [Fri, 11 Apr 2014 07:16:31 +0000 (15:16 +0800)]
MDL-45048 repository_wikimedia: Abusing usage of optional_param
The optional_param call was moved outside of the constructor
because it was called every time the repository would be initialised.
That was leading to problems when the parameter was defined from
another form and not complying with its expected type.
Dan Poltawski [Fri, 11 Apr 2014 06:31:27 +0000 (14:31 +0800)]
Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle
Adrian Greeve [Fri, 11 Apr 2014 05:41:16 +0000 (13:41 +0800)]
MDL-43719 tags: Fix the sql statement in the tag management page.
MSSQL and Oracle require that all fields in teh select also be present
in the group by section.
Ankit Agarwal [Thu, 10 Apr 2014 08:18:23 +0000 (16:18 +0800)]
MDL-45035 events: Fix @package and @since tags in Moodle 2.7 events
James Pratt [Fri, 11 Apr 2014 03:53:34 +0000 (10:53 +0700)]
MDL-45003 qtype numeric : classify invalid response as no response.
Ankit Agarwal [Thu, 10 Apr 2014 07:42:30 +0000 (15:42 +0800)]
MDL-45035 events: Fix @package and @since tags in Moodle 2.6 events
Dan Poltawski [Fri, 11 Apr 2014 05:01:38 +0000 (13:01 +0800)]
Merge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle
Damyon Wiese [Fri, 11 Apr 2014 04:55:28 +0000 (12:55 +0800)]
MDL-44826 Atto: Remove most of the image alignment options
Just keep the simple ones and put some default padding on images.
Dan Poltawski [Fri, 11 Apr 2014 04:55:15 +0000 (12:55 +0800)]
Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle
Dan Poltawski [Fri, 11 Apr 2014 04:48:14 +0000 (12:48 +0800)]
Merge branch 'wip-MDL-45038-master' of git://github.com/marinaglancy/moodle
Frederic Massart [Mon, 7 Apr 2014 08:30:58 +0000 (16:30 +0800)]
MDL-44936 csslib: Chunking supports @media queries and commas in rules
Mark Nelson [Sat, 25 Jan 2014 02:08:54 +0000 (18:08 -0800)]
MDL-40063 mod_quiz: created 'override_created' events
Mark Nelson [Tue, 17 Dec 2013 04:15:51 +0000 (20:15 -0800)]
MDL-40063 mod_quiz: replaced ‘manualgrade’ add_to_log call with an event
Mark Nelson [Fri, 22 Nov 2013 01:08:58 +0000 (17:08 -0800)]
MDL-40063 mod_quiz: replaced 'attempt' add_to_log call with an event
Mark Nelson [Fri, 22 Nov 2013 01:03:17 +0000 (17:03 -0800)]
MDL-40063 mod_quiz: replaced 'preview' add_to_log call with an event
Mark Nelson [Fri, 22 Nov 2013 00:18:10 +0000 (16:18 -0800)]
MDL-40063 mod_quiz: replaced 'continue attempt' add_to_log call with an event
Mark Nelson [Thu, 21 Nov 2013 22:34:44 +0000 (14:34 -0800)]
MDL-40063 mod_quiz: replaced 'delete override' add_to_log call with events