Eloy Lafuente (stronk7)
349a6430e6
Merge branch 'MDL-45752_m32v3' of https://github.com/sbourget/moodle
2016-09-20 17:36:51 +02:00
Eloy Lafuente (stronk7)
ce7863ba36
Merge branch 'MDL-55124' of https://github.com/mr-russ/moodle
2016-09-20 12:13:10 +02:00
Russell Smith
f834a8f5eb
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.
2016-09-20 19:53:01 +10:00
Dan Poltawski
89ae98f134
Merge branch 'MDL-55916-maintmode-503-moodle' of https://github.com/brendanheywood/moodle
2016-09-20 09:31:41 +01:00
Andrew Nicols
674de8e51e
Merge branch 'MDL-55191_master' of git://github.com/dmonllao/moodle
2016-09-20 11:41:03 +08:00
Brendan Heywood
f1c6d647bc
MDL-55916 setup: Maintenance mode serves HTTP 503
2016-09-20 11:59:39 +10:00
Marina Glancy
2b1c3e4d68
MDL-55990 tags: remove unnecessary index creation
2016-09-20 09:30:40 +08:00
Adrian Greeve
6965ffe041
MDL-55519 activities: mform element shows correct maxgrade.
...
In certain circumstances the max grade value would revert
back to the default max grade value.
2016-09-20 08:56:24 +08:00
Eloy Lafuente (stronk7)
0f4b338fbb
Merge branch 'wip-mdl-55379' of https://github.com/rajeshtaneja/moodle
2016-09-20 02:06:32 +02:00
Eloy Lafuente (stronk7)
8dcc999d96
Merge branch 'wip-MDL-55827-master' of git://github.com/marinaglancy/moodle
2016-09-20 01:02:06 +02:00
Dan Poltawski
771a8d3394
Merge branch 'wip-mdl-55117' of https://github.com/rajeshtaneja/moodle
2016-09-19 11:39:41 +01:00
Dan Poltawski
daa571af9f
Merge branch 'MDL-55944' of https://github.com/mr-russ/moodle
2016-09-19 11:25:12 +01:00
Eloy Lafuente (stronk7)
cecba1d92e
Merge branch 'wip-MDL-29332-master-3' of git://github.com/marinaglancy/moodle
2016-09-19 11:51:08 +02:00
Dan Poltawski
a878a09bce
MDL-48766 thirdpartylibs: fix incorrect casing on path
2016-09-19 10:30:34 +01:00
David Monllao
9b0cc781c5
Merge branch 'MDL-48766-master' of git://github.com/danpoltawski/moodle
2016-09-19 16:38:17 +08:00
Dan Poltawski
0ddc7e5582
MDL-48766 lib: remove unused pear::Net::GeoIP
...
This was used for the previous geoip database.
2016-09-19 08:59:39 +01:00
Dan Poltawski
eacc36a26b
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.
2016-09-19 08:59:38 +01:00
Damyon Wiese
644fcbb629
MDL-55837 themes: base and canvas themes removed
...
Look for them in the plugins DB if you still need them.
2016-09-19 13:35:13 +08:00
Marina Glancy
e7ba25f1b1
MDL-29332 question: calculated variables may differ in case only
2016-09-19 10:37:43 +08:00
David Mudrák
d676f6bd19
MDL-55987 gradebook: Claim extra memory when updating final grades
...
As we experienced in a bigger moodle.org course (7500 users, 70 grade
items), the standard memory limit 256M may not be enough here. We were
not able to find any obvious memory leak in the processing. Requiring
extra memory helped in this particular case and it seems reasonable to
have it in the core.
2016-09-16 12:39:47 +02:00
Juan Leyva
08d7965e63
MDL-55928 gradereport_user: New WS for retrieve grade items
...
It includes a refactor of the complete externallib.
Previously it was not possible to filter the report by groups.
2016-09-16 09:55:14 +01:00
Eloy Lafuente (stronk7)
03d27c303d
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.
2016-09-15 16:33:08 +02:00
Eloy Lafuente (stronk7)
9d5c12bee4
MDL-29332 dml: new sql_equal() to force cs/ci behavior on varchar matching
2016-09-15 16:33:00 +02:00
Dan Poltawski
054da30ba9
MDL-48766 moodlelib: introduce ip_is_public()
...
For determining if an IP is publicly addressable
2016-09-15 14:53:14 +01:00
David Monllao
e71061a22b
MDL-55191 search: Generate an search result viewed event
2016-09-15 09:36:49 +08:00
David Monllao
8beee5a449
MDL-55921 profiling: Adding missing vars
2016-09-14 13:48:38 +10:00
Russell Smith
ff3b8f6c89
MDL-55921 profiling: Enable util script to be profiled.
...
Enable util scripts to be profiled again and ensure
that non-util script runs that don't include version.php
are also able to provide some output.
See David's commit for how export ensures version is used.
2016-09-14 13:48:15 +10:00
Rajesh Taneja
a396321e44
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
2016-09-14 10:46:19 +08:00
Russell Smith
74ee9d29d2
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
2016-09-14 09:49:30 +10:00
Eloy Lafuente (stronk7)
b5830334e7
Merge branch 'wip-mdl-55466' of https://github.com/rajeshtaneja/moodle
2016-09-14 01:38:51 +02:00
Rajesh Taneja
234e1449a1
MDL-55466 lib: Create clean alternateloginurl
2016-09-14 07:37:08 +08:00
Stephen Bourget
768e3613a9
MDL-45752 Course: Add additional events
2016-09-13 19:23:59 -04:00
Dan Poltawski
5d602e314b
Merge branch 'wip-MDL-55864-master' of git://github.com/marinaglancy/moodle
2016-09-13 14:56:27 +01:00
Pau Ferrer Ocaña
9201a00a5d
MDL-55951 output: Add errorcode to fatal_error when available
2016-09-13 15:30:01 +02:00
Dan Poltawski
eb81115f20
Merge commit ' 2bcef5594a
'
2016-09-13 10:05:57 +01:00
Dan Poltawski
3ec4a8085c
Merge branch 'MDL-55791_master' of https://github.com/Syxton/moodle
2016-09-13 09:40:33 +01:00
Ryan Wyllie
2bcef5594a
MDL-55727 javascript: Add modal module
2016-09-13 02:44:30 +00:00
Marina Glancy
9e21f12dbd
MDL-55864 general: fix PHP7.1 strict warnings
2016-09-13 09:39:26 +08:00
Eloy Lafuente (stronk7)
ed55d47d03
Merge branch 'wip-MDL-55123-master' of git://github.com/marinaglancy/moodle
2016-09-12 19:37:40 +02:00
Eloy Lafuente (stronk7)
b8c5fc8620
Merge branch 'MDL-55755_master' of git://github.com/dmonllao/moodle
2016-09-12 17:34:21 +02:00
Matt Davidson
59c66f926f
MDL-55791 admin: maintenance mode access capability
...
Add capability to allow certain non-admin users through maintenance
mode.
2016-09-12 10:37:25 -04:00
Dan Poltawski
2a786e7bad
Merge branch 'MDL-52798_m32v2' of https://github.com/sbourget/moodle
2016-09-12 12:17:40 +01:00
Dan Poltawski
3e6ac53831
Merge branch 'wip-mdl-55759' of https://github.com/rajeshtaneja/moodle
2016-09-12 11:36:18 +01:00
Dan Poltawski
4bbe995c89
Merge branch 'wip-mdl-55610' of https://github.com/rajeshtaneja/moodle
2016-09-12 10:18:18 +01:00
Marina Glancy
721e2def56
MDL-55123 forms: do not call non-static methods statically
...
this breaks in PHP7.1
2016-09-12 12:06:18 +08:00
Marina Glancy
64c45a2928
MDL-55123 forms: correctly create elements in unittests
2016-09-12 11:56:04 +08:00
Rajesh Taneja
1b319d3d3b
MDL-55379 phpunit: Fix dir separator for cli commands
2016-09-12 09:48:40 +08:00
Rajesh Taneja
a7f202de4e
MDL-55379 phpunit: Fixed hint_result for rerun
2016-09-12 09:48:39 +08:00
Ryan Wyllie
e845b96b83
MDL-55727 javascript: add custom interaction event module
2016-09-12 01:22:20 +00:00
Ryan Wyllie
57a4aba799
MDL-55727 templates: add loading icon template
2016-09-12 01:22:19 +00:00