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
c307689792
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)
2016-09-19 08:59:39 +01: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
3fad0f1a24
MDL-48766 iplookup: Update to geoip2 db to support ipv6
...
The previous maxmind geoip database is now legacy and the GeoIP2
version supports ipv6.
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
Simey Lameze
12b9401602
MDL-55876 core_course: prevent changes on front page course
2016-09-19 15:45:43 +08:00
David Monllao
9df9382e4d
Merge branch 'MDL-42041-master' of git://github.com/andrewnicols/moodle
2016-09-19 15:08:56 +08:00
David Monllao
564cabb97a
MDL-55837 theme_base: Remove missing file
...
Probably missed during rebase.
2016-09-19 14:59:56 +08:00
David Monllao
073163ffc3
Merge branch 'MDL-55837-master' of git://github.com/damyon/moodle
2016-09-19 14:15:59 +08: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
Andrew Nicols
96872ab271
Merge branch 'MDL-55932-master' of https://github.com/eberhardt/moodle
2016-09-19 08:32:54 +08:00
Henning Bostelmann
4151ed984a
MDL-51361 backup: Adding default settings for course import
...
Also adding "calendar events" and "competencies" default setting for other backup modes.
2016-09-18 23:39:57 +01:00
AMOS bot
e2625817a1
Automatically generated installer lang files
2016-09-17 00:04:27 +08:00
AMOS bot
fdf5335d70
Automatically generated installer lang files
2016-09-16 00:04:42 +08: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
d2c7175a34
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.
2016-09-15 15:32:32 +01: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
Jan Eberhardt
2c99429375
MDL-55932 block_rss_client: Namespace fixes
2016-09-15 13:24:36 +00:00
Dan Poltawski
1f2744851f
weekly release 3.2dev
2016-09-15 11:14:54 +01:00
Dan Poltawski
a8cf3454ce
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2016-09-15 11:14:52 +01:00
David Monllao
37a8e5223d
Merge branch 'MDL-55945-master' of https://github.com/snake/moodle
2016-09-15 12:38:43 +08:00
David Monllao
e71061a22b
MDL-55191 search: Generate an search result viewed event
2016-09-15 09:36:49 +08:00
Jake Dallimore
db8c2cf6d4
MDL-55945 login: fix https support for forgot_password.php
2016-09-15 09:19:39 +08: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
Andrew Nicols
8bdd97a35a
MDL-54872 mod_assign: Allocate Unique IDs before tests
2016-09-14 09:20:33 +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
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
David Monllao
c46432ad6c
Merge branch 'MDL-54872-master' of git://github.com/andrewnicols/moodle
2016-09-13 10:05:26 +08: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)
9579b52372
Merge branch 'wip-MDL-55505-master' of git://github.com/abgreeve/moodle
2016-09-12 19:19:45 +02:00
Eloy Lafuente (stronk7)
4e25d5e5ea
Merge branch 'wip-MDL-55654-master' of git://github.com/marinaglancy/moodle
2016-09-12 19:14:00 +02:00
Eloy Lafuente (stronk7)
61b246fd0e
Merge branch 'MDL-55632-master' of git://github.com/andrewnicols/moodle
2016-09-12 19:12:26 +02:00
Eloy Lafuente (stronk7)
9d821b6faf
Merge branch 'MDL-55874-master' of git://github.com/danpoltawski/moodle
2016-09-12 18:29:42 +02:00
AMOS bot
415fb6ca10
Automatically generated installer lang files
2016-09-13 00:04:35 +08:00
Eloy Lafuente (stronk7)
fa7c2bd050
Merge branch 'MDL-55725-master' of git://github.com/merrill-oakland/moodle
2016-09-12 17:54:59 +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
0fcbfb63a5
Merge branch 'wip-mdl-55353' of https://github.com/rajeshtaneja/moodle
2016-09-12 11:49:33 +01:00
Dan Poltawski
3e6ac53831
Merge branch 'wip-mdl-55759' of https://github.com/rajeshtaneja/moodle
2016-09-12 11:36:18 +01:00