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
Jason Fowler [Wed, 6 Jun 2012 01:13:26 +0000 (09:13 +0800)]
MDL-33527 - Database - Fixing the ability to export database entries
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
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
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
Ankit Agarwal [Fri, 1 Jun 2012 03:26:16 +0000 (11:26 +0800)]
MDL-33369 course: Adding support for sectionid parameter for section view pages
Ankit Agarwal [Thu, 31 May 2012 02:42:43 +0000 (10:42 +0800)]
MDL-33401 blocks: Allow managers to have block:edit capability by default
Eloy Lafuente (stronk7) [Tue, 5 Jun 2012 00:22:33 +0000 (02:22 +0200)]
Merge branch 'MDL-32649_ratings_sort' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 5 Jun 2012 00:14:13 +0000 (02:14 +0200)]
MDL-32985 cron: prevent notices on "new" sites.
Eloy Lafuente (stronk7) [Tue, 5 Jun 2012 00:02:12 +0000 (02:02 +0200)]
Merge branch 'MDL-32985' of git://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 22:42:59 +0000 (00:42 +0200)]
Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 22:38:04 +0000 (00:38 +0200)]
Merge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 19:47:14 +0000 (21:47 +0200)]
Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 17:55:21 +0000 (19:55 +0200)]
Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 4 Jun 2012 11:22:06 +0000 (19:22 +0800)]
Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle
Conflicts:
admin/index.php
admin/renderer.php
version.php
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 09:33:47 +0000 (11:33 +0200)]
Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 4 Jun 2012 09:13:35 +0000 (17:13 +0800)]
Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle
Dan Poltawski [Mon, 4 Jun 2012 08:59:49 +0000 (16:59 +0800)]
Merge branch 'MDL-33480' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 4 Jun 2012 08:45:13 +0000 (10:45 +0200)]
MDL-33007 fix incorrect min_fix_utf8() tests
Credit goest to Eloy Lafuente.
David Monllaó [Wed, 29 Feb 2012 13:21:11 +0000 (14:21 +0100)]
MDL-31823 - Remote hosts users created via mnet enrolments marked as confirmed
Dan Poltawski [Mon, 4 Jun 2012 08:32:25 +0000 (16:32 +0800)]
MDL-29173 - fix whitespace error
Dan Poltawski [Mon, 4 Jun 2012 07:55:54 +0000 (15:55 +0800)]
Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 4 Jun 2012 07:17:07 +0000 (15:17 +0800)]
MDL-33511 admin/repositoryinstance.php: incorrect url
Dan Poltawski [Mon, 4 Jun 2012 03:25:19 +0000 (11:25 +0800)]
MDL-33507 - oauth2lib: switch 'code' to oauth2code
To avoid param collisions in future.
Dan Poltawski [Mon, 4 Jun 2012 03:11:38 +0000 (11:11 +0800)]
MDL-33501 - oauth2lib: enforce sesskey in oauth2callback.php
The sesskey needs to be embeded in the local url returned as this is the
only parameter we have control of.
Dan Poltawski [Mon, 4 Jun 2012 02:51:21 +0000 (10:51 +0800)]
MDL-33501 - oauth2lib: improve redirect url handling
Only accept PARAM_LOCALURL for state params and enforce
use of moodle_url param in oauthlib to facilitate that.
Andrew Davis [Mon, 28 May 2012 01:15:28 +0000 (08:15 +0700)]
MDL-30880 grade: added a check for the feedback property existing before it is used
Andrew Davis [Fri, 11 May 2012 03:33:17 +0000 (10:33 +0700)]
MDL-31460 mod_forum: added some controls to mod/forum/unsubscribeall.php to prevent the removal of subscriptions the user shouldnt be able to delete
Andrew Davis [Mon, 21 May 2012 01:08:58 +0000 (08:08 +0700)]
MDL-32649 rating: fixed the sorting in /rating/index.php
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 00:35:51 +0000 (02:35 +0200)]
MDL-33503 backup: Bump internal release and version information.
Eloy Lafuente (stronk7) [Mon, 4 Jun 2012 00:02:27 +0000 (02:02 +0200)]
MDL-33502 restore: there are no files with itemid based on section numbers.
Eloy Lafuente (stronk7) [Sun, 3 Jun 2012 23:46:53 +0000 (01:46 +0200)]
MDL-33480 book print tool: display intro images properly
Petr Skoda [Sat, 2 Jun 2012 19:48:26 +0000 (21:48 +0200)]
MDL-33436 include phpunit printer file from our lib.php
The problem is that the phpunit.xml does not support relative links.
Petr Skoda [Sat, 2 Jun 2012 19:35:55 +0000 (21:35 +0200)]
MDL-33103 fix mod_data E_STRICT issue in import
Dan Poltawski [Fri, 1 Jun 2012 15:28:47 +0000 (23:28 +0800)]
MDL-33487 - mod_forum: incorrect param ordering
Thanks to Garret Gengler for spotting it.
Tim Hunt [Fri, 1 Jun 2012 14:45:41 +0000 (08:45 -0600)]
MDL-33119 quiz complete report: fix placeholders in attempt string.
Tim Hunt [Fri, 1 Jun 2012 14:11:48 +0000 (08:11 -0600)]
MDL-33485 quiz manual grading report: fix SQL typo.
sam marshall [Thu, 24 May 2012 13:22:33 +0000 (14:22 +0100)]
MDL-32107 Activity completion: should use get_enrolled_sql instead of reinventing wheel
Davo Smith [Fri, 1 Jun 2012 09:10:58 +0000 (10:10 +0100)]
MDL-33056 Course dnd upload - improved status box styling and added fade in/out
Petr Skoda [Sun, 6 May 2012 12:11:36 +0000 (14:11 +0200)]
MDL-32632 fix date formatting on Windows
Petr Skoda [Tue, 15 May 2012 21:07:10 +0000 (23:07 +0200)]
MDL-33007 add workaround for broken iconv //IGNORE
This patch adds mbstring utf-8 cleanup fallback and admin warning if no utf-8 cleanup possible in user submitted data.
Petr Skoda [Tue, 15 May 2012 21:04:46 +0000 (23:04 +0200)]
MDL-33007 add buggy iconv workaround to configonlylib, add tests and fix minor issues
Dan Poltawski [Fri, 1 Jun 2012 09:03:32 +0000 (17:03 +0800)]
on-demand release 2.3dev
Dan Poltawski [Fri, 1 Jun 2012 09:01:41 +0000 (17:01 +0800)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Koen Roggemans [Fri, 1 Jun 2012 03:36:37 +0000 (11:36 +0800)]
MDL-29103 web service strings improvement
Sam Hemelryk [Fri, 1 Jun 2012 01:42:01 +0000 (13:42 +1200)]
Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 31 May 2012 22:58:08 +0000 (00:58 +0200)]
Merge branch 'MDL-33326' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Thu, 31 May 2012 14:14:57 +0000 (16:14 +0200)]
Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle