moodle.git
6 years agoMerge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 10 Oct 2016 23:21:14 +0000 (01:21 +0200)]
Merge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-56220-m' of https://github.com/micaherne/moodle
Eloy Lafuente (stronk7) [Mon, 10 Oct 2016 23:17:33 +0000 (01:17 +0200)]
Merge branch 'MDL-56220-m' of https://github.com/micaherne/moodle

6 years agoMerge branch 'MDL-56331-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 10 Oct 2016 23:12:00 +0000 (01:12 +0200)]
Merge branch 'MDL-56331-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-56261-master-taglist' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 10 Oct 2016 22:32:21 +0000 (00:32 +0200)]
Merge branch 'MDL-56261-master-taglist' of git://github.com/mudrd8mz/moodle

6 years agoMerge branch 'MDL-56308' of https://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Mon, 10 Oct 2016 17:05:22 +0000 (19:05 +0200)]
Merge branch 'MDL-56308' of https://github.com/mr-russ/moodle

6 years agoMerge branch 'MDL-53695-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 10 Oct 2016 16:25:18 +0000 (18:25 +0200)]
Merge branch 'MDL-53695-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-56316-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 10 Oct 2016 16:11:56 +0000 (18:11 +0200)]
Merge branch 'MDL-56316-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-51633_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 10 Oct 2016 15:40:34 +0000 (17:40 +0200)]
Merge branch 'MDL-51633_master' of git://github.com/lazydaisy/moodle

6 years agoMerge branch 'MDL-56192-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 10 Oct 2016 15:16:17 +0000 (16:16 +0100)]
Merge branch 'MDL-56192-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-56050-master' of git://github.com/lameze/moodle
David Monllao [Mon, 10 Oct 2016 15:14:43 +0000 (23:14 +0800)]
Merge branch 'MDL-56050-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'MDL-54854-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 10 Oct 2016 15:00:31 +0000 (23:00 +0800)]
Merge branch 'MDL-54854-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-55923-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 10 Oct 2016 14:57:34 +0000 (22:57 +0800)]
Merge branch 'MDL-55923-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-30179-master' of git://github.com/merrill-oakland/moodle
David Monllao [Mon, 10 Oct 2016 14:38:29 +0000 (22:38 +0800)]
Merge branch 'MDL-30179-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-56209-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 10 Oct 2016 14:18:24 +0000 (15:18 +0100)]
Merge branch 'MDL-56209-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-56052-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 10 Oct 2016 13:18:33 +0000 (14:18 +0100)]
Merge branch 'MDL-56052-master' of git://github.com/damyon/moodle

6 years agoMDL-30179 gradereport_user: Add ability to view report as other user
Eric Merrill [Mon, 10 Oct 2016 13:03:11 +0000 (09:03 -0400)]
MDL-30179 gradereport_user: Add ability to view report as other user

6 years agoMerge branch 'MDL-55999-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 10 Oct 2016 12:40:16 +0000 (13:40 +0100)]
Merge branch 'MDL-55999-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'MDL-51584' of https://github.com/mr-russ/moodle
Dan Poltawski [Mon, 10 Oct 2016 12:23:59 +0000 (13:23 +0100)]
Merge branch 'MDL-51584' of https://github.com/mr-russ/moodle

6 years agoMDL-53695 lib/javascript.php: ensure full env for core_minify
Dan Poltawski [Wed, 5 Oct 2016 11:22:18 +0000 (12:22 +0100)]
MDL-53695 lib/javascript.php: ensure full env for core_minify

This applies the same approach to generating minified js as is already
used in theme/javascript.php and other scripts. When we need to do the
minification, we load the full Moodle environment, so we can use the
libraries.

The reason this was required was because now the minifier uses
autoloaded classes, which are not autoloaded when doing
ABORT_AFTER_CONFIG.

Fred persuaded me that it's probably safer to keep it that way, rather
than alllow ABORT_AFTER_CONFIG scripts from autoloading the world and
their dog (especially for resource serving scripts, they are intended to
be lightweight when serving from cache).

6 years agoMDL-53695 minify: switch to MatthiasMullie\Minify
Dan Poltawski [Thu, 29 Sep 2016 08:46:16 +0000 (09:46 +0100)]
MDL-53695 minify: switch to MatthiasMullie\Minify

The previously used minification libraries were:
a) Unmaintained
b) Had some silly licensing issues (MDL-36457)

The new library is smaller, maintained, active and GPL-compatible.

6 years agoMerge branch 'MDL-56095-master-fixup' of https://github.com/FMCorz/moodle
Dan Poltawski [Mon, 10 Oct 2016 12:13:08 +0000 (13:13 +0100)]
Merge branch 'MDL-56095-master-fixup' of https://github.com/FMCorz/moodle

6 years agoMDL-56095 output: Moving progress_bar from weblib to outputcomponents
Frédéric Massart [Mon, 10 Oct 2016 10:52:29 +0000 (12:52 +0200)]
MDL-56095 output: Moving progress_bar from weblib to outputcomponents

And revert the change in the order of the require_once in setup.php.

6 years agoMerge branch 'MDL-55597-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 10 Oct 2016 10:33:12 +0000 (11:33 +0100)]
Merge branch 'MDL-55597-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-56178-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 10 Oct 2016 10:22:16 +0000 (11:22 +0100)]
Merge branch 'MDL-56178-master' of git://github.com/FMCorz/moodle

6 years agoMDL-54854 grade: New WS gradereport_overview_view_grade_report
Juan Leyva [Tue, 20 Sep 2016 09:06:11 +0000 (10:06 +0100)]
MDL-54854 grade: New WS gradereport_overview_view_grade_report

6 years agoMDL-54854 grade: New WS gradereport_overview_get_course_grades
Juan Leyva [Sat, 10 Sep 2016 13:33:23 +0000 (14:33 +0100)]
MDL-54854 grade: New WS gradereport_overview_get_course_grades

6 years agoMDL-54854 grade: Refactor gradereport_overview code
Juan Leyva [Sat, 10 Sep 2016 13:31:56 +0000 (14:31 +0100)]
MDL-54854 grade: Refactor gradereport_overview code

6 years agoMerge branch 'MDL-56285-master' of git://github.com/StudiUM/moodle
Dan Poltawski [Mon, 10 Oct 2016 10:14:22 +0000 (11:14 +0100)]
Merge branch 'MDL-56285-master' of git://github.com/StudiUM/moodle

6 years agoMDL-56178 theme_boost: Display drop zones labels
Frédéric Massart [Tue, 4 Oct 2016 12:55:33 +0000 (14:55 +0200)]
MDL-56178 theme_boost: Display drop zones labels

The markup has changed so we now need to target .sr-only rather
than just .accesshide. I did keep the latter in case it's still used
somewhere, in a custom form field for instance.

The ideal solution was to tell QuickForm to display the labels of
those elements in the group. That works for Boost, but that did not
work for Clean. The rendering mechanics of QuickForm decides to not
print the label, unless it's set as hidden... the CSS hack remains.

6 years agoMerge branch 'MDL-56095-master-2nd' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 10 Oct 2016 09:09:46 +0000 (10:09 +0100)]
Merge branch 'MDL-56095-master-2nd' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 10 Oct 2016 08:59:06 +0000 (16:59 +0800)]
Merge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle

6 years agoMerge branch 'MDL-56162-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 10 Oct 2016 08:48:07 +0000 (16:48 +0800)]
Merge branch 'MDL-56162-master' of git://github.com/FMCorz/moodle

6 years agoMDL-56331 tests: update with current coordinates
Dan Poltawski [Mon, 10 Oct 2016 07:58:36 +0000 (08:58 +0100)]
MDL-56331 tests: update with current coordinates

The previous commit will minor updates to pass, but this updates
to current values.

6 years agoMDL-56331 tests: increase tolerance of coordinate tests
Dan Poltawski [Mon, 10 Oct 2016 07:58:36 +0000 (08:58 +0100)]
MDL-56331 tests: increase tolerance of coordinate tests

1) It seems the maxmind database is getting relatively frequent updates
which are causing differences in exact coordinates

2) GeoIP location lookups are not an exact science, I tried to pick some
ips which I thought would remain fairly static, but these things are
just guesses.

3) Moving to 2 decimal places should give us good enough results for
this test, according to:
http://gis.stackexchange.com/questions/8650/measuring-accuracy-of-latitude-and-longitude

  "The second decimal place is worth up to 1.1 km: it can separate one
   village from the next."
  "The third decimal place is worth up to 110 m: it can identify a
   large agricultural field or institutional campus."

6 years agoMerge branch 'MDL-56232-master' of git://github.com/junpataleta/moodle
David Monllao [Mon, 10 Oct 2016 05:27:50 +0000 (13:27 +0800)]
Merge branch 'MDL-56232-master' of git://github.com/junpataleta/moodle

6 years agoMDL-56232 mod_lti: Fix logic for disabling mod_form fields
Jun Pataleta [Mon, 3 Oct 2016 07:31:46 +0000 (15:31 +0800)]
MDL-56232 mod_lti: Fix logic for disabling mod_form fields

* Disable tool "Select content" button if selected preconfigured tool
  does not support Content-Item, and if the selected option is set to
  "Automatic, based on launch URL".
* Disable tool configuration form fields if selected preconfigured tool
  does not support Content-Item, but enable these fields if the selected
  option is set to "Automatic, based on launch URL".
* Behat tests also updated to check disabling/enabling of launch url field.

6 years agoMerge branch 'MDL-56254-master' of git://github.com/FMCorz/moodle
David Monllao [Mon, 10 Oct 2016 05:01:40 +0000 (13:01 +0800)]
Merge branch 'MDL-56254-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-56097' of git://github.com/stronk7/moodle
David Monllao [Mon, 10 Oct 2016 04:57:27 +0000 (12:57 +0800)]
Merge branch 'MDL-56097' of git://github.com/stronk7/moodle

6 years agoMerge branch 'MDL-56216-master' of git://github.com/danpoltawski/moodle
David Monllao [Mon, 10 Oct 2016 04:49:07 +0000 (12:49 +0800)]
Merge branch 'MDL-56216-master' of git://github.com/danpoltawski/moodle

6 years agoMDL-51584 gradebook: use direct $CFG access for freeze.
Russell Smith [Tue, 13 Sep 2016 23:46:43 +0000 (09:46 +1000)]
MDL-51584 gradebook: use direct $CFG access for freeze.

get_config() is called a lot of times on freeze and is expensive,
using $CFG is much lower overhead.

6 years agoMDL-51633 theme_bootstrapbase: Restyled ADD BLOCK to remove max-width.
lazydaisy [Fri, 7 Oct 2016 17:50:46 +0000 (18:50 +0100)]
MDL-51633 theme_bootstrapbase: Restyled ADD BLOCK to remove max-width.

6 years agoMDL-56095 output: Make the progress bar templatable
Frédéric Massart [Fri, 23 Sep 2016 10:40:48 +0000 (12:40 +0200)]
MDL-56095 output: Make the progress bar templatable

The order of inclusion of weblib and outputlib had to change
as the progress_bar (weblib) uses interfaces defined in outputlib.

6 years agoMDL-55835 js: fix lint issues
Dan Poltawski [Fri, 7 Oct 2016 08:54:55 +0000 (09:54 +0100)]
MDL-55835 js: fix lint issues

Some caused by eslint checks being better, some just not detected
because we don't show warnings well (MDL-54930).

6 years agoMDL-55835 eslint: bump to v3.7.1
Dan Poltawski [Thu, 1 Sep 2016 13:27:11 +0000 (14:27 +0100)]
MDL-55835 eslint: bump to v3.7.1

1) Bump eslint verson in npm
2) Enable tabs rule introduced in 3.2.0
3) With rules deprecated in 3.3.0 to their replacements
   http://eslint.org/blog/2016/08/eslint-v3.3.0-released
4) Deprecate the use of M.str (fixes MDLSITE-3646) with new
   no-restricted-properties introduced in 3.5.0
5) Fixup no-unused-vars - remove argsIgnorePattern which shouldn't have allowed
   partial matches and turns out to be uncesssary
   (detected because of https://github.com/eslint/eslint/issues/7250 in 3.6.0)

6 years agoMDL-55597 tool_templatelibrary: Re-inforce logic to skip theme templates
Frédéric Massart [Mon, 19 Sep 2016 13:57:37 +0000 (15:57 +0200)]
MDL-55597 tool_templatelibrary: Re-inforce logic to skip theme templates

6 years agoMDL-56316 tests: Ensure consistent assertion count
Andrew Nicols [Fri, 7 Oct 2016 04:40:41 +0000 (12:40 +0800)]
MDL-56316 tests: Ensure consistent assertion count

6 years agoMDL-56308 cache: Fix APC ready rules for CLI scripts
Russell Smith [Thu, 6 Oct 2016 23:28:23 +0000 (10:28 +1100)]
MDL-56308 cache: Fix APC ready rules for CLI scripts

When APCu is enabled, but the CLI is not it's possible for
calls to enable APCu to fail because it's not configured on the
command line.

6 years agoMDL-56097 install: update the list of stale files for 3.2
Eloy Lafuente (stronk7) [Thu, 22 Sep 2016 22:37:09 +0000 (00:37 +0200)]
MDL-56097 install: update the list of stale files for 3.2

6 years agoweekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 20:31:27 +0000 (22:31 +0200)]
weekly release 3.2dev

6 years agoMerge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 20:25:46 +0000 (22:25 +0200)]
Merge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle

6 years agoMDL-56303 quiz: lack of quiz filtering
Dan Poltawski [Thu, 6 Oct 2016 15:51:00 +0000 (16:51 +0100)]
MDL-56303 quiz: lack of quiz filtering

Also, correctly feed completiongradeitemnumber with grade item numbers
and not with grade item ids.

6 years agoMDL-56306 tests: make upgrade_util_test compatible with travis
Dan Poltawski [Thu, 6 Oct 2016 16:50:58 +0000 (17:50 +0100)]
MDL-56306 tests: make upgrade_util_test compatible with travis

6 years agoMDL-56285 competency: fix move competencies capabilities
Issam Taboubi [Wed, 5 Oct 2016 18:34:35 +0000 (14:34 -0400)]
MDL-56285 competency: fix move competencies capabilities

In learning plan templates, cannot move competencies
around even if capability templatemanage is given
to the role because of bad context check

6 years agoMDL-45388 admin: warn of themedesignermode in /admin/ and perf footer
Dan Poltawski [Thu, 6 Oct 2016 10:15:58 +0000 (11:15 +0100)]
MDL-45388 admin: warn of themedesignermode in /admin/ and perf footer

This is:
a) To help avoid devs going on a wild goose chase to find a perf issue
when it's caused by css building
b) To make it clearer that this should never be enabled on production
sites (we already have a warning in the performance report, but who
looks at that)

Now that boost is the default theme and builds css itself, it's more
critical.

6 years agoweekly release 3.2dev
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 09:51:28 +0000 (11:51 +0200)]
weekly release 3.2dev

6 years agoNOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 09:51:28 +0000 (11:51 +0200)]
NOBUG: Fixed file access permissions

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 6 Oct 2016 09:51:24 +0000 (11:51 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMDL-56216 theme_boost: correct favicon
Dan Poltawski [Thu, 6 Oct 2016 09:45:24 +0000 (10:45 +0100)]
MDL-56216 theme_boost: correct favicon

6 years agoMDL-22078 lib: bump redirect_if_major_update_required()
Dan Poltawski [Thu, 6 Oct 2016 08:23:15 +0000 (09:23 +0100)]
MDL-22078 lib: bump redirect_if_major_update_required()

Changes to the course table enforce an update

6 years agoMerge branch 'wip-mdl-55986-fix-2' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 6 Oct 2016 07:07:16 +0000 (15:07 +0800)]
Merge branch 'wip-mdl-55986-fix-2' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-55986 behat: use double quotes not single
Rajesh Taneja [Thu, 6 Oct 2016 07:03:56 +0000 (15:03 +0800)]
MDL-55986 behat: use double quotes not single

On windows we need option value to be in
double quotes, else it fails

6 years agoMerge branch 'MDL-22078_master-fix' of git://github.com/dmonllao/moodle
Andrew Nicols [Thu, 6 Oct 2016 02:38:24 +0000 (10:38 +0800)]
Merge branch 'MDL-22078_master-fix' of git://github.com/dmonllao/moodle

6 years agoMerge branch 'wip-mdl-55739' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Thu, 6 Oct 2016 02:08:14 +0000 (10:08 +0800)]
Merge branch 'wip-mdl-55739' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-22078 course reset: No enddate time shift if no enddate
David Monllao [Thu, 6 Oct 2016 02:07:22 +0000 (10:07 +0800)]
MDL-22078 course reset: No enddate time shift if no enddate

6 years agoMDL-55739 core_course: Check if gradepass is set and not empty
Rajesh Taneja [Thu, 6 Oct 2016 01:50:21 +0000 (09:50 +0800)]
MDL-55739 core_course: Check if gradepass is set and not empty

Default value of gradepass is 0.00000 and empty check
passes. But on oracle gradepass value is 0, so just
check if the field is set and that should be enough

6 years agoMDL-56092 auth_email: Correct assumed ordering in unit test
Andrew Nicols [Thu, 6 Oct 2016 01:07:08 +0000 (09:07 +0800)]
MDL-56092 auth_email: Correct assumed ordering in unit test

6 years agoMerge branch 'wip-mdl-55713' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 5 Oct 2016 23:58:58 +0000 (01:58 +0200)]
Merge branch 'wip-mdl-55713' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-55713 behat: Include named and partial behat selector files
Rajesh Taneja [Wed, 5 Oct 2016 23:30:37 +0000 (07:30 +0800)]
MDL-55713 behat: Include named and partial behat selector files

6 years agoMDL-53777 tool_mobile: Fix incorrect and untranslated string
Juan Leyva [Wed, 5 Oct 2016 09:44:44 +0000 (10:44 +0100)]
MDL-53777 tool_mobile: Fix incorrect and untranslated string

6 years agoMDL-55923 webservice: Allow user to sign-out systems on pwd change
Juan Leyva [Wed, 28 Sep 2016 08:23:32 +0000 (09:23 +0100)]
MDL-55923 webservice: Allow user to sign-out systems on pwd change

6 years agoMDL-55923 webservice: Add global setting for forcing token deletion
Juan Leyva [Wed, 28 Sep 2016 11:04:01 +0000 (12:04 +0100)]
MDL-55923 webservice: Add global setting for forcing token deletion

6 years agoMerge branch 'MDL-54802-master-fix-2' of git://github.com/cameron1729/moodle
Dan Poltawski [Wed, 5 Oct 2016 13:34:11 +0000 (14:34 +0100)]
Merge branch 'MDL-54802-master-fix-2' of git://github.com/cameron1729/moodle

6 years agoMDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing...
Cameron Ball [Wed, 5 Oct 2016 11:16:33 +0000 (19:16 +0800)]
MDL-54802 mod_quiz: Improve validation when editing a quiz uusing require passing grade

When editing a quiz that is using the require passing grade completion method,
the grade to pass cannot be zero. Since the completion method is locked we
cannot recommend that the completion method is changed (as we do when the quiz
is being created). Instead we have to inform the user that the grade to pass
must not be zero.

6 years agoMerge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 5 Oct 2016 10:22:07 +0000 (12:22 +0200)]
Merge branch 'MDL-22078_master' of https://github.com/dmonllao/moodle

6 years agoMDL-56162 theme_boost: Moodle modals are working and styled for Boost
Frédéric Massart [Wed, 5 Oct 2016 10:14:49 +0000 (12:14 +0200)]
MDL-56162 theme_boost: Moodle modals are working and styled for Boost

6 years agoMerge branch 'MDL-54802-master-fix' of git://github.com/cameron1729/moodle
Dan Poltawski [Wed, 5 Oct 2016 09:33:14 +0000 (10:33 +0100)]
Merge branch 'MDL-54802-master-fix' of git://github.com/cameron1729/moodle

6 years agoMerge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 5 Oct 2016 09:25:30 +0000 (10:25 +0100)]
Merge branch 'MDL-56194-master' of git://github.com/FMCorz/moodle

6 years agoMDL-54802 mod_quiz: Move grade to pass error to require passing grade element
Cameron Ball [Wed, 5 Oct 2016 09:14:00 +0000 (17:14 +0800)]
MDL-54802 mod_quiz: Move grade to pass error to require passing grade element

When using a passing grade of zero, with the required passing grade
option, an error was displayed on the "grade to pass" element.
This was confusing as the error message is referring to the
"Require passing grade" element. This patch moves the message to
the "Require passing grade" element.

Additionaly this patch fixes a small typo in a comment.

6 years agoMerge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle
David Monllao [Wed, 5 Oct 2016 07:51:43 +0000 (15:51 +0800)]
Merge branch 'wip-mdl-56210-fix' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-56210 behat: Test for disabled button later
Rajesh Taneja [Wed, 5 Oct 2016 05:18:36 +0000 (13:18 +0800)]
MDL-56210 behat: Test for disabled button later

With phantomjs, dom is not updated by the time
next step is executed, so suffle it to ensure
this scenario pass

6 years agoMerge branch 'MDL-55713-master-fix' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 5 Oct 2016 07:26:36 +0000 (15:26 +0800)]
Merge branch 'MDL-55713-master-fix' of git://github.com/andrewnicols/moodle

6 years agoMDL-55713 behat: Bad rebase conflict resolution fix
Andrew Nicols [Wed, 5 Oct 2016 07:14:13 +0000 (15:14 +0800)]
MDL-55713 behat: Bad rebase conflict resolution fix

6 years agoMerge branch 'MDL-55129-master' of git://github.com/jleyva/moodle
Dan Poltawski [Wed, 5 Oct 2016 07:08:11 +0000 (08:08 +0100)]
Merge branch 'MDL-55129-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-55767-master-fix1' of http://github.com/damyon/moodle
Andrew Nicols [Wed, 5 Oct 2016 06:24:09 +0000 (14:24 +0800)]
Merge branch 'MDL-55767-master-fix1' of github.com/damyon/moodle

6 years agoMDL-55767 tool_lpimportcsv: Find existing scales on the site
Damyon Wiese [Wed, 5 Oct 2016 06:12:55 +0000 (14:12 +0800)]
MDL-55767 tool_lpimportcsv: Find existing scales on the site

The code was trying to match the imported scale to an existing scale for the site. It was
not loading the items before comparing them, so the matching always failed.

6 years agoMDL-55713 behat: Correct all references to selectortype
Andrew Nicols [Wed, 5 Oct 2016 06:10:24 +0000 (14:10 +0800)]
MDL-55713 behat: Correct all references to selectortype

6 years agoMDL-22078 course: Complete proposed patch
David Monllao [Thu, 1 Sep 2016 05:29:19 +0000 (13:29 +0800)]
MDL-22078 course: Complete proposed patch

- New site setting to define the default course duration (used to set
  the default end date for some course formats)
- End date setting out of restore
- Fix tool_uploadcourse
- Other fixes here and there

6 years agoMDL-55713
Andrew Nicols [Wed, 5 Oct 2016 03:46:49 +0000 (11:46 +0800)]
MDL-55713

6 years agoMDL-56050 core: set missing context to maintenance mode
Simey Lameze [Wed, 5 Oct 2016 03:23:38 +0000 (11:23 +0800)]
MDL-56050 core: set missing context to maintenance mode

6 years agoMDL-55713 behat: Correct copy/paste error
Andrew Nicols [Wed, 5 Oct 2016 03:04:56 +0000 (11:04 +0800)]
MDL-55713 behat: Correct copy/paste error

6 years agoMDL-55999 lib: Update thirdpartylibs.xml and readme_moodle.txt
Simey Lameze [Wed, 5 Oct 2016 02:58:10 +0000 (10:58 +0800)]
MDL-55999 lib: Update thirdpartylibs.xml and readme_moodle.txt

6 years agoMDL-55999 lib: Update ADOdb to version 5.20.7
Simey Lameze [Wed, 5 Oct 2016 02:57:42 +0000 (10:57 +0800)]
MDL-55999 lib: Update ADOdb to version 5.20.7

6 years agoMerge branch 'wip-mdl-56092' of https://github.com/rajeshtaneja/moodle
Andrew Nicols [Wed, 5 Oct 2016 02:08:15 +0000 (10:08 +0800)]
Merge branch 'wip-mdl-56092' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-56092 phpunit: Add auth/tests to phpunit.xml.dist
Rajesh Taneja [Wed, 5 Oct 2016 02:00:21 +0000 (10:00 +0800)]
MDL-56092 phpunit: Add auth/tests to phpunit.xml.dist

6 years agoMerge branch 'wip-mdl-55986-fix' of git://github.com/rajeshtaneja/moodle
David Monllao [Wed, 5 Oct 2016 01:46:36 +0000 (09:46 +0800)]
Merge branch 'wip-mdl-55986-fix' of git://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-45969-master' of git://github.com/damyon/moodle
David Monllao [Wed, 5 Oct 2016 01:42:17 +0000 (09:42 +0800)]
Merge branch 'MDL-45969-master' of git://github.com/damyon/moodle

6 years agoMDL-55986 behat: all options are not valid for single run
Rajesh Taneja [Wed, 5 Oct 2016 01:39:26 +0000 (09:39 +0800)]
MDL-55986 behat: all options are not valid for single run

Sanitize options which are valid for single run only

6 years agoMerge branch 'MDL-56092-master' of git://github.com/jleyva/moodle
Andrew Nicols [Wed, 5 Oct 2016 00:30:35 +0000 (08:30 +0800)]
Merge branch 'MDL-56092-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-56016-master' of git://github.com/FMCorz/moodle
Andrew Nicols [Wed, 5 Oct 2016 00:10:02 +0000 (08:10 +0800)]
Merge branch 'MDL-56016-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-56231-32-flexible_table-construct-phpdoc' of https://github.com...
Eloy Lafuente (stronk7) [Tue, 4 Oct 2016 23:48:49 +0000 (01:48 +0200)]
Merge branch 'MDL-56231-32-flexible_table-construct-phpdoc' of https://github.com/roperto/moodle