Marina Glancy [Wed, 19 Mar 2014 07:54:07 +0000 (15:54 +0800)]
Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle
Jetha Chan [Wed, 19 Mar 2014 03:17:13 +0000 (16:17 +1300)]
MDL-44582 installer: added check for php json extension
Sam Hemelryk [Wed, 19 Mar 2014 02:44:08 +0000 (15:44 +1300)]
Merge branch 'wip-mdl-44552' of https://github.com/rajeshtaneja/moodle
Marina Glancy [Wed, 19 Mar 2014 02:40:25 +0000 (10:40 +0800)]
MDL-42025 behat: changed behat tag _only_local to _file_upload
Marina Glancy [Wed, 19 Mar 2014 02:22:09 +0000 (10:22 +0800)]
Merge branch 'MDL-43341' of git://github.com/nobelium/moodle
Sam Hemelryk [Wed, 19 Mar 2014 02:04:26 +0000 (15:04 +1300)]
Merge branch 'MDL-44608-master-fix1' of github.com/damyon/moodle
Ankit Agarwal [Wed, 19 Mar 2014 07:16:42 +0000 (15:16 +0800)]
MDL-42890 backups: Updated help string to indicate logging is required
Rajesh Taneja [Thu, 13 Mar 2014 05:19:07 +0000 (13:19 +0800)]
MDL-44552 Events: Fixed wrong id returned in get_url
Marina Glancy [Wed, 19 Mar 2014 01:49:00 +0000 (09:49 +0800)]
Merge branch 'MDL-44141-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Wed, 19 Mar 2014 01:24:50 +0000 (09:24 +0800)]
MDL-44608 task scheduler: Make unit test case insensitive
Eloy Lafuente (stronk7) [Wed, 19 Mar 2014 01:15:17 +0000 (02:15 +0100)]
MDL-41760 move upgrade steps to match 04 version.
In previous (merge) commit, version was moved, on conflict
to 04 (coz 01) was already in use. This commit moves the 3
upgrade steps to 02, 03 and 04, matching that final version.
Eloy Lafuente (stronk7) [Wed, 19 Mar 2014 01:14:00 +0000 (02:14 +0100)]
Merge branch 'MDL-41760-master-v8' of https://github.com/jamiepratt/moodle
Conflicts:
version.php
Eloy Lafuente (stronk7) [Wed, 19 Mar 2014 00:23:08 +0000 (01:23 +0100)]
Merge branch 'MDL-41216' of https://github.com/nobelium/moodle
Eloy Lafuente (stronk7) [Wed, 19 Mar 2014 00:02:51 +0000 (01:02 +0100)]
Merge branch 'MDL-44328-M27' of git://github.com/lazydaisy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
sam marshall [Wed, 26 Feb 2014 14:00:51 +0000 (14:00 +0000)]
MDL-44141 Completion: System updates data during restore
The completion system has code which is supposed to prevent it
updating completion status while grades are being restored. This
code was a nasty hack and had not worked for some time. As a result
completion dates were restored incorrectly.
This commit implements a 'proper' way to find out if a restore is
currently running, replacing the previous hack.
James Pratt [Tue, 11 Mar 2014 08:06:35 +0000 (15:06 +0700)]
MDL-41760 quiz_statistics : response analysis for first/last/all tries
Andreas Grabs [Sun, 16 Mar 2014 21:09:46 +0000 (22:09 +0100)]
MDL-44653 mod_feedback - Include additional name fields using user_picture::fields()
Marina Glancy [Tue, 18 Mar 2014 10:00:42 +0000 (18:00 +0800)]
Merge branch 'MDL-42892-master_42890' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Tue, 18 Mar 2014 08:04:09 +0000 (16:04 +0800)]
MDL-42892 logging: Refactor logstore_legacy to group all legacy related changes together
Marina Glancy [Tue, 18 Mar 2014 09:39:40 +0000 (17:39 +0800)]
Merge branch 'MDL-38636-master' of git://github.com/roelmann/moodle
Ankit Agarwal [Thu, 27 Feb 2014 04:12:54 +0000 (12:12 +0800)]
MDL-42892 logging: Remove usage of logtable from can_delete_course
Marina Glancy [Tue, 18 Mar 2014 09:15:36 +0000 (17:15 +0800)]
MDL-42025 behat: renamed deprecated method
Jerome Mouneyrac [Fri, 14 Feb 2014 01:49:06 +0000 (09:49 +0800)]
MDL-42025 assignfeedback_editpdf: add behat tests
Marina Glancy [Tue, 18 Mar 2014 08:03:47 +0000 (16:03 +0800)]
Merge branch 'w12_MDL-44191_m27_mysql56' of git://github.com/skodak/moodle
David Monllao [Tue, 11 Mar 2014 09:10:03 +0000 (17:10 +0800)]
MDL-44246 behat: New mod_quiz test when JS is disabled
Also including a modification in behat_question_base
to make the internal method work with both JS and non-JS.
Marina Glancy [Tue, 18 Mar 2014 06:45:55 +0000 (14:45 +0800)]
Merge branch 'MDL-44416' of git://github.com/appalachianstate/moodle
Marina Glancy [Tue, 18 Mar 2014 06:33:17 +0000 (14:33 +0800)]
Merge branch 'MDL-44148-master' of git://github.com/jethac/moodle
Jetha Chan [Tue, 18 Mar 2014 06:19:36 +0000 (14:19 +0800)]
MDL-44148 portfolio: set_user_config usage fix
Amended user/portfolio.php's use of portfolio_plugin_base::set_user_config to be consistent with the API.
Marina Glancy [Tue, 18 Mar 2014 05:52:45 +0000 (13:52 +0800)]
Merge branch 'MDL-29807' of git://github.com/jleyva/moodle
Juan Leyva [Tue, 4 Mar 2014 15:58:19 +0000 (16:58 +0100)]
MDL-44444 Add fileurl to mod_assign_get_submissions webservice response parameters
Sam Hemelryk [Tue, 18 Mar 2014 04:04:57 +0000 (17:04 +1300)]
Merge branch 'wip-MDL-44542-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 18 Mar 2014 03:08:29 +0000 (11:08 +0800)]
MDL-44524 feedback: fix bug in sql under oracle
Thanks to Rob King"
Sam Hemelryk [Tue, 18 Mar 2014 02:00:24 +0000 (15:00 +1300)]
Merge branch 'MDL-44505' of https://github.com/bostelm/moodle
Sam Hemelryk [Tue, 18 Mar 2014 01:40:56 +0000 (14:40 +1300)]
Merge branch 'MDL-44502' of https://github.com/bostelm/moodle
Sam Hemelryk [Tue, 18 Mar 2014 01:35:55 +0000 (14:35 +1300)]
Merge branch 'MDL-44433-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 18 Mar 2014 01:32:37 +0000 (14:32 +1300)]
Merge branch 'MDL-44381-M27' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 18 Mar 2014 01:26:56 +0000 (14:26 +1300)]
Merge branch 'mdl44499-master' of https://github.com/tlock/moodle
Sam Hemelryk [Mon, 17 Mar 2014 23:52:19 +0000 (12:52 +1300)]
Merge branch 'w12_MDL-44527_m27_cacert' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 22:48:47 +0000 (11:48 +1300)]
Merge branch 'w12_MDL-44515_m27_phpexcel' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 22:48:21 +0000 (11:48 +1300)]
Merge branch 'w12_MDL-44516_m27_purifier' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 22:48:11 +0000 (11:48 +1300)]
Merge branch 'w12_MDL-44521_m27_tcpdf' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 21:17:04 +0000 (10:17 +1300)]
Merge branch 'w12_MDL-44522_m27_markdown' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 20:43:42 +0000 (09:43 +1300)]
Merge branch 'MDL-44550-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 17 Mar 2014 20:30:39 +0000 (09:30 +1300)]
Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 20:16:09 +0000 (09:16 +1300)]
Merge branch 'w12_MDL-44609_m27_taskcomponent' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 17 Mar 2014 20:03:21 +0000 (09:03 +1300)]
Merge branch 'MDL-44585-master' of https://github.com/StudiUM/moodle
Juan Leyva [Mon, 17 Mar 2014 11:35:20 +0000 (12:35 +0100)]
MDL-29807 Fixed invalid add_record_snapshot references and also inexistent check of empty short names
Marina Glancy [Mon, 17 Mar 2014 10:18:36 +0000 (18:18 +0800)]
Merge branch 'MDL-44588' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 17 Mar 2014 10:12:16 +0000 (18:12 +0800)]
Merge branch 'w12_MDL-44624_m27_dmltest' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 10:08:57 +0000 (18:08 +0800)]
Merge branch 'MDL-44610-m' of git://github.com/micaherne/moodle
Marina Glancy [Mon, 17 Mar 2014 09:53:00 +0000 (17:53 +0800)]
Merge branch 'MDL-44650' of git://github.com/danielneis/moodle
Marina Glancy [Mon, 17 Mar 2014 09:44:45 +0000 (17:44 +0800)]
Merge branch 'w12_MDL-41115_m27_emaillogin' of git://github.com/skodak/moodle
Petr Škoda [Mon, 17 Mar 2014 09:34:45 +0000 (17:34 +0800)]
MDL-41115 fix username field label when allowing login via email
Thanks Marina for spotting this!
Marina Glancy [Mon, 17 Mar 2014 09:08:30 +0000 (17:08 +0800)]
Merge branch 'MDL-44356-M27' of git://github.com/lazydaisy/moodle
Juan Leyva [Wed, 5 Mar 2014 09:45:24 +0000 (10:45 +0100)]
MDL-29807 Control to avoid duplicate shortnames
Juan Leyva [Wed, 5 Mar 2014 09:21:40 +0000 (10:21 +0100)]
MDL-29807 Service add admin page: should be able to enter the unique shortname of a service
Marina Glancy [Mon, 17 Mar 2014 08:20:58 +0000 (16:20 +0800)]
Merge branch 'master_MDL-39568' of git://github.com/danmarsden/moodle
Marina Glancy [Mon, 17 Mar 2014 08:03:08 +0000 (16:03 +0800)]
Merge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 06:38:01 +0000 (14:38 +0800)]
Merge branch 'w12_MDL-44603_m27_extgrade2' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 06:32:28 +0000 (14:32 +0800)]
Merge branch 'w12_MDL-44500_m27_eventcourse' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 06:30:03 +0000 (14:30 +0800)]
Merge branch 'w12_MDL-44635_m27_ajaxlogs' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 05:48:27 +0000 (13:48 +0800)]
Merge branch 'w12_MDL-44339_m27_testdebug' of git://github.com/skodak/moodle
Marina Glancy [Mon, 17 Mar 2014 05:03:18 +0000 (13:03 +0800)]
Merge branch 'w12_MDL-44432_m27_logcron' of git://github.com/skodak/moodle
Petr Škoda [Mon, 17 Mar 2014 04:57:21 +0000 (12:57 +0800)]
MDL-44603 fix incorrect hint for grades related class location
Thanks Marina!
Petr Škoda [Sat, 15 Mar 2014 05:48:41 +0000 (13:48 +0800)]
MDL-44635 discard error logging during ajax tests
Sam Hemelryk [Sun, 16 Mar 2014 23:37:02 +0000 (12:37 +1300)]
Merge branch 'MDL-44608-master' of git://github.com/damyon/moodle
Petr Škoda [Wed, 12 Mar 2014 08:04:36 +0000 (16:04 +0800)]
MDL-44300 force PHP 5.6.x to return raw file names for our own guessing
Sam Hemelryk [Sun, 16 Mar 2014 23:10:48 +0000 (12:10 +1300)]
Merge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle
Trevor Cunningham [Sun, 16 Mar 2014 19:59:08 +0000 (08:59 +1300)]
MDL-39568 gradinform_guide: show maxgrade to students when viewing marking guide
Mary Evans [Sat, 15 Mar 2014 21:22:11 +0000 (21:22 +0000)]
MDL-44356 theme_bootstrapbase: Centralize the drag and drop arrow in filemanager.
roelmann [Sat, 15 Mar 2014 20:45:58 +0000 (20:45 +0000)]
Make hidden items more visible in breadcrumb
modified: theme/serenity/style/core.css
Mary Evans [Sat, 15 Mar 2014 14:34:13 +0000 (14:34 +0000)]
MDL-44381 theme_brick: Removed whitespace and reference to arialist theme in config.php.
Nobelium [Sat, 15 Mar 2014 11:00:58 +0000 (11:00 +0000)]
MDL-41216 scorm: style.css now follows block format
Petr Škoda [Sat, 15 Mar 2014 03:10:10 +0000 (11:10 +0800)]
MDL-44603 bump version to update web services
Petr Škoda [Sat, 15 Mar 2014 03:08:21 +0000 (11:08 +0800)]
MDL-44603 fix core_grading_external class and test location
Petr Škoda [Sat, 15 Mar 2014 02:53:39 +0000 (10:53 +0800)]
MDL-44603 add support for external service autoloading
Nobelium [Fri, 14 Mar 2014 22:16:07 +0000 (22:16 +0000)]
MDL-43341 SCORM Report: spacer.gif must be managed with $OUTPUT->spacer
Daniel Neis Araujo [Fri, 14 Mar 2014 21:31:29 +0000 (18:31 -0300)]
MDL-44650 Remove invalid meta tags "pragma" and "expires"
Henning Bostelmann [Fri, 7 Mar 2014 16:06:55 +0000 (16:06 +0000)]
MDL-44505 mod_forum: Make mailing subject a configurable language string
Henning Bostelmann [Fri, 7 Mar 2014 14:57:24 +0000 (14:57 +0000)]
MDL-44502 filelib: Add mimetype for Maple worksheets
Gilles-Philippe Leblanc [Thu, 13 Mar 2014 13:35:43 +0000 (09:35 -0400)]
MDL-44585 grade_import: Restrict the accepted types in the gradebook import
Petr Škoda [Fri, 14 Mar 2014 07:00:26 +0000 (15:00 +0800)]
MDL-44609 add component column to the scheduled task table
Petr Škoda [Fri, 14 Mar 2014 06:14:10 +0000 (14:14 +0800)]
MDL-44624 fix false failures in DML tests
Petr Škoda [Thu, 13 Mar 2014 04:06:13 +0000 (12:06 +0800)]
MDL-44599 undeprecate SITEID
There is no way we could implement multitenant now,
it means there is no reason to deprecate SITEID.
Petr Škoda [Mon, 10 Mar 2014 06:54:41 +0000 (14:54 +0800)]
MDL-44527 import latest certificate bundle
Petr Škoda [Mon, 10 Mar 2014 04:19:08 +0000 (12:19 +0800)]
MDL-44522 import markdown 1.4.0
Petr Škoda [Mon, 10 Mar 2014 06:05:33 +0000 (14:05 +0800)]
MDL-44521 import TCPDF 6.0.062
Petr Škoda [Sun, 9 Mar 2014 07:01:29 +0000 (15:01 +0800)]
MDL-44516 import htmlpurifier 4.6.0
Petr Škoda [Sun, 9 Mar 2014 05:50:54 +0000 (13:50 +0800)]
MDL-44515 import latest PHPExcel 1.8.0
Petr Škoda [Fri, 7 Mar 2014 07:07:33 +0000 (15:07 +0800)]
MDL-44500 detect context-courseid inconsistencies in new events
Ankit Agarwal [Mon, 17 Feb 2014 06:33:00 +0000 (14:33 +0800)]
MDL-42890 backup: Remove usage of log table in backup cron helper
Ankit Agarwal [Mon, 17 Feb 2014 06:25:18 +0000 (14:25 +0800)]
MDL-42890 tool_log Default legacy reader should handle CRUD queries
Petr Škoda [Thu, 13 Mar 2014 08:01:53 +0000 (16:01 +0800)]
MDL-44432 use new task scheduler in new logging plugins
Petr Škoda [Thu, 13 Mar 2014 07:31:39 +0000 (15:31 +0800)]
MDL-44604 fix task cleanup in plugin uninstallation
Damyon Wiese [Fri, 14 Mar 2014 03:43:13 +0000 (11:43 +0800)]
MDL-44608 Scheduled Tasks: Use $CFG->timezone if it is set to schedule tasks
Petr Škoda [Thu, 13 Mar 2014 05:52:31 +0000 (13:52 +0800)]
MDL-44339 treat unexpected debugging() calls in phpunit tests as errors
Petr Škoda [Tue, 11 Mar 2014 05:33:36 +0000 (13:33 +0800)]
MDL-44191 hack around MySQL 5.6 inability to lower auto_increment
Petr Škoda [Tue, 11 Mar 2014 01:07:21 +0000 (09:07 +0800)]
MDL-43604 add support for future hacky MariaDB versions
This patch also shows the real server version without
normalisation on the environment page, this should
hopefully help people to identify MariaDB...
Petr Škoda [Thu, 13 Mar 2014 03:23:26 +0000 (11:23 +0800)]
MDL-41115 add option to allow login via email
Fred Woolard [Sat, 1 Mar 2014 19:30:48 +0000 (14:30 -0500)]
MDL-44416 Correct detail view paging
