Eloy Lafuente (stronk7) [Tue, 20 Sep 2016 15:36:51 +0000 (17:36 +0200)]
Merge branch 'MDL-45752_m32v3' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 20 Sep 2016 10:27:35 +0000 (12:27 +0200)]
MDL-55405 enrol_paypal: Fix set_context() call
Note that setting the page context more than once is not ideal
but as far as system->course switches are allowed, this should
not hurt, while providing more accurate messages than keeping
system context.
Eloy Lafuente (stronk7) [Tue, 20 Sep 2016 10:21:37 +0000 (12:21 +0200)]
Merge branch 'MDL-55405-master' of git://github.com/cameron1729/moodle
Eloy Lafuente (stronk7) [Tue, 20 Sep 2016 10:13:10 +0000 (12:13 +0200)]
Merge branch 'MDL-55124' of https://github.com/mr-russ/moodle
Russell Smith [Tue, 5 Jul 2016 22:16:45 +0000 (08:16 +1000)]
MDL-55124 database: Allow option to not send options.
pgbouncer doesn't accept the PostgreSQL options command as it can't
process it. If you are using pgBouncer you need to make sure your
database is configured to set client encoding and standard_conforming_strings
correctly on each connection. pgBouncer can do this, as can ALTER
commands.
Also using sockets without a filename did not allow different ports to work.
This is because you either specify a filename which includes a port or
you just specify a port and libpq works out the correct socket location.
Dan Poltawski [Tue, 20 Sep 2016 08:31:41 +0000 (09:31 +0100)]
Merge branch 'MDL-55916-maintmode-503-moodle' of https://github.com/brendanheywood/moodle
Cameron Ball [Tue, 2 Aug 2016 08:14:55 +0000 (16:14 +0800)]
MDL-55405 enrol_paypal: Create utility class
Some helper functions were in the IPN file. They really should be
in their own utility class to facilitate better testing.
Andrew Nicols [Tue, 20 Sep 2016 04:21:41 +0000 (12:21 +0800)]
MDL-51361 backup: Documentation phpcs fix
Andrew Nicols [Tue, 20 Sep 2016 03:58:24 +0000 (11:58 +0800)]
Merge branch 'MDL-51361' of https://github.com/bostelm/moodle
Andrew Nicols [Tue, 20 Sep 2016 03:41:03 +0000 (11:41 +0800)]
Merge branch 'MDL-55191_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Tue, 20 Sep 2016 03:19:28 +0000 (11:19 +0800)]
MDL-55327 mod_lesson: Whitespace fix
Andrew Nicols [Tue, 20 Sep 2016 03:15:54 +0000 (11:15 +0800)]
Merge branch 'wip-MDL-55327-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Sun, 18 Sep 2016 04:54:42 +0000 (12:54 +0800)]
MDL-55327 mod_lesson: Behat test for page duplication.
Adrian Greeve [Sun, 11 Sep 2016 07:56:28 +0000 (15:56 +0800)]
MDL-55327 mod_lesson: Unit tests for the new function
Adrian Greeve [Tue, 26 Jul 2016 11:26:16 +0000 (19:26 +0800)]
MDL-55327 mod_lesson: Added the ability to duplicate pages.
Brendan Heywood [Wed, 14 Sep 2016 08:15:21 +0000 (18:15 +1000)]
MDL-55916 setup: Maintenance mode serves HTTP 503
Andrew Nicols [Tue, 20 Sep 2016 01:10:43 +0000 (09:10 +0800)]
Merge branch 'MDL-55876-master' of git://github.com/lameze/moodle
Andrew Nicols [Tue, 20 Sep 2016 00:17:37 +0000 (08:17 +0800)]
Merge branch 'MDL-55586-master' of https://github.com/StudiUM/moodle
Eloy Lafuente (stronk7) [Tue, 20 Sep 2016 00:06:32 +0000 (02:06 +0200)]
Merge branch 'wip-mdl-55379' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 19 Sep 2016 23:02:06 +0000 (01:02 +0200)]
Merge branch 'wip-MDL-55827-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 19 Sep 2016 22:51:36 +0000 (00:51 +0200)]
Merge branch 'MDL-55856-master' of git://github.com/danpoltawski/moodle
Ruslan Kabalin [Fri, 2 Sep 2016 10:38:22 +0000 (11:38 +0100)]
MDL-55776 enrol: Optimise enrolled users listing.
Here we optimise SQL queries for enrolled users list. Expensive subquery is
replaced with faster LEFT JOIN and the whole groups filtering component is
aded on demand.
Ruslan Kabalin [Fri, 2 Sep 2016 10:36:43 +0000 (11:36 +0100)]
MDL-55776 enrol: Add unit tests for enrolment manager.
Issam Taboubi [Wed, 14 Sep 2016 15:31:39 +0000 (11:31 -0400)]
MDL-55586 report_competency: Translation strings in competencies
Issam Taboubi [Wed, 14 Sep 2016 15:26:02 +0000 (11:26 -0400)]
MDL-55586 blocks_lp: Translation strings in competencies
Dan Poltawski [Mon, 19 Sep 2016 10:39:41 +0000 (11:39 +0100)]
Merge branch 'wip-mdl-55117' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 19 Sep 2016 10:32:19 +0000 (11:32 +0100)]
Merge branch 'master_MDL-55820' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 19 Sep 2016 10:25:12 +0000 (11:25 +0100)]
Merge branch 'MDL-55944' of https://github.com/mr-russ/moodle
Eloy Lafuente (stronk7) [Mon, 19 Sep 2016 09:51:08 +0000 (11:51 +0200)]
Merge branch 'wip-MDL-29332-master-3' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 19 Sep 2016 09:30:34 +0000 (10:30 +0100)]
MDL-48766 thirdpartylibs: fix incorrect casing on path
David Monllao [Mon, 19 Sep 2016 08:38:17 +0000 (16:38 +0800)]
Merge branch 'MDL-48766-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 15 Sep 2016 11:42:57 +0000 (12:42 +0100)]
MDL-48766 tests: move from Liberec to Cambridge
(liberec ip seemed to have been identified as a new location nearby now,
hoping cambridge will be stable)
Dan Poltawski [Thu, 26 Nov 2015 12:49:21 +0000 (12:49 +0000)]
MDL-48766 lib: remove unused pear::Net::GeoIP
This was used for the previous geoip database.
Dan Poltawski [Thu, 26 Nov 2015 13:00:20 +0000 (13:00 +0000)]
MDL-48766 iplookup: Update to geoip2 db to support ipv6
The previous maxmind geoip database is now legacy and the GeoIP2
version supports ipv6.
Dan Poltawski [Thu, 26 Nov 2015 12:50:34 +0000 (12:50 +0000)]
MDL-48766 lib: Import MaxMind GeoIP2 PHP API
No changes from the upstream version have been made, it is recommended by
upstream to install these depdencies via composer - but the composer
installation is bundled with a load of test files, shell scripts etc (and
we don't use composer to manage 'production dependencies') so we have to
do it manually.
Simey Lameze [Thu, 15 Sep 2016 07:06:53 +0000 (15:06 +0800)]
MDL-55876 core_course: prevent changes on front page course
David Monllao [Mon, 19 Sep 2016 07:08:56 +0000 (15:08 +0800)]
Merge branch 'MDL-42041-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 19 Sep 2016 06:59:56 +0000 (14:59 +0800)]
MDL-55837 theme_base: Remove missing file
Probably missed during rebase.
David Monllao [Mon, 19 Sep 2016 06:15:59 +0000 (14:15 +0800)]
Merge branch 'MDL-55837-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 19 Sep 2016 05:34:21 +0000 (13:34 +0800)]
MDL-55837 themes: base and canvas themes removed
Look for them in the plugins DB if you still need them.
Marina Glancy [Mon, 19 Sep 2016 02:37:43 +0000 (10:37 +0800)]
MDL-29332 question: calculated variables may differ in case only
Andrew Nicols [Mon, 19 Sep 2016 00:32:54 +0000 (08:32 +0800)]
Merge branch 'MDL-55932-master' of https://github.com/eberhardt/moodle
Henning Bostelmann [Thu, 4 Aug 2016 14:20:28 +0000 (15:20 +0100)]
MDL-51361 backup: Adding default settings for course import
Also adding "calendar events" and "competencies" default setting for other backup modes.
Eloy Lafuente (stronk7) [Wed, 14 Sep 2016 00:57:06 +0000 (02:57 +0200)]
MDL-29332 tests: Cover the new sql_equal() function
- For CS, CI and AS
- Not for AI (it's not cross-db)
- equal (=) and not equal (<>)
- delete old test_sql_binary_equal() now with cross-db solution.
Eloy Lafuente (stronk7) [Tue, 13 Sep 2016 01:38:56 +0000 (03:38 +0200)]
MDL-29332 dml: new sql_equal() to force cs/ci behavior on varchar matching
Dan Poltawski [Mon, 5 Sep 2016 13:54:01 +0000 (14:54 +0100)]
MDL-55856 grunt: fail gracefully when node version too old
Unfortunately the engine requirement in packages.json is not a fatal
error, so you can get unhelpful errors with grunt if using an
unsupported version.
Dan Poltawski [Fri, 5 Feb 2016 14:56:01 +0000 (14:56 +0000)]
MDL-48766 moodlelib: introduce ip_is_public()
For determining if an IP is publicly addressable
Jan Eberhardt [Mon, 12 Sep 2016 12:30:46 +0000 (12:30 +0000)]
MDL-55932 block_rss_client: Namespace fixes
Dan Poltawski [Thu, 15 Sep 2016 10:14:54 +0000 (11:14 +0100)]
weekly release 3.2dev
Dan Poltawski [Thu, 15 Sep 2016 10:14:52 +0000 (11:14 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
David Monllao [Thu, 15 Sep 2016 04:38:43 +0000 (12:38 +0800)]
Merge branch 'MDL-55945-master' of https://github.com/snake/moodle
David Monllao [Wed, 7 Sep 2016 04:47:50 +0000 (12:47 +0800)]
MDL-55191 search: Generate an search result viewed event
Jake Dallimore [Tue, 13 Sep 2016 04:21:11 +0000 (12:21 +0800)]
MDL-55945 login: fix https support for forgot_password.php
Rajesh Taneja [Wed, 14 Sep 2016 02:46:19 +0000 (10:46 +0800)]
MDL-55117 behat: Re-initialise to ensure modified config is not used
As behat cli process is 1 run for features
Any modification in will be reflected
in later runs on cli. In this case
- disabling enablebadges in block_badges.feature
- reflected while running cron in award_badges.feature
Andrew Nicols [Wed, 14 Sep 2016 01:20:33 +0000 (09:20 +0800)]
MDL-54872 mod_assign: Allocate Unique IDs before tests
Russell Smith [Mon, 12 Sep 2016 22:28:35 +0000 (08:28 +1000)]
MDL-55944 testing: Reduce sleep usage.
Remove sleep() and replace with waiting for a second to roll over,
this results in a simpler call the guarantee time() has moved forward
Eloy Lafuente (stronk7) [Tue, 13 Sep 2016 23:38:51 +0000 (01:38 +0200)]
Merge branch 'wip-mdl-55466' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Tue, 16 Aug 2016 04:57:15 +0000 (12:57 +0800)]
MDL-55466 lib: Create clean alternateloginurl
Stephen Bourget [Tue, 13 Sep 2016 23:23:59 +0000 (19:23 -0400)]
MDL-45752 Course: Add additional events
Dan Poltawski [Tue, 13 Sep 2016 13:56:27 +0000 (14:56 +0100)]
Merge branch 'wip-MDL-55864-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 13 Sep 2016 09:05:57 +0000 (10:05 +0100)]
Dan Poltawski [Tue, 13 Sep 2016 08:40:33 +0000 (09:40 +0100)]
Merge branch 'MDL-55791_master' of https://github.com/Syxton/moodle
Ryan Wyllie [Tue, 23 Aug 2016 03:33:31 +0000 (03:33 +0000)]
MDL-55727 javascript: Add modal module
David Monllao [Tue, 13 Sep 2016 02:05:26 +0000 (10:05 +0800)]
Merge branch 'MDL-54872-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Tue, 6 Sep 2016 02:09:49 +0000 (10:09 +0800)]
MDL-55864 general: fix PHP7.1 strict warnings
Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 17:37:40 +0000 (19:37 +0200)]
Merge branch 'wip-MDL-55123-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 17:19:45 +0000 (19:19 +0200)]
Merge branch 'wip-MDL-55505-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 17:14:00 +0000 (19:14 +0200)]
Merge branch 'wip-MDL-55654-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 17:12:26 +0000 (19:12 +0200)]
Merge branch 'MDL-55632-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 16:29:42 +0000 (18:29 +0200)]
Merge branch 'MDL-55874-master' of git://github.com/danpoltawski/moodle
AMOS bot [Mon, 12 Sep 2016 16:04:35 +0000 (00:04 +0800)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 15:54:59 +0000 (17:54 +0200)]
Merge branch 'MDL-55725-master' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Mon, 12 Sep 2016 15:34:21 +0000 (17:34 +0200)]
Merge branch 'MDL-55755_master' of git://github.com/dmonllao/moodle
Matt Davidson [Mon, 12 Sep 2016 14:37:25 +0000 (10:37 -0400)]
MDL-55791 admin: maintenance mode access capability
Add capability to allow certain non-admin users through maintenance
mode.
Dan Poltawski [Mon, 12 Sep 2016 11:17:40 +0000 (12:17 +0100)]
Merge branch 'MDL-52798_m32v2' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 12 Sep 2016 10:49:33 +0000 (11:49 +0100)]
Merge branch 'wip-mdl-55353' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 12 Sep 2016 10:36:18 +0000 (11:36 +0100)]
Merge branch 'wip-mdl-55759' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 12 Sep 2016 09:18:18 +0000 (10:18 +0100)]
Merge branch 'wip-mdl-55610' of https://github.com/rajeshtaneja/moodle
David Monllao [Mon, 12 Sep 2016 04:49:27 +0000 (12:49 +0800)]
Merge branch 'MDL-55122-master' of git://github.com/lameze/moodle
David Monllao [Mon, 12 Sep 2016 04:37:44 +0000 (12:37 +0800)]
Merge branch 'MDL-55626-MASTER' of git://github.com/lazydaisy/moodle
Marina Glancy [Mon, 12 Sep 2016 03:56:33 +0000 (11:56 +0800)]
MDL-55123 forms: do not call non-static methods statically
this breaks in PHP7.1
Marina Glancy [Mon, 12 Sep 2016 03:56:04 +0000 (11:56 +0800)]
MDL-55123 forms: correctly create elements in unittests
David Monllao [Mon, 12 Sep 2016 03:55:51 +0000 (11:55 +0800)]
Merge branch 'MDL-55873-master' of git://github.com/lameze/moodle
Simey Lameze [Wed, 7 Sep 2016 04:41:24 +0000 (12:41 +0800)]
MDL-55873 login: change back username fields to use PARAM_RAW
Rajesh Taneja [Wed, 7 Sep 2016 05:16:09 +0000 (13:16 +0800)]
MDL-55379 phpunit: Fix dir separator for cli commands
Rajesh Taneja [Tue, 16 Aug 2016 06:57:02 +0000 (14:57 +0800)]
MDL-55379 phpunit: Fixed hint_result for rerun
Andrew Nicols [Thu, 9 Jun 2016 00:53:46 +0000 (08:53 +0800)]
MDL-54872 assign: Order blindly marked assignments more blindly
Ryan Wyllie [Thu, 25 Aug 2016 06:27:46 +0000 (06:27 +0000)]
MDL-55727 javascript: add custom interaction event module
Ryan Wyllie [Thu, 25 Aug 2016 06:25:14 +0000 (06:25 +0000)]
MDL-55727 templates: add loading icon template
lazydaisy [Thu, 18 Aug 2016 16:30:53 +0000 (17:30 +0100)]
MDL-55626 theme_clean: Fixed clean theme missing desktop-first-column
Marina Glancy [Sat, 20 Aug 2016 13:56:25 +0000 (21:56 +0800)]
MDL-55654 user: apply format_string to field names
Rajesh Taneja [Fri, 9 Sep 2016 00:51:03 +0000 (08:51 +0800)]
MDL-55353 behat: Ensure teacher edit activity at different time
Recent activity is showing activities which were
updated since user last logged in and first modification
done on the activity. So ensure update happens at different
time than activity created.
Simey Lameze [Tue, 6 Sep 2016 07:19:04 +0000 (15:19 +0800)]
MDL-55122 enrol: remove duplicated updown variable
Simey Lameze [Thu, 1 Sep 2016 02:49:38 +0000 (10:49 +0800)]
MDL-53893 core_badges: Behat for all selected roles award badges
Simey Lameze [Wed, 31 Aug 2016 06:07:38 +0000 (14:07 +0800)]
MDL-53893 core_badges: Add strictness to manual badge criteria
David Monllao [Mon, 29 Aug 2016 08:15:22 +0000 (16:15 +0800)]
MDL-55755 search: Correct event link
Adrian Greeve [Mon, 5 Sep 2016 03:33:56 +0000 (11:33 +0800)]
MDL-55505 mod_assign: Editing previous attempt works correctly.
Editing a previous attempt keeps the current feedback and grades
as it should and does not override them.
Dan Poltawski [Thu, 8 Sep 2016 09:25:48 +0000 (10:25 +0100)]
weekly release 3.2dev
Dan Poltawski [Thu, 8 Sep 2016 08:15:14 +0000 (09:15 +0100)]
Merge branch 'MDL-55504_no-phpunit-utils' of git://github.com/dmonllao/moodle
David Monllao [Thu, 8 Sep 2016 07:32:46 +0000 (15:32 +0800)]
MDL-55504 profiling: No profiling for PHPUNIT_UTIL stuff