moodle.git
5 years agoMerge branch 'MDL-51925-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 1 Dec 2015 09:47:36 +0000 (09:47 +0000)]
Merge branch 'MDL-51925-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle
David Monllao [Tue, 1 Dec 2015 09:16:31 +0000 (17:16 +0800)]
Merge branch 'MDL-52237-master' of git://github.com/StudiUM/moodle

5 years agoMerge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 30 Nov 2015 23:50:10 +0000 (00:50 +0100)]
Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-44598_master' of https://github.com/jonof/moodle
Eloy Lafuente (stronk7) [Mon, 30 Nov 2015 22:52:45 +0000 (23:52 +0100)]
Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle

5 years agoMerge branch 'MDL-52013-m' of https://github.com/micaherne/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:42:58 +0000 (15:42 +0000)]
Merge branch 'MDL-52013-m' of https://github.com/micaherne/moodle

5 years agoMerge branch 'MDL-52074-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:29:29 +0000 (15:29 +0000)]
Merge branch 'MDL-52074-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-52108-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 30 Nov 2015 15:25:22 +0000 (15:25 +0000)]
Merge branch 'MDL-52108-master' of git://github.com/jleyva/moodle

5 years agoMerge branch 'MDL-50661_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Nov 2015 13:50:22 +0000 (13:50 +0000)]
Merge branch 'MDL-50661_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle
Dan Poltawski [Mon, 30 Nov 2015 13:37:47 +0000 (13:37 +0000)]
Merge branch 'MDL-51718-set-scheme' of https://github.com/brendanheywood/moodle

5 years agoMerge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle
Dan Poltawski [Mon, 30 Nov 2015 13:20:35 +0000 (13:20 +0000)]
Merge branch 'MDL-52042-master' of git://github.com/ryanwyllie/moodle

5 years agoMerge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Mon, 30 Nov 2015 12:23:09 +0000 (12:23 +0000)]
Merge branch 'MDL-51900_master' of https://github.com/jinhofer/moodle

5 years agoMerge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 30 Nov 2015 11:27:52 +0000 (11:27 +0000)]
Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 30 Nov 2015 10:23:07 +0000 (10:23 +0000)]
Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle
David Monllao [Mon, 30 Nov 2015 07:52:46 +0000 (15:52 +0800)]
Merge branch 'MDL-51204_lang_coding_style' of git://github.com/andyjdavis/moodle

Conflicts:
lang/en/deprecated.txt
lang/en/grades.php

5 years agoMerge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 30 Nov 2015 07:45:44 +0000 (15:45 +0800)]
Merge branch 'MDL-35982-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-52332 calendar: load settings using API
Marina Glancy [Fri, 27 Nov 2015 00:49:04 +0000 (08:49 +0800)]
MDL-52332 calendar: load settings using API

5 years agoMDL-52279 core_lib: Remove php4 style constructor
Rajesh Taneja [Tue, 24 Nov 2015 08:24:24 +0000 (16:24 +0800)]
MDL-52279 core_lib: Remove php4 style constructor

filterobject is called from core and as it's
using php4 style constructor, global USER is
not set properly because of deprecation warning

5 years agoMDL-50661 theme_more: New small logo setting
David Monllao [Wed, 11 Nov 2015 07:34:19 +0000 (15:34 +0800)]
MDL-50661 theme_more: New small logo setting

Adding required bits so theme_more can also set a small logo.

5 years agoMDL-50661 theme_clean: New small logo setting
David Monllao [Wed, 11 Nov 2015 07:24:18 +0000 (15:24 +0800)]
MDL-50661 theme_clean: New small logo setting

Introduces new settings to set a small logo in the navbar next
to the site name on pages where the logo is not displayed.

5 years agoMDL-51900 grade/report/singleview: Added ctrl+arrow navigation
jinhofer [Tue, 27 Oct 2015 15:05:20 +0000 (10:05 -0500)]
MDL-51900 grade/report/singleview: Added ctrl+arrow navigation

Also, added functionality for tab to traverse down the columns and
shift+tab to traverse up the columns.

5 years agoMDL-52283 core: password_hash() deprecation in PHP7
Tony Levi [Mon, 3 Aug 2015 06:46:03 +0000 (16:16 +0930)]
MDL-52283 core: password_hash() deprecation in PHP7

5 years agoMDL-52013 assign: Allow subplugins to add calendar events
Michael Aherne [Mon, 2 Nov 2015 12:04:01 +0000 (12:04 +0000)]
MDL-52013 assign: Allow subplugins to add calendar events

5 years agoMDL-35982 behat: delete blog entry coverage
Dan Poltawski [Fri, 30 Oct 2015 15:15:07 +0000 (15:15 +0000)]
MDL-35982 behat: delete blog entry coverage

5 years agoMDL-35982 blog: improve the delete entry confirmation string
Dan Poltawski [Fri, 30 Oct 2015 14:37:24 +0000 (14:37 +0000)]
MDL-35982 blog: improve the delete entry confirmation string

So that there is more context about what is being deleted.

5 years agoMDL-35982 blog: reorder blog delete confirmation
Dan Poltawski [Fri, 30 Oct 2015 14:22:39 +0000 (14:22 +0000)]
MDL-35982 blog: reorder blog delete confirmation

Improves accessibility to be ordered logically in page

5 years agoMDL-35982 blog: prevent index throwing errors with 0 courseid
Dan Poltawski [Fri, 30 Oct 2015 14:14:24 +0000 (14:14 +0000)]
MDL-35982 blog: prevent index throwing errors with 0 courseid

Regression from MDL-49845 where Dave made the page not handle courseid = 0
and so now some urls will send you back to a db error..

5 years agoMDL-52219 phpunit: updated for new defaults
Dan Poltawski [Tue, 24 Nov 2015 14:41:22 +0000 (14:41 +0000)]
MDL-52219 phpunit: updated for new defaults

The externallib assertion was previously never being run and had a typo..

5 years agoMDL-52219 behat: remove steps which turn on avaibility/completion
Dan Poltawski [Mon, 23 Nov 2015 11:11:27 +0000 (11:11 +0000)]
MDL-52219 behat: remove steps which turn on avaibility/completion

Now its the default, we can reduce test time by relying on the default
state rather than going around turning it on

5 years agoMDL-52219 admin: Enable completion and restricted access by default
Dan Poltawski [Fri, 20 Nov 2015 18:41:44 +0000 (18:41 +0000)]
MDL-52219 admin: Enable completion and restricted access by default

5 years agoweekly on-sync release 3.1dev
David Monllao [Thu, 26 Nov 2015 03:02:40 +0000 (11:02 +0800)]
weekly on-sync release 3.1dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Thu, 26 Nov 2015 03:02:38 +0000 (11:02 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Nov 2015 16:04:22 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-52291' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 25 Nov 2015 11:22:17 +0000 (11:22 +0000)]
Merge branch 'MDL-52291' of git://github.com/stronk7/moodle

5 years agoMDL-52160 navigation: Mark category and module settings nodes as branch
Frederic Massart [Wed, 25 Nov 2015 05:03:25 +0000 (13:03 +0800)]
MDL-52160 navigation: Mark category and module settings nodes as branch

5 years agoMDL-52291 questions: fix upgrade from 2.5 and earlier
Eloy Lafuente (stronk7) [Tue, 24 Nov 2015 23:19:30 +0000 (00:19 +0100)]
MDL-52291 questions: fix upgrade from 2.5 and earlier

Because of some changes performed to the multichoice qtype
for Moodle 2.6, older sites are not able to upgrade properly.

This commits does introduce DB introspection to decide which
table and column names must be used. Nasty but enough.

Note MDL-52298 has been created about to avoid/minimize the
chances of this happening again.

5 years agoAutomatically generated installer lang files
AMOS bot [Tue, 24 Nov 2015 16:04:12 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'MDL-44330' of git://github.com/NeillM/moodle
David Monllao [Tue, 24 Nov 2015 09:03:06 +0000 (17:03 +0800)]
Merge branch 'MDL-44330' of git://github.com/NeillM/moodle

5 years agoMerge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 24 Nov 2015 08:53:18 +0000 (16:53 +0800)]
Merge branch 'MDL-45934-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-44330 Assign: Assignment grading may not display expected student
Neill Magill [Wed, 11 Nov 2015 13:06:31 +0000 (13:06 +0000)]
MDL-44330 Assign: Assignment grading may not display expected student

Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:

1) The user had the table ordered by a value that could be modified,
   for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
   between the user generating the table and clicking on a grade link.

If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.

This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.

5 years agoMDL-50163 behat: wait to ensure elements are placed properly by js.
Rajesh Taneja [Tue, 24 Nov 2015 03:16:44 +0000 (11:16 +0800)]
MDL-50163 behat: wait to ensure elements are placed properly by js.

5 years agoMerge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 23 Nov 2015 18:29:35 +0000 (19:29 +0100)]
Merge branch 'MDL-52095_master' of git://github.com/dmonllao/moodle

5 years agoMerge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 23 Nov 2015 18:26:57 +0000 (19:26 +0100)]
Merge branch 'MDL-52185-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-52237 navigationlib: Plugins can extend navigation user profile
Jean-Philippe Gaudreau [Thu, 19 Nov 2015 20:54:04 +0000 (15:54 -0500)]
MDL-52237 navigationlib: Plugins can extend navigation user profile

5 years agoAutomatically generated installer lang files
AMOS bot [Mon, 23 Nov 2015 16:04:21 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMerge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 23 Nov 2015 11:33:55 +0000 (11:33 +0000)]
Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle

5 years agoMerge branch 'MDL-52166' of https://github.com/timhunt/moodle
Dan Poltawski [Mon, 23 Nov 2015 09:43:31 +0000 (09:43 +0000)]
Merge branch 'MDL-52166' of https://github.com/timhunt/moodle

5 years agoMerge branch 'MDL-52214-master-crawler' of git://github.com/mudrd8mz/moodle
David Monllao [Mon, 23 Nov 2015 09:00:24 +0000 (17:00 +0800)]
Merge branch 'MDL-52214-master-crawler' of git://github.com/mudrd8mz/moodle

5 years agoMDL-52214 core: Fix case sensitivity in user agent comparison
David Mudrák [Thu, 19 Nov 2015 13:14:16 +0000 (14:14 +0100)]
MDL-52214 core: Fix case sensitivity in user agent comparison

The previous 2.9 implementation of is_web_crawler() used stripos() in
certain cases. The unit tests re-added in the previous commit revealed
that certain crawlers (such as BaiDuSpider) were not correctly detected
in the new refactored implementation.

It seems lesser evil and safe enough to use /i in the regex search even
though it is not 100% same logic as before - as stripos() was used in
some cases only, not always.

5 years agoMDL-52214 core: Fix the is_web_crawler() regression
David Mudrák [Thu, 19 Nov 2015 12:21:49 +0000 (13:21 +0100)]
MDL-52214 core: Fix the is_web_crawler() regression

In MDL-50891, the is_web_crawler() was refactored into a core_useragent
method and the function itself was deprecated. However, there were no
unit tests kept to check the backwards compatible behaviour. It turned
out that the deprecated function leads to PHP fatal error due to a typo.

This patch fixes the typo and brings back the previous unit tests. To be
able to explicitly check the raised debugging message, the test case
now must be subclass of advanced_testcase.

Additionally fixes missing info about the function being deprecated.

5 years agoMerge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 08:40:26 +0000 (16:40 +0800)]
Merge branch 'MDL-52180-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-52086' of git://github.com/bostelm/moodle
David Monllao [Mon, 23 Nov 2015 08:10:25 +0000 (16:10 +0800)]
Merge branch 'MDL-52086' of git://github.com/bostelm/moodle

5 years agoMerge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle
David Monllao [Mon, 23 Nov 2015 07:42:27 +0000 (15:42 +0800)]
Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle

5 years agoMerge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 23 Nov 2015 06:07:21 +0000 (14:07 +0800)]
Merge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle

5 years agoMerge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 05:56:06 +0000 (13:56 +0800)]
Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 23 Nov 2015 05:32:35 +0000 (13:32 +0800)]
Merge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-37834 assign: avoid newlines in status column of csv
Dan Poltawski [Wed, 18 Nov 2015 16:45:31 +0000 (16:45 +0000)]
MDL-37834 assign: avoid newlines in status column of csv

Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.

Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.

5 years agoAutomatically generated installer lang files
AMOS bot [Fri, 20 Nov 2015 16:04:07 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMDL-52095 themes: Padding to the left on RTL langs
David Monllao [Wed, 11 Nov 2015 07:35:56 +0000 (15:35 +0800)]
MDL-52095 themes: Padding to the left on RTL langs

5 years agoAutomatically generated installer lang files
AMOS bot [Thu, 19 Nov 2015 16:04:07 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoweekly on-sync release 3.1dev
Dan Poltawski [Thu, 19 Nov 2015 09:21:07 +0000 (09:21 +0000)]
weekly on-sync release 3.1dev

5 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 19 Nov 2015 09:21:04 +0000 (09:21 +0000)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

5 years agoMerge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Thu, 19 Nov 2015 08:43:19 +0000 (09:43 +0100)]
Merge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 19 Nov 2015 07:06:16 +0000 (07:06 +0000)]
Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle

5 years agoMDL-42571 editpdf: Fix search comments
David Monllao [Thu, 19 Nov 2015 06:59:03 +0000 (14:59 +0800)]
MDL-42571 editpdf: Fix search comments

They are also hidden instead of destroyed.

5 years agoMerge branch 'wip-MDL-52194-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 19 Nov 2015 06:47:30 +0000 (06:47 +0000)]
Merge branch 'wip-MDL-52194-master' of https://github.com/marinaglancy/moodle

5 years agoMerge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Thu, 19 Nov 2015 06:33:54 +0000 (06:33 +0000)]
Merge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle

5 years agoMDL-42571 editpdf: Fix comments search and multiple views drawing
David Monllao [Thu, 19 Nov 2015 04:29:20 +0000 (12:29 +0800)]
MDL-42571 editpdf: Fix comments search and multiple views drawing

5 years agoMDL-52203 qtype_multianswer: avoid fatal error during upgrade
Marina Glancy [Thu, 19 Nov 2015 03:06:48 +0000 (11:06 +0800)]
MDL-52203 qtype_multianswer: avoid fatal error during upgrade

5 years agoMDL-52086 output renderers: show subtree only when tab is activated
Henning Bostelmann [Mon, 9 Nov 2015 23:22:53 +0000 (23:22 +0000)]
MDL-52086 output renderers: show subtree only when tab is activated

5 years agoAutomatically generated installer lang files
AMOS bot [Wed, 18 Nov 2015 16:04:45 +0000 (00:04 +0800)]
Automatically generated installer lang files

5 years agoMDL-43069 assign: prevent JS error on grading table
Pavel Sokolov [Thu, 5 Dec 2013 13:00:34 +0000 (17:00 +0400)]
MDL-43069 assign: prevent JS error on grading table

Previously submission comments failed to expand if you hid
the file submissions column.

5 years agoMDL-45934 backup: do not reset completion enabled flag
Dan Poltawski [Wed, 18 Nov 2015 11:45:45 +0000 (11:45 +0000)]
MDL-45934 backup: do not reset completion enabled flag

The 'completion enabled' flag does not reflect any course data, its a
course setting. Previously when doing a backup deleteting existing
course content this was forced off when it should not have been.

5 years agoMDL-49490 assign: can't export to portfolio on non-submission
Dan Poltawski [Wed, 4 Nov 2015 14:10:40 +0000 (14:10 +0000)]
MDL-49490 assign: can't export to portfolio on non-submission

5 years agoMDL-52108 core_message: Move library inclusion outside the class methods
Juan Leyva [Wed, 18 Nov 2015 08:52:29 +0000 (09:52 +0100)]
MDL-52108 core_message: Move library inclusion outside the class methods

5 years agoMDL-52194 flowplayer: do not check request
Marina Glancy [Wed, 18 Nov 2015 07:26:18 +0000 (15:26 +0800)]
MDL-52194 flowplayer: do not check request

$_REQUEST variable may contain cookies in some php configurations. See also MDL-48085

5 years agoMDL-52162 question: Removing unnecessary dependency
David Monllao [Wed, 18 Nov 2015 05:15:46 +0000 (13:15 +0800)]
MDL-52162 question: Removing unnecessary dependency

APIs dependencies were correctly removed during MDL-38214 review although
this unnecessary require remained here.

Credit to Marina Glancy.

5 years agoMDL-52029 installer: Unstyled installer if display_errors is on
Vadim Dvorovenko [Wed, 18 Nov 2015 01:44:04 +0000 (08:44 +0700)]
MDL-52029 installer: Unstyled installer if display_errors is on

Error in MDL-43839 solution caused inclusion of unexistent file in
install/css.php.

5 years agoMerge branch 'MDL-52140' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 17 Nov 2015 16:27:42 +0000 (16:27 +0000)]
Merge branch 'MDL-52140' of git://github.com/stronk7/moodle

5 years agoMDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts
Eloy Lafuente (stronk7) [Tue, 17 Nov 2015 16:08:56 +0000 (17:08 +0100)]
MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts

5 years agoMDL-52185 report: remove ugly bullet points
Dan Poltawski [Tue, 17 Nov 2015 15:32:12 +0000 (15:32 +0000)]
MDL-52185 report: remove ugly bullet points

5 years agoMDL-52180 travis: remove weekly release checker
Dan Poltawski [Tue, 17 Nov 2015 09:39:44 +0000 (09:39 +0000)]
MDL-52180 travis: remove weekly release checker

To prevent false positives

5 years agoMDL-51925 enrol: Support ordering in get_enrolled_users WS
Juan Leyva [Mon, 16 Nov 2015 17:27:01 +0000 (18:27 +0100)]
MDL-51925 enrol: Support ordering in get_enrolled_users WS

5 years agoMDL-50163 behat: Return subcontext from session
Rajesh Taneja [Tue, 17 Nov 2015 04:59:06 +0000 (12:59 +0800)]
MDL-50163 behat: Return subcontext from session

Creating a new context with new mink context
with different session was keeping the session
and was not returning proper session information

5 years agoMDL-50163 behat: Restart session after scenario with switch_window
rajesh Taneja [Thu, 22 Oct 2015 03:35:00 +0000 (11:35 +0800)]
MDL-50163 behat: Restart session after scenario with switch_window

Restart session after a scenario with switch window
is finished. This will close all open browser windows
and open a new browser window

5 years agoMerge branch 'MDL-51988-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 17 Nov 2015 02:20:59 +0000 (10:20 +0800)]
Merge branch 'MDL-51988-master' of git://github.com/danpoltawski/moodle

5 years agoMDL-50700 gradereport_overview: Call $PAGE->set_course
Russell Smith [Mon, 16 Nov 2015 01:14:43 +0000 (12:14 +1100)]
MDL-50700 gradereport_overview: Call $PAGE->set_course

To ensure correct blocks are displayed.

5 years agoMerge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle
David Monllao [Tue, 17 Nov 2015 00:54:50 +0000 (08:54 +0800)]
Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-52021-master-test' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 16 Nov 2015 16:21:17 +0000 (16:21 +0000)]
Merge branch 'MDL-52021-master-test' of git://github.com/junpataleta/moodle

5 years agoAutomatically generated installer lang files
AMOS bot [Mon, 16 Nov 2015 16:05:09 +0000 (00:05 +0800)]
Automatically generated installer lang files

5 years agoMDL-52166 gradebook: overview report fails with separate groups
Tim Hunt [Mon, 16 Nov 2015 14:37:42 +0000 (14:37 +0000)]
MDL-52166 gradebook: overview report fails with separate groups

5 years agoMDL-52074 ws: Add enrol_self_get_instance_info to the mobile service
Juan Leyva [Mon, 16 Nov 2015 12:16:45 +0000 (13:16 +0100)]
MDL-52074 ws: Add enrol_self_get_instance_info to the mobile service

5 years agoMDL-52160 navigation: Really remove module settings empty nodes
Frederic Massart [Mon, 16 Nov 2015 11:28:06 +0000 (19:28 +0800)]
MDL-52160 navigation: Really remove module settings empty nodes

5 years agoMerge branch 'MDL-52139' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 16 Nov 2015 09:28:37 +0000 (09:28 +0000)]
Merge branch 'MDL-52139' of git://github.com/stronk7/moodle

5 years agoMerge branch 'MDL-47065-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 16 Nov 2015 07:25:42 +0000 (15:25 +0800)]
Merge branch 'MDL-47065-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-41643-master' of git://github.com/jojoob/moodle
David Monllao [Mon, 16 Nov 2015 06:54:19 +0000 (14:54 +0800)]
Merge branch 'MDL-41643-master' of git://github.com/jojoob/moodle

5 years agoMerge branch 'MDL-50687-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 16 Nov 2015 06:25:48 +0000 (14:25 +0800)]
Merge branch 'MDL-50687-master' of git://github.com/danpoltawski/moodle

5 years agoMerge branch 'MDL-50564-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 16 Nov 2015 06:19:18 +0000 (14:19 +0800)]
Merge branch 'MDL-50564-master' of git://github.com/junpataleta/moodle

5 years agoMerge branch 'MDL-42571' of git://github.com/blaky/moodle
David Monllao [Mon, 16 Nov 2015 05:39:59 +0000 (13:39 +0800)]
Merge branch 'MDL-42571' of git://github.com/blaky/moodle

Conflicts:
mod/assign/feedback/editpdf/version.php

5 years agoMDL-52139 backup: Bump release to 3.1
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 23:39:17 +0000 (00:39 +0100)]
MDL-52139 backup: Bump release to 3.1

5 years agoweekly back-to-dev release 3.1dev
Eloy Lafuente (stronk7) [Sun, 15 Nov 2015 22:23:46 +0000 (23:23 +0100)]
weekly back-to-dev release 3.1dev