Sam Hemelryk [Thu, 7 Jun 2012 22:20:43 +0000 (10:20 +1200)]
Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Thu, 7 Jun 2012 22:04:19 +0000 (00:04 +0200)]
Merge branch 'MDL-32985_integration' of git://github.com/merrill-oakland/moodle
Sam Hemelryk [Thu, 7 Jun 2012 21:34:19 +0000 (09:34 +1200)]
MDL-30506 navigation: Fixed up reference handling issue and added docs post integration
Sam Hemelryk [Thu, 7 Jun 2012 21:04:46 +0000 (09:04 +1200)]
Merge branch 'MDL-30506' of git://github.com/jonof/moodle
Dan Poltawski [Thu, 7 Jun 2012 15:15:45 +0000 (23:15 +0800)]
Merge branch 'MDL-33577' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 7 Jun 2012 14:23:38 +0000 (22:23 +0800)]
Merge branch 'MDL-33532' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 7 Jun 2012 14:14:28 +0000 (22:14 +0800)]
Merge branch 'MDL-33565' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 7 Jun 2012 13:49:14 +0000 (21:49 +0800)]
Merge branch 'MDL-33517' of git://github.com/timhunt/moodle
Tim Hunt [Thu, 7 Jun 2012 11:55:53 +0000 (12:55 +0100)]
MDL-33532 quiz editing: let uses enter locale floats.
So, for example, Croatian users can set the maximum grade to 65,5.
Tim Hunt [Thu, 7 Jun 2012 11:32:41 +0000 (12:32 +0100)]
MDL-33577 qtype_multianswer: Fix strict syntax warning.
Dan Poltawski [Thu, 7 Jun 2012 10:11:10 +0000 (18:11 +0800)]
Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle
Barbara Ramiro [Fri, 1 Jun 2012 13:55:02 +0000 (21:55 +0800)]
MDL-33482 Replaced modchooser with chooserdialouge and cleaned codes
Andrew Robert Nicols [Fri, 1 Jun 2012 08:57:24 +0000 (09:57 +0100)]
MDL-33482 Replaced modchooser with chooserdialogue
Barbara Ramiro [Fri, 1 Jun 2012 06:59:03 +0000 (14:59 +0800)]
MDL-33482 Activity Chooser styled similar to Filepicker particularly the look and feel with drop shadow
Dan Poltawski [Thu, 7 Jun 2012 09:33:39 +0000 (17:33 +0800)]
Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 7 Jun 2012 09:25:59 +0000 (17:25 +0800)]
Merge branch 'MDL-33535-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Thu, 7 Jun 2012 08:38:10 +0000 (16:38 +0800)]
MDL-33551 googleapi: allow multiple uploads in one session
We need to clear state between multiple uploads
Andrew Robert Nicols [Thu, 7 Jun 2012 08:17:40 +0000 (09:17 +0100)]
MDL-33535 Correct typo in glossary documentation link
Dan Poltawski [Thu, 7 Jun 2012 06:29:08 +0000 (14:29 +0800)]
Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle
Aparup Banerjee [Thu, 7 Jun 2012 06:04:08 +0000 (14:04 +0800)]
Merge branch 'MDL-33465-master' of git://github.com/ankitagarwal/moodle
Conflicts:
backup/moodle2/restore_stepslib.php
Dan Poltawski [Thu, 7 Jun 2012 05:33:22 +0000 (13:33 +0800)]
Merge branch 'MDL-33467' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 7 Jun 2012 05:02:38 +0000 (13:02 +0800)]
Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle
Aparup Banerjee [Thu, 7 Jun 2012 03:59:13 +0000 (11:59 +0800)]
Merge branch 'MDL-31863' of git://github.com/nebgor/moodle
Aparup Banerjee [Thu, 7 Jun 2012 03:49:08 +0000 (11:49 +0800)]
MDL-31863 Web Service : get_files() optional $modified timestamp returns files changed after given time.
Yang Yang [Tue, 5 Jun 2012 01:42:30 +0000 (13:42 +1200)]
MDL-31863 Web service : added modified to parameters and modifiedtime to description
Damyon Wiese [Thu, 7 Jun 2012 02:52:05 +0000 (10:52 +0800)]
MDL-33475: Fix javascript error when advanced grading is used in mod_assign
Tim Hunt [Wed, 6 Jun 2012 18:57:47 +0000 (19:57 +0100)]
MDL-33565 setuplib: better error if you pass an object as $debuginfo
This changes makes sure the error is triggerd when the exception is
thrown, so that the problem code is in the stack-trace. Before, the
error happend in the exception hander, so you could not see the code
that caused the problem.
Tim Hunt [Wed, 6 Jun 2012 18:24:48 +0000 (19:24 +0100)]
MDL-33517 quiz: revise timelimit help string.
Thanks Helen.
Eric Merrill [Wed, 6 Jun 2012 16:04:03 +0000 (12:04 -0400)]
MDL-32985 cron: Fixing related problem with setting of lastnotifyfailure
Because of a flaw in the logic, lastnotifyfailure was not set unless
there was a failure. This means that after 1 hour of no failures, the
function would execute every cron cycle, which has a pretty high cost
on large sites.
Marina Glancy [Fri, 1 Jun 2012 03:11:32 +0000 (11:11 +0800)]
MDL-33467 fixed variable name conflict
Petr Skoda [Wed, 6 Jun 2012 08:54:40 +0000 (10:54 +0200)]
MDL-33555 fix invalid FK in mod_assign
There is no need to upgrade DB because we create only indexes now.
Dan Poltawski [Wed, 6 Jun 2012 08:25:20 +0000 (16:25 +0800)]
MDL-33330 /lib/db/upgrade.php: fix stray semicolon
Breaking Oracle upgrade
Dan Poltawski [Wed, 6 Jun 2012 08:18:30 +0000 (16:18 +0800)]
Merge branch 'MDL-33330-files-reference' of git://github.com/mudrd8mz/moodle
Conflicts:
version.php
lib/db/upgrade.php
Dan Poltawski [Wed, 6 Jun 2012 08:09:15 +0000 (16:09 +0800)]
Merge branch 'MDL-33547' of git://github.com/netspotau/moodle-mod_assign
Damyon Wiese [Wed, 6 Jun 2012 07:49:37 +0000 (15:49 +0800)]
MDL-33547: Fix for mod_assign portfolio export for a list of files.
This will fix any submission or feedback plugin using render_area_files
to show a list of files.
Jerome Mouneyrac [Wed, 6 Jun 2012 06:23:10 +0000 (14:23 +0800)]
MDL-32581 Web services : should force type of external_format_value structure
Dan Poltawski [Wed, 6 Jun 2012 05:20:59 +0000 (13:20 +0800)]
Merge branch 'MDL-33088-master' of git://github.com/FMCorz/moodle
Frederic Massart [Fri, 18 May 2012 08:33:47 +0000 (16:33 +0800)]
MDL-33088 Glossary: disabled filtering on concepts in recent activity block
Dan Poltawski [Wed, 6 Jun 2012 04:27:10 +0000 (12:27 +0800)]
Merge branch 'w23_MDL-32632_m23_windate' of git://github.com/skodak/moodle
Sam Hemelryk [Wed, 6 Jun 2012 03:37:43 +0000 (15:37 +1200)]
Merge branch 'MDL-33090-missing-xmldb-strings' of git://github.com/rlorenzo/moodle
Sam Hemelryk [Wed, 6 Jun 2012 03:19:49 +0000 (15:19 +1200)]
Merge branch 'wip-mdl-33367' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Wed, 6 Jun 2012 03:07:08 +0000 (11:07 +0800)]
Merge branch 'wip-MDL-33527-master' of git://github.com/phalacee/moodle
Dan Poltawski [Wed, 6 Jun 2012 02:31:12 +0000 (10:31 +0800)]
Merge branch 'MDL-33119' of git://github.com/timhunt/moodle
Frederic Massart [Wed, 23 May 2012 01:05:53 +0000 (09:05 +0800)]
MDL-32325 Glossary: Entrylist print version is XHTML compliant
Jason Fowler [Wed, 6 Jun 2012 01:13:26 +0000 (09:13 +0800)]
MDL-33527 - Database - Fixing the ability to export database entries
Jonathon Fowler [Wed, 30 Nov 2011 00:30:46 +0000 (10:30 +1000)]
MDL-30506 navigation: Hook for local plugins to extend the settings_navigation tree
Sam Hemelryk [Tue, 5 Jun 2012 23:50:19 +0000 (11:50 +1200)]
Merge branch 'w23_MDL-33103_m23_dataestrict' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 5 Jun 2012 23:43:47 +0000 (11:43 +1200)]
Merge branch 'MDL-33511' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 5 Jun 2012 23:13:32 +0000 (11:13 +1200)]
Merge branch 'MDL-33528' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 5 Jun 2012 23:00:20 +0000 (11:00 +1200)]
Merge branch 'MDL-30837-master' of https://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 5 Jun 2012 22:35:19 +0000 (10:35 +1200)]
MDL-31520 user-ws: Optimised if statement for email access by moving admin check to the start
Sam Hemelryk [Tue, 5 Jun 2012 22:33:31 +0000 (10:33 +1200)]
Merge branch 'MDL-31520-master' of git://github.com/fabiomsouto/moodle
Sam Hemelryk [Tue, 5 Jun 2012 22:18:43 +0000 (10:18 +1200)]
Merge branch 'MDL-33503' of git://github.com/stronk7/moodle
Sam Hemelryk [Tue, 5 Jun 2012 22:14:00 +0000 (10:14 +1200)]
Merge branch 'MDL-31823_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 5 Jun 2012 22:10:05 +0000 (10:10 +1200)]
Merge branch 'MDL-33441' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 5 Jun 2012 22:06:17 +0000 (10:06 +1200)]
Merge branch 'MDL-33487' of git://github.com/danpoltawski/moodle
Kordan [Tue, 15 May 2012 10:25:08 +0000 (12:25 +0200)]
MDL-32905 theme_formal_white: changed three setting name, some string name and string content
AMOS BEGIN
MOV [displaylogodesc,theme_formal_white],[headercontentdesc,theme_formal_white]
MOV [frontpagelogo,theme_formal_white],[frontpagelogourl,theme_formal_white]
MOV [frontpagelogodesc,theme_formal_white],[frontpagelogourldesc,theme_formal_white]
MOV [heading,theme_formal_white],[displayheading,theme_formal_white]
MOV [logo,theme_formal_white],[customlogourl,theme_formal_white]
MOV [logodesc,theme_formal_white],[customlogourldesc,theme_formal_white]
CPY [moodlelogo,theme_formal_white],[displaylogo,theme_formal_white]
AMOS END
Sam Hemelryk [Tue, 5 Jun 2012 21:13:43 +0000 (09:13 +1200)]
MDL-26277: Fixed whitespace post integration
Sam Hemelryk [Tue, 5 Jun 2012 21:07:34 +0000 (09:07 +1200)]
Merge branch 'MDL-26277-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Tue, 5 Jun 2012 21:05:04 +0000 (09:05 +1200)]
Merge branch 'MDL-33369-master' of git://github.com/ankitagarwal/moodle with changes
Sam Hemelryk [Tue, 5 Jun 2012 20:54:38 +0000 (08:54 +1200)]
Merge branch 'MDL-33031_master' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 5 Jun 2012 20:51:11 +0000 (08:51 +1200)]
Merge branch 'MDL-27559-master-v2' of https://github.com/mackensen/moodle
Sam Hemelryk [Tue, 5 Jun 2012 20:30:02 +0000 (08:30 +1200)]
Merge branch 'MDL-33056_dnd_status_bar' of git://github.com/davosmith/moodle
David Mudrak [Thu, 31 May 2012 12:18:13 +0000 (14:18 +0200)]
MDL-33330 Use the referencehash when searching for references
Together with this, refactoring and cleanup of search_references() and
similar methods was done. SQL was improved to use the INNER JOIN instead
of the LEFT JOIN as we are really interested in records that have a
reference. Also, joining the {repository_instances} table assures that
only references with valid repository_instance are returned (the check
against is_external_file() can't be applied to the methods that return
the count of references so I dropped it completely).
David Mudrak [Thu, 31 May 2012 09:25:59 +0000 (11:25 +0200)]
MDL-33330 Create new unique index in files_reference
The combination of repositoryid and reference field is supposed to be a
unique identification of an external file. Because the reference is a
TEXT field, we can't use it to compose the index. So we use the
referencehash instead and the file API is responsible to keep it
up-to-date.
David Mudrak [Thu, 31 May 2012 09:16:09 +0000 (11:16 +0200)]
MDL-33330 Remap all instances of an external file to a single record in files_reference
David Mudrak [Thu, 31 May 2012 08:27:09 +0000 (10:27 +0200)]
MDL-33330 Populate referencehash field values
David Mudrak [Thu, 31 May 2012 07:59:18 +0000 (09:59 +0200)]
MDL-33330 Add referencehash field to the files_reference table
David Mudrak [Tue, 29 May 2012 22:58:50 +0000 (00:58 +0200)]
MDL-33330 improved {files_reference} records creation
This patch unifies the way how records in {files_reference} get created.
Previously, each reference file (i.e. a file with referencefileid set)
created its own record in {files_reference}. This patch makes sure that
existing record is reused if possible.
Bye bye 1:1 relationships, you suck!
David Mudrak [Tue, 29 May 2012 22:32:09 +0000 (00:32 +0200)]
MDL-33330 introducing new file_reference_exception
This replaces the previously defined external_file_exception that was
not used anywhere in the code. The new exception will be thrown in
situations where there is some unexpected problem detected with the
records in the {files_reference} table (e.g. unable to find a record
referenced by some file from {file}, invalid reference value etc.)
Dan Poltawski [Tue, 5 Jun 2012 08:40:40 +0000 (16:40 +0800)]
MDL-33441 course/lib.php prevent fatal error when no visible categories
Dan Poltawski [Tue, 5 Jun 2012 07:32:45 +0000 (15:32 +0800)]
Merge branch 'MDL-33019-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 5 Jun 2012 07:23:28 +0000 (15:23 +0800)]
Merge branch 'MDL-32581' of git://github.com/mouneyrac/moodle
Aparup Banerjee [Tue, 5 Jun 2012 07:15:26 +0000 (15:15 +0800)]
Merge branch 'wip-mdl-33455' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 5 Jun 2012 06:30:40 +0000 (14:30 +0800)]
Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 5 Jun 2012 05:57:16 +0000 (13:57 +0800)]
MDL-33445 reverted file size check for files inserted by reference
Jerome Mouneyrac [Tue, 5 Jun 2012 04:05:19 +0000 (12:05 +0800)]
MDL-33528 fix create_categories warnings + default parent parameter
Marina Glancy [Fri, 1 Jun 2012 04:16:53 +0000 (12:16 +0800)]
MDL-33391 Files API, Repository : mimetype should be determined from file extension when possible
Dan Poltawski [Tue, 5 Jun 2012 05:10:28 +0000 (13:10 +0800)]
Merge branch 'MDL-33502' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 5 Jun 2012 04:52:39 +0000 (12:52 +0800)]
Merge branch 'MDL-33042-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 5 Jun 2012 04:42:30 +0000 (12:42 +0800)]
Merge branch 'MDL-29103' of git://github.com/mouneyrac/moodle
Dan Poltawski [Tue, 5 Jun 2012 04:34:29 +0000 (12:34 +0800)]
Merge branch 'MDL-33401-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Tue, 5 Jun 2012 04:15:47 +0000 (12:15 +0800)]
Merge branch 'MDL-33476' of git://github.com/esqueeze/moodle
Dan Poltawski [Tue, 5 Jun 2012 04:09:44 +0000 (12:09 +0800)]
Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 5 Jun 2012 04:03:56 +0000 (12:03 +0800)]
Merge branch 'MDL-33319' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Tue, 5 Jun 2012 03:58:32 +0000 (11:58 +0800)]
Merge branch 'MDL-30880_feedback_property' of git://github.com/andyjdavis/moodle
Tim Barker [Fri, 1 Jun 2012 05:21:38 +0000 (13:21 +0800)]
MDL-33476 repositories: Added instructions to assist with setting up Dropbox keys
Dan Poltawski [Tue, 5 Jun 2012 02:16:44 +0000 (10:16 +0800)]
Merge branch 'MDL-33485' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 5 Jun 2012 02:10:21 +0000 (10:10 +0800)]
Merge branch 'wip-tablelib' of git://github.com/marinaglancy/moodle
Rajesh Taneja [Fri, 1 Jun 2012 08:11:17 +0000 (16:11 +0800)]
MDL-33455 gradebook: Grade will not be inserted for unknown user
Rajesh Taneja [Mon, 28 May 2012 07:36:13 +0000 (15:36 +0800)]
MDL-33367 course: Deprecated message added to move_section, so it can be removed in 2.5
Dan Poltawski [Tue, 5 Jun 2012 01:34:26 +0000 (09:34 +0800)]
MDL-31460 mod_forum: fix trailing whitespace
Rajesh Taneja [Mon, 28 May 2012 02:11:25 +0000 (10:11 +0800)]
MDL-33367 course: move_section reuse move_section_to function
Conflicts:
course/lib.php
Ankit Agarwal [Tue, 5 Jun 2012 01:33:45 +0000 (09:33 +0800)]
MDL-33465 course: 'Course view section' logs should use sectionid instead of section number to generate action urls'
Dan Poltawski [Tue, 5 Jun 2012 01:33:38 +0000 (09:33 +0800)]
Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle
Marina Glancy [Thu, 24 May 2012 01:39:06 +0000 (09:39 +0800)]
MDL-33479 removed legacy constructor causing strict notice in php5
Marina Glancy [Thu, 31 May 2012 04:59:43 +0000 (12:59 +0800)]
MDL-33445 Added file size check to files inserted by reference
Marina Glancy [Thu, 31 May 2012 04:58:34 +0000 (12:58 +0800)]
MDL-33409 Newly copied files should take on the userid of the current user, and dates reset
- changed function repository::copy_to_area so it accepts more file attributes, pass changed attributes to it
- changed file_info::copy_to_storage and file_info_stored::copy_to_storage to accept more file attributes
- simplified file size check for moodle files in repository/repository_ajax.php
- removed unused code in repository/repository_ajax.php
Frederic Massart [Mon, 28 May 2012 01:33:49 +0000 (09:33 +0800)]
MDL-30837 Accessibility: removed navigation icons default alt text
Helen Foster [Tue, 5 Jun 2012 01:08:06 +0000 (09:08 +0800)]
MDL-31803 lang - make the mooch registration message more descriptive