Dan Poltawski [Tue, 30 Sep 2014 13:35:29 +0000 (14:35 +0100)]
Merge branch 'MDL-45893-master-fix' of https://github.com/jethac/moodle
Jetha Chan [Tue, 30 Sep 2014 13:15:44 +0000 (21:15 +0800)]
MDL-45893 user_menu: fix to hide user_pictures from screen readers
Dan Poltawski [Tue, 30 Sep 2014 13:04:24 +0000 (14:04 +0100)]
Merge branch '3034-28' of https://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 30 Sep 2014 12:53:09 +0000 (13:53 +0100)]
MDL-45893 behat: quick fix for usermenu logout button
(This needs revisiting properly - I am not an xpath expert)
Dan Poltawski [Tue, 30 Sep 2014 10:41:37 +0000 (11:41 +0100)]
Merge branch 'MDL-47385-master' of https://github.com/DmitryNefedov/moodle
Dan Poltawski [Tue, 30 Sep 2014 10:38:17 +0000 (11:38 +0100)]
MDL-47195 force an upgrade for classloader changes
Dan Poltawski [Tue, 30 Sep 2014 10:07:23 +0000 (11:07 +0100)]
Merge branch 'MDL-47195-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 30 Sep 2014 08:55:03 +0000 (09:55 +0100)]
Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Tue, 30 Sep 2014 07:47:31 +0000 (08:47 +0100)]
Merge branch 'MDL-47294-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:35:19 +0000 (08:35 +0100)]
Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle
Conflicts:
version.php
Dan Poltawski [Tue, 30 Sep 2014 07:30:59 +0000 (08:30 +0100)]
Merge branch 'm28_MDL-47097' of https://github.com/totara/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:29:02 +0000 (08:29 +0100)]
Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 30 Sep 2014 07:03:40 +0000 (08:03 +0100)]
Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 29 Sep 2014 22:28:26 +0000 (11:28 +1300)]
Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle
Sam Hemelryk [Mon, 29 Sep 2014 21:35:47 +0000 (10:35 +1300)]
Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 29 Sep 2014 21:25:23 +0000 (10:25 +1300)]
MDL-45893 user: fixed user menu for guest
Sam Hemelryk [Mon, 29 Sep 2014 21:03:06 +0000 (10:03 +1300)]
Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle
Sam Hemelryk [Mon, 29 Sep 2014 20:54:08 +0000 (09:54 +1300)]
MDL-46652 output: more thorough custom menu multilang tests
Sam Hemelryk [Mon, 29 Sep 2014 20:52:54 +0000 (09:52 +1300)]
Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle
Sam Hemelryk [Mon, 29 Sep 2014 19:48:20 +0000 (08:48 +1300)]
Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com/mhughes2k/moodle
Dan Poltawski [Mon, 29 Sep 2014 15:25:41 +0000 (16:25 +0100)]
Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:46:11 +0000 (12:46 +0100)]
Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:29:59 +0000 (12:29 +0100)]
Merge branch 'MDL-47163-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 29 Sep 2014 11:04:01 +0000 (12:04 +0100)]
Merge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Sep 2014 10:58:14 +0000 (11:58 +0100)]
Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 29 Sep 2014 10:12:29 +0000 (11:12 +0100)]
Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 29 Sep 2014 09:42:50 +0000 (10:42 +0100)]
Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 29 Sep 2014 09:30:42 +0000 (10:30 +0100)]
Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 29 Sep 2014 02:18:03 +0000 (15:18 +1300)]
Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 29 Sep 2014 02:17:24 +0000 (15:17 +1300)]
Merge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 29 Sep 2014 02:15:47 +0000 (15:15 +1300)]
Merge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:35:06 +0000 (14:35 +1300)]
Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:32:38 +0000 (14:32 +1300)]
Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:23:18 +0000 (14:23 +1300)]
Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:21:39 +0000 (14:21 +1300)]
Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:19:52 +0000 (14:19 +1300)]
Merge branch 'MDL-39190' of https://github.com/pauln/moodle
Sam Hemelryk [Mon, 29 Sep 2014 01:00:42 +0000 (14:00 +1300)]
Merge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Sun, 28 Sep 2014 23:42:32 +0000 (01:42 +0200)]
Merge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:35:23 +0000 (11:35 +1300)]
Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:21:19 +0000 (11:21 +1300)]
Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 28 Sep 2014 22:19:06 +0000 (11:19 +1300)]
Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle
Jean-Michel Vedrine [Sun, 17 Mar 2013 22:40:40 +0000 (23:40 +0100)]
MDL-32870 mod_lesson: added support for files to question answers and responses
Brian Barnes [Wed, 25 Jun 2014 04:33:12 +0000 (16:33 +1200)]
MDL-46127 core_calendar: Removed tables when rendering a single event
Sam Hemelryk [Sun, 28 Sep 2014 20:51:35 +0000 (09:51 +1300)]
Merge branch 'MDL-43566' of https://github.com/willylee/moodle
Sam Hemelryk [Sun, 28 Sep 2014 20:11:25 +0000 (09:11 +1300)]
Merge branch 'MDL-47395' of git://github.com/nebgor/moodle
Sam Hemelryk [Sun, 28 Sep 2014 20:06:35 +0000 (09:06 +1300)]
Merge branch 'MDL-47381' of git://github.com/timhunt/moodle
Sam Hemelryk [Sun, 28 Sep 2014 20:02:52 +0000 (09:02 +1300)]
Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 28 Sep 2014 19:44:43 +0000 (08:44 +1300)]
MDL-47252 mod_forum: fixed whitespace
Sam Hemelryk [Sun, 28 Sep 2014 19:43:51 +0000 (08:43 +1300)]
Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle
Eloy Lafuente (stronk7) [Sun, 28 Sep 2014 16:27:40 +0000 (18:27 +0200)]
MDL-47242 theme_bootstrapbase: Fixed whitespace (take2)
Seems that previous whitespace fix was not ok.
Juan Leyva [Wed, 10 Sep 2014 11:34:02 +0000 (13:34 +0200)]
MDL-47200 WebServices: Add core_files_get_files to the mob app service
Juan Leyva [Mon, 15 Sep 2014 11:46:02 +0000 (13:46 +0200)]
MDL-47163 messages: Upgrade Mobile notifications to use Airnotifier v2
Dmitry Nefedov [Sat, 27 Sep 2014 00:58:14 +0000 (08:58 +0800)]
MDL-47408 user: Add enableblogs checking before adding blog's link.
Michael Hughes [Thu, 11 Sep 2014 12:10:29 +0000 (13:10 +0100)]
MDL-47214 General: Multiple IP addresses in X-Forwarded-For Fixed
Fixed getremoteaddr() function handle multiple IP addresses
Addressed point 2 on Dan's list
Stopped changing $CFG value after started test.
sam marshall [Wed, 24 Sep 2014 11:04:48 +0000 (12:04 +0100)]
MDL-42974 UI: Modal dialogs do not work in IE8
sam marshall [Tue, 23 Sep 2014 11:09:03 +0000 (12:09 +0100)]
MDL-47380 Availability: Editing interface broken in IE8
sam marshall [Thu, 18 Sep 2014 11:59:19 +0000 (12:59 +0100)]
MDL-47322 Availability: empty availability should be saved as null
As part of the unit test modifications for this change, I added the get_json
function to the availability conditions that didn't have it. (This is a function
for use in unit tests.)
Tim Hunt [Tue, 23 Sep 2014 10:52:03 +0000 (11:52 +0100)]
MDL-47381 qformat: Behat tests have wrong plugin type.
Dave Cooper [Tue, 23 Sep 2014 07:05:22 +0000 (15:05 +0800)]
MDL-32275 enrol: Last site access column now shows last course access
Andrew Davis [Thu, 18 Sep 2014 07:59:59 +0000 (15:59 +0800)]
MDL-36929 mod_forum: added bolding of discussion titles on the recent activity page
Frederic Massart [Fri, 26 Sep 2014 02:33:39 +0000 (10:33 +0800)]
MDL-47295 libraries: Re-apply removal of random seed initialisation
See MDL-41198.
Frederic Massart [Fri, 26 Sep 2014 02:31:39 +0000 (10:31 +0800)]
MDL-47295 libraries: Update AdoDB to v5.19
Andrew Davis [Sat, 9 Aug 2014 12:28:11 +0000 (20:28 +0800)]
MDL-20250 core_grade: added some settings to disable or hide gradebook functionality
Petr Skoda [Tue, 23 Sep 2014 22:39:30 +0000 (10:39 +1200)]
MDL-47333 fix support for custom fonts in tcpdf
Marina Glancy [Wed, 24 Sep 2014 07:40:52 +0000 (15:40 +0800)]
MDL-47398 core_grades: fix grade category generator
David Mudrák [Thu, 25 Sep 2014 19:17:53 +0000 (21:17 +0200)]
MDL-47411 admin: Check if the plugin is a git submodule on uninstalling
Credit goes to PJ King. I was trying to add unit tests for this new
behaviour but it turned out there are many hard-coded dependencies and
it's not easy to make the whole machinery support alternative location
of testable (fake) plugins.
David Mudrák [Tue, 2 Sep 2014 18:53:13 +0000 (20:53 +0200)]
MDL-47069 admin: Add option to upload required ZIP at the check page
The plugins check page displays other plugins that the current one
depends on. Previously, we always displayed the other plugin as a link
to the plugins directory. This did not work well in two scenarios:
* The admin wants/needs to upload the other plugin from the ZIP file
(e.g. it is not available in the plugins directory),
* the other plugin is actually a standard plugin that is not supposed to
be registered with the plugins directory.
This patch displays the Install or Upload or Check for updates links
next to the required plugin instead, as appropriate.
Stephen Bourget [Thu, 25 Sep 2014 13:42:10 +0000 (09:42 -0400)]
MDL-46084 Calendar: Fix importing of full day events from Google
Dmitry Nefedov [Thu, 25 Sep 2014 13:17:52 +0000 (21:17 +0800)]
MDL-47385 coursecat: Mistake line in phpdocs deleted.
Willy Lee [Fri, 19 Sep 2014 19:05:39 +0000 (12:05 -0700)]
MDL-43566 course: add delete icon to search returns in course management listings
Dan Poltawski [Thu, 25 Sep 2014 10:17:51 +0000 (11:17 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 25 Sep 2014 10:17:48 +0000 (11:17 +0100)]
NOBUG: Fixed SVG browser compatibility
Dan Poltawski [Thu, 25 Sep 2014 10:17:47 +0000 (11:17 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Frederic Massart [Thu, 25 Sep 2014 06:11:09 +0000 (14:11 +0800)]
MDL-47294 repository_s3: Update S3 library to 0.5.1-dev
Jetha Chan [Thu, 18 Sep 2014 08:30:24 +0000 (16:30 +0800)]
MDL-45893 user_menu: revised based on action_menu
Ankit Agarwal [Thu, 25 Sep 2014 05:03:01 +0000 (10:33 +0530)]
MDL-47419 development: Add atlassian-ide-plugin.xml to .gitignore
Frederic Massart [Thu, 25 Sep 2014 02:53:34 +0000 (10:53 +0800)]
MDL-47307 libraries: Update Markdown to v1.4.1
Sam Hemelryk [Wed, 24 Sep 2014 23:34:47 +0000 (11:34 +1200)]
MDL-3034 mod_choice: minor tidy up
Dan Marsden [Wed, 24 Sep 2014 10:39:53 +0000 (22:39 +1200)]
MDL-47404 filelib: Prevent flash from treating files as uploads
Flash treats files as uploads if filename is passed in content-disposition
this causes security to be enforced that causes issues with SCORM packages
Sam Hemelryk [Thu, 25 Sep 2014 00:19:13 +0000 (12:19 +1200)]
MDL-47242: Fixed whitespace
Michael Aherne [Tue, 20 May 2014 07:58:36 +0000 (08:58 +0100)]
MDL-3034 choice Support multiple answers
Petr Skoda [Wed, 24 Sep 2014 21:39:58 +0000 (09:39 +1200)]
MDL-47300 import latest TCPDF 6.0.093
Dan Poltawski [Wed, 24 Sep 2014 14:41:04 +0000 (15:41 +0100)]
MDL-47378 mod_assign: prevent debugging notice
Parameters come out of get_user_preferences as strings.
Aparup Banerjee [Wed, 24 Sep 2014 06:30:24 +0000 (14:30 +0800)]
MDL-47395 added cli_error() visual cue
Pavel Sokolov [Wed, 24 Sep 2014 07:51:03 +0000 (11:51 +0400)]
MDL-37707 mod_assign: Prevent user from switching to and from team submissions
Jetha Chan [Wed, 24 Sep 2014 07:53:42 +0000 (15:53 +0800)]
MDL-47242 theme_bootstrapbase: inverted color and RTL fixes
Frederic Massart [Mon, 22 Sep 2014 08:27:16 +0000 (16:27 +0800)]
MDL-47358 gradereport_history: Improved default natural sorting by time
Damyon Wiese [Wed, 10 Sep 2014 05:46:31 +0000 (13:46 +0800)]
MDL-46171 assign: Peer review cleanups
* Remove hardcoded table names
* Remove some code that was left in after debugging
* Add some comments about grades with no submission
* Set submission->latest to 0 on restore (it will get fixed later)
* Changed get_records_sql to get_recordset_sql in restore.
Damyon Wiese [Fri, 25 Jul 2014 06:25:37 +0000 (14:25 +0800)]
MDL-46171 Assign: Always require a submission record if there is a grade
Also - update unit tests to match the new expectations.
Damyon Wiese [Thu, 24 Jul 2014 07:36:06 +0000 (15:36 +0800)]
MDL-46171 assign: And here is the benefit of the new column - simplify the SQL
Damyon Wiese [Thu, 24 Jul 2014 07:13:11 +0000 (15:13 +0800)]
MDL-46171 Assign: Update code so latest field on assign_submission table is always set correctly
Damyon Wiese [Thu, 24 Jul 2014 03:50:18 +0000 (11:50 +0800)]
MDL-46171 Assign: Add "latest" column + index to submission table.
Andrew Nicols [Thu, 17 Jul 2014 02:21:38 +0000 (10:21 +0800)]
MDL-47195 libraries: Add horde IMAP from Horde 5.2.1
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Andrew Nicols [Thu, 11 Sep 2014 03:23:50 +0000 (11:23 +0800)]
MDL-47195 core: Add PSR-0 Autoloader
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 23:37:22 +0000 (01:37 +0200)]
Merge branch 'MDL-47248-master-rsssitelogo' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Tue, 23 Sep 2014 23:26:52 +0000 (01:26 +0200)]
Merge branch 'MDL-47224' of git://github.com/aolley/moodle
Marina Glancy [Wed, 30 Apr 2014 06:30:51 +0000 (14:30 +0800)]
MDL-45336 lesson: copied used strings from quiz
AMOS BEGIN
CPY [false,mod_quiz],[false,mod_lesson]
CPY [fractionsaddwrong,mod_quiz],[fractionsaddwrong,mod_lesson]
CPY [fractionsnomax,mod_quiz],[fractionsnomax,mod_lesson]
CPY [notenoughsubquestions,mod_quiz],[notenoughsubquestions,mod_lesson]
CPY [true,mod_quiz],[true,mod_lesson]
AMOS END
Marina Glancy [Wed, 30 Apr 2014 06:53:12 +0000 (14:53 +0800)]
MDL-45336 questionbank: use core strings instead of quiz
AMOS BEGIN
CPY [categories,mod_quiz],[categories,question]
CPY [unusedcategorydeleted,mod_quiz],[unusedcategorydeleted,question]
CPY [export,mod_quiz],[export,core_question]
CPY [import,mod_quiz],[import,core_question]
AMOS END
Marina Glancy [Thu, 18 Sep 2014 06:35:03 +0000 (14:35 +0800)]
MDL-45336 qtype_numerical: use own strings instead of mod_quiz
These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.
AMOS BEGIN
CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
CPY [multiplier,mod_quiz],[qtype_numerical]
CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END
Marina Glancy [Wed, 30 Apr 2014 06:35:18 +0000 (14:35 +0800)]
MDL-45336 question: moved used string from quiz plugin
AMOS BEGIN
MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END