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.
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
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 [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
Jake Dallimore [Tue, 13 Sep 2016 04:21:11 +0000 (12:21 +0800)]
MDL-55945 login: fix https support for forgot_password.php
Andrew Nicols [Wed, 14 Sep 2016 01:20:33 +0000 (09:20 +0800)]
MDL-54872 mod_assign: Allocate Unique IDs before tests
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
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
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
Dan Poltawski [Wed, 7 Sep 2016 11:38:08 +0000 (12:38 +0100)]
MDL-55874 report_particiption: fix invalid html
When messaging disabled.
David Monllao [Thu, 8 Sep 2016 05:56:33 +0000 (13:56 +0800)]
weekly release 3.2dev
Rajesh Taneja [Wed, 7 Sep 2016 23:11:10 +0000 (07:11 +0800)]
MDL-55415 phpunit: Option values are set to false by default
Eric Merrill [Wed, 7 Sep 2016 21:13:46 +0000 (17:13 -0400)]
MDL-55725 search: Index proper time modified with indexed files
Juan Leyva [Wed, 7 Sep 2016 13:53:37 +0000 (14:53 +0100)]
MDL-55415 course: Fix unit tests after fixing beat issues
Dan Poltawski [Wed, 7 Sep 2016 10:39:16 +0000 (11:39 +0100)]
Merge branch 'wip-mdl-55415' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 7 Sep 2016 09:09:42 +0000 (17:09 +0800)]
MDL-55415 course: Set default options to false for frontpage
Adrian Greeve [Wed, 7 Sep 2016 06:29:13 +0000 (14:29 +0800)]
MDL-41174 mod_workshop: Added workshop_refresh_events
This function was missing from this activity.
Stephen Bourget [Wed, 7 Sep 2016 01:29:34 +0000 (21:29 -0400)]
MDL-52798 calendar: Move calendar preferences to a user preferences page
This is based on the work of Shamim Rezaie and will also resolve
MDL-52375 and MDL-50378
Jake Dallimore [Fri, 5 Aug 2016 02:34:22 +0000 (10:34 +0800)]
MDL-50803 login: Remove token from URL in forgot password process
Store the token value in the session and redirect to self, thus
removing the token from the URL and eliminating the problem where
the token is exposed via the http referer header.
Juan Leyva [Mon, 11 Jul 2016 11:06:40 +0000 (12:06 +0100)]
MDL-49026 webservice: Remove tokens on password change
Eloy Lafuente (stronk7) [Wed, 7 Sep 2016 01:06:12 +0000 (03:06 +0200)]
Merge branch 'wip-mdl-55764' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 6 Sep 2016 18:30:49 +0000 (20:30 +0200)]
Merge branch 'MDL-55236' of https://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Tue, 6 Sep 2016 14:20:32 +0000 (16:20 +0200)]
Merge branch 'MDL-55618' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Tue, 6 Sep 2016 14:08:17 +0000 (16:08 +0200)]
Merge branch 'wip-MDL-55844-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 6 Sep 2016 13:56:01 +0000 (15:56 +0200)]
Merge branch 'wip-MDL-55832-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 6 Sep 2016 10:47:57 +0000 (11:47 +0100)]
MDL-42125 quiz stats: removal trivial additional phpdocs newline
Dan Poltawski [Tue, 6 Sep 2016 10:46:52 +0000 (11:46 +0100)]
Merge branch 'MDL-42125' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 6 Sep 2016 09:50:49 +0000 (10:50 +0100)]
MDL-55415 course: fix trailing whitespace
Dan Poltawski [Tue, 6 Sep 2016 09:49:39 +0000 (10:49 +0100)]
Merge branch 'MDL-55415-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 6 Sep 2016 07:43:52 +0000 (08:43 +0100)]
Merge branch 'wip-mdl-55749' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 6 Sep 2016 03:30:13 +0000 (11:30 +0800)]
Merge branch 'MDL-55504' of https://github.com/mr-russ/moodle
Russell Smith [Tue, 9 Aug 2016 00:09:23 +0000 (10:09 +1000)]
MDL-55504 profiling: Support for PHPUnit and big profiles.
To support PHPUnit we need to support large profiles, these may
include backups and restores. To do that the following was required;
- gzcompress for database space saving.
- gzcompress for XML DomDocument field to say < 10Mb and allow imports.
- Save PHPUnit runs directly to a file so they can be imported to the normal database.
- Memory allowance on profiling view pages increases to support large profiles.
Rajesh Taneja [Mon, 29 Aug 2016 03:54:36 +0000 (11:54 +0800)]
MDL-55749 badges: define global before using it
David Monllao [Tue, 6 Sep 2016 02:17:49 +0000 (10:17 +0800)]
Merge branch 'MDL-55617' of https://github.com/NeillM/moodle
David Monllao [Tue, 6 Sep 2016 02:15:31 +0000 (10:15 +0800)]
Merge branch 'wip-mdl-55288' of https://github.com/rajeshtaneja/moodle
David Monllao [Tue, 6 Sep 2016 02:07:00 +0000 (10:07 +0800)]
Merge branch 'MDL-55587-master' of git://github.com/cameron1729/moodle
Eloy Lafuente (stronk7) [Mon, 5 Sep 2016 17:23:13 +0000 (19:23 +0200)]
Merge branch 'MDL-55239_m32v1' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Mon, 5 Sep 2016 16:06:40 +0000 (18:06 +0200)]
Merge branch 'MDL-55663-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 5 Sep 2016 16:01:21 +0000 (18:01 +0200)]
Merge branch 'MDL-55717_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 5 Sep 2016 15:33:25 +0000 (17:33 +0200)]
Merge branch 'MDL-55724-master' of https://github.com/sammarshallou/moodle
Juan Leyva [Tue, 2 Aug 2016 13:39:30 +0000 (15:39 +0200)]
MDL-55415 course: New WS core_course_get_user_administration_options
Juan Leyva [Tue, 2 Aug 2016 13:17:14 +0000 (15:17 +0200)]
MDL-55415 course: Move admin options permission check to API
Juan Leyva [Tue, 2 Aug 2016 10:31:40 +0000 (12:31 +0200)]
MDL-55415 course: New WS core_course_get_user_navigation_options
Juan Leyva [Tue, 2 Aug 2016 10:30:10 +0000 (12:30 +0200)]
MDL-55415 webservice: Allow validate_courses to return contexts
Juan Leyva [Tue, 2 Aug 2016 09:49:14 +0000 (11:49 +0200)]
MDL-55415 course: Move options permission check to API
Dan Poltawski [Mon, 5 Sep 2016 13:09:09 +0000 (14:09 +0100)]
Merge branch 'MDL-55627' of https://github.com/bostelm/moodle