moodle.git
9 years agoMerge branch 'MDL-34019-pluginlib-notice' of git://github.com/mudrd8mz/moodle into...
Dan Poltawski [Mon, 2 Jul 2012 07:02:37 +0000 (15:02 +0800)]
Merge branch 'MDL-34019-pluginlib-notice' of git://github.com/mudrd8mz/moodle into MOODLE_23_STABLE

9 years agoMDL-34054 quiz reports: missing context.
Tim Hunt [Fri, 29 Jun 2012 15:06:25 +0000 (16:06 +0100)]
MDL-34054 quiz reports: missing context.

quiz_report_should_show_grades needs to know the context, so pass it
through.

9 years agoMDL-33995 - unit tests: fix class name collision
Dan Poltawski [Mon, 2 Jul 2012 06:52:57 +0000 (14:52 +0800)]
MDL-33995 - unit tests: fix class name collision

9 years agoMDL-33995 Course external PHPunit test + externallib_testcase helper class
Jerome Mouneyrac [Wed, 27 Jun 2012 08:24:22 +0000 (16:24 +0800)]
MDL-33995 Course external PHPunit test + externallib_testcase helper class

9 years agoMDL-33776 Web services: get_categories - subcategories should be checked against...
Jerome Mouneyrac [Wed, 20 Jun 2012 07:49:20 +0000 (15:49 +0800)]
MDL-33776 Web services: get_categories - subcategories should be checked against visible/theme keys

9 years agoMDL-33978 SCORM activity completion - don't tiggere completion update state on creati...
Dan Marsden [Mon, 25 Jun 2012 00:22:55 +0000 (12:22 +1200)]
MDL-33978 SCORM activity completion - don't tiggere completion update state on creation of SCORM

9 years agoMDL-33686 Repositories: we were accessing a non-existent variable and thus never...
Andrew Davis [Wed, 13 Jun 2012 04:49:13 +0000 (11:49 +0700)]
MDL-33686 Repositories: we were accessing a non-existent variable and thus never displaying the maximum number of attachments

9 years agoMDL-33932_master - added array_unique()
Andreas Grabs [Thu, 21 Jun 2012 19:59:03 +0000 (21:59 +0200)]
MDL-33932_master - added array_unique()

9 years agoMDL-33627 - feedback block now show all feedbacks
Andreas Grabs [Sat, 9 Jun 2012 18:30:17 +0000 (20:30 +0200)]
MDL-33627 - feedback block now show all feedbacks

9 years agoweekly release 2.3+
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 22:54:05 +0000 (00:54 +0200)]
weekly release 2.3+

9 years agoMerge branch 'MDL-34119_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 22:30:28 +0000 (00:30 +0200)]
Merge branch 'MDL-34119_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34044-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE
Sam Hemelryk [Sun, 1 Jul 2012 20:22:35 +0000 (08:22 +1200)]
Merge branch 'MDL-34044-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'w27_MDL-34130_m23_recordsettests' of git://github.com/skodak/moodle...
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 20:01:22 +0000 (22:01 +0200)]
Merge branch 'w27_MDL-34130_m23_recordsettests' of git://github.com/skodak/moodle into MOODLE_23_STABLE

9 years agoMDL-34130 prevent some warning in PHPStorm
Petr Škoda [Sun, 1 Jul 2012 19:50:36 +0000 (21:50 +0200)]
MDL-34130 prevent some warning in PHPStorm

9 years agoMDL-34130 test recordset data is static
Petr Škoda [Sun, 1 Jul 2012 19:35:37 +0000 (21:35 +0200)]
MDL-34130 test recordset data is static

We do not want recordset results to be affected by subsequent update or delete queries.

9 years agoMDL-34130 add missing rs close
Petr Škoda [Sun, 1 Jul 2012 19:00:16 +0000 (21:00 +0200)]
MDL-34130 add missing rs close

Thanks Eloy!

9 years agoMDL-34130 test interaction of recordsets and transactions
Petr Škoda [Sun, 1 Jul 2012 11:43:55 +0000 (13:43 +0200)]
MDL-34130 test interaction of recordsets and transactions

9 years agoMDL-34130 test nested recordset iteration
Petr Škoda [Sun, 1 Jul 2012 11:34:22 +0000 (13:34 +0200)]
MDL-34130 test nested recordset iteration

9 years agoMDL-34130 fix data inserts in recordset tests
Petr Škoda [Sun, 1 Jul 2012 11:30:59 +0000 (13:30 +0200)]
MDL-34130 fix data inserts in recordset tests

9 years agoMerge branch 'MDL-32249c-23' of github.com:srynot4sale/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Sun, 1 Jul 2012 00:14:39 +0000 (02:14 +0200)]
Merge branch 'MDL-32249c-23' of github.com:srynot4sale/moodle into MOODLE_23_STABLE

9 years agoMDL-31201 wiki: fix a hardcoded string
Sun Zhigang [Tue, 22 May 2012 11:36:50 +0000 (19:36 +0800)]
MDL-31201 wiki: fix a hardcoded string

9 years agoMDL-34119_M23 theme_splash: Added colourswitcher.js and associated code in layout...
Mary Evans [Sat, 30 Jun 2012 11:02:22 +0000 (12:02 +0100)]
MDL-34119_M23 theme_splash: Added colourswitcher.js and associated code in layout files and lib.php

9 years agoMDL-34119_M23 theme_splash: removed redundant js call in lib.php. Added lang option...
Mary Evans [Fri, 29 Jun 2012 23:50:34 +0000 (00:50 +0100)]
MDL-34119_M23 theme_splash: removed redundant js call in lib.php. Added lang option to config.php + amended lang output in layout files. Added some css to style langmenu + removed redundant loginicon in pagelayout.css

9 years agoMDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts.
Aparup Banerjee [Fri, 29 Jun 2012 03:37:01 +0000 (11:37 +0800)]
MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts.

9 years agoMDL-34044 completion: Fix regression caused by MDL-26626
Aaron Barnes [Tue, 26 Jun 2012 22:38:24 +0000 (10:38 +1200)]
MDL-34044 completion: Fix regression caused by MDL-26626

9 years agoMDL-34019 Fix response item key name
David Mudrák [Tue, 26 Jun 2012 07:12:35 +0000 (09:12 +0200)]
MDL-34019 Fix response item key name

9 years agoMDL-32249 completion: Make grade criteria more consistent
Aaron Barnes [Wed, 11 Apr 2012 06:54:40 +0000 (18:54 +1200)]
MDL-32249 completion: Make grade criteria more consistent

Also, round course grades and remove hardcoded string.

Note: This patch also removes the ability to update the course grade
from the completion interface

9 years agoMoodle release 2.3 v2.3.0
Eloy Lafuente (stronk7) [Mon, 25 Jun 2012 15:51:17 +0000 (17:51 +0200)]
Moodle release 2.3

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Mon, 25 Jun 2012 15:44:13 +0000 (17:44 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-34004 - reinstate the custom HTML icon as separate from other markup icons, becau...
Martin Dougiamas [Mon, 25 Jun 2012 15:05:44 +0000 (23:05 +0800)]
MDL-34004 - reinstate the custom HTML icon as separate from other markup icons, because it usually means a "page" to most people that displays in the browser.   These icons are temporary (but workable) until Barbara can put in some nice ones that work as a set.   The 16px one is from Moodle 2.2 and the others are copies of "unknown".

9 years agoMerge branch 'MDL-33984' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 25 Jun 2012 13:56:54 +0000 (21:56 +0800)]
Merge branch 'MDL-33984' of git://github.com/stronk7/moodle

9 years agoMDL-33984 mysql: take rid of old unicode & mysql 4.1 message on error.
Eloy Lafuente (stronk7) [Mon, 25 Jun 2012 13:44:42 +0000 (15:44 +0200)]
MDL-33984 mysql: take rid of old unicode & mysql 4.1 message on error.

9 years agoMerge branch 'MDL-33984' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 25 Jun 2012 10:46:59 +0000 (18:46 +0800)]
Merge branch 'MDL-33984' of git://github.com/stronk7/moodle

9 years agoMDL-33984 mysql - raise min version to 5.1.33.
Eloy Lafuente (stronk7) [Mon, 25 Jun 2012 10:30:16 +0000 (12:30 +0200)]
MDL-33984 mysql - raise min version to 5.1.33.

Because of http://bugs.mysql.com/bug.php?id=42758 and other benefits.

9 years agoMerge branch 'MDL-33694' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Mon, 25 Jun 2012 08:45:23 +0000 (16:45 +0800)]
Merge branch 'MDL-33694' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33999' of git://github.com/nebgor/moodle
Dan Poltawski [Mon, 25 Jun 2012 08:35:09 +0000 (16:35 +0800)]
Merge branch 'MDL-33999' of git://github.com/nebgor/moodle

9 years agoMerge branch 'wip-MDL-33777-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Jun 2012 08:18:27 +0000 (16:18 +0800)]
Merge branch 'wip-MDL-33777-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-33999 filemanager : fixed up incorrect string used in dialog button during folder...
Aparup Banerjee [Mon, 25 Jun 2012 08:18:21 +0000 (16:18 +0800)]
MDL-33999 filemanager : fixed up incorrect string used in dialog button during folder renaming

9 years agoMerge branch 'wip-MDL-33997-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Jun 2012 08:08:33 +0000 (16:08 +0800)]
Merge branch 'wip-MDL-33997-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-33997 Repository should not support references by default
Marina Glancy [Mon, 25 Jun 2012 08:03:25 +0000 (16:03 +0800)]
MDL-33997 Repository should not support references by default

9 years agoMDL-33694 repository: docs about 2.3 changes
Dan Poltawski [Mon, 25 Jun 2012 07:48:57 +0000 (15:48 +0800)]
MDL-33694 repository: docs about 2.3 changes

9 years agoMDL-33926 Add window scrolling when drag/dropping
Andrew Robert Nicols [Fri, 22 Jun 2012 07:11:06 +0000 (08:11 +0100)]
MDL-33926 Add window scrolling when drag/dropping

9 years agoMerge branch 'wip-MDL-33987-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 25 Jun 2012 07:08:12 +0000 (15:08 +0800)]
Merge branch 'wip-MDL-33987-m23' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'wip-MDL-33419-master' of https://github.com/barbararamiro/moodle
Aparup Banerjee [Mon, 25 Jun 2012 06:30:18 +0000 (14:30 +0800)]
Merge branch 'wip-MDL-33419-master' of https://github.com/barbararamiro/moodle

9 years agoMDL-33987 theme_anomaly: Fixed up a couple of issues with the dock
Sam Hemelryk [Mon, 25 Jun 2012 05:17:37 +0000 (17:17 +1200)]
MDL-33987 theme_anomaly: Fixed up a couple of issues with the dock

* Active title displayed incorrectly because they had a limited width which I removed
* Docked block content was indented because block titles are now floated in anomaly.
  To fix this I gave it a bottom border, forcing it clear.

9 years agoMerge branch 'wip-MDL-33985-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 25 Jun 2012 05:00:33 +0000 (13:00 +0800)]
Merge branch 'wip-MDL-33985-m23' of git://github.com/samhemelryk/moodle

9 years agoMDL-33985 theme_base: Fixed bad conflict resolution of course CSS rtl fixes
Sam Hemelryk [Mon, 25 Jun 2012 04:53:39 +0000 (16:53 +1200)]
MDL-33985 theme_base: Fixed bad conflict resolution of course CSS rtl fixes

9 years agoMerge branch 'MDL-33980' of github.com:equella/moodle
Dan Poltawski [Mon, 25 Jun 2012 03:20:40 +0000 (11:20 +0800)]
Merge branch 'MDL-33980' of github.com:equella/moodle

9 years agoMDL-33777 Equella repository properly set the source and display file origin
Marina Glancy [Fri, 22 Jun 2012 06:57:46 +0000 (14:57 +0800)]
MDL-33777 Equella repository properly set the source and display file origin

9 years agoMDL-33980 equella: course ID number should be being passed through, not the course...
nread [Mon, 25 Jun 2012 02:33:49 +0000 (12:33 +1000)]
MDL-33980 equella: course ID number should be being passed through, not the course database ID

9 years agoAutomatically generated installer lang files
AMOS bot [Mon, 25 Jun 2012 00:31:38 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-33733 fix broken zip_packer->extract_to_storage() when extracting from stored_file
Petr Skoda [Thu, 14 Jun 2012 11:19:58 +0000 (13:19 +0200)]
MDL-33733 fix broken zip_packer->extract_to_storage() when extracting from stored_file

9 years agoMoodle release 2.3rc1 v2.3.0-rc1
Eloy Lafuente (stronk7) [Sun, 24 Jun 2012 16:37:12 +0000 (18:37 +0200)]
Moodle release 2.3rc1

9 years agoFix permissions.
Eloy Lafuente (stronk7) [Sun, 24 Jun 2012 16:31:09 +0000 (18:31 +0200)]
Fix permissions.

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Sun, 24 Jun 2012 16:27:53 +0000 (18:27 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMerge branch 'MDL-33717_admin_message2' of git://github.com/andyjdavis/moodle
Dan Poltawski [Fri, 22 Jun 2012 07:09:46 +0000 (15:09 +0800)]
Merge branch 'MDL-33717_admin_message2' of git://github.com/andyjdavis/moodle

9 years agoMDL-33853: Prevent locking an assignment submission from putting a grade of 0 in...
Damyon Wiese [Tue, 19 Jun 2012 15:48:39 +0000 (23:48 +0800)]
MDL-33853: Prevent locking an assignment submission from putting a grade of 0 in the gradebook

9 years agoMerge branch 'MDL-32769-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Fri, 22 Jun 2012 02:40:09 +0000 (14:40 +1200)]
Merge branch 'MDL-32769-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'wip-MDL-33931-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Fri, 22 Jun 2012 02:25:54 +0000 (14:25 +1200)]
Merge branch 'wip-MDL-33931-master' of git://github.com/abgreeve/moodle

9 years agoMDL-33954: Assignment "submissionreceipthtml" Language change
Damyon Wiese [Fri, 22 Jun 2012 01:03:18 +0000 (09:03 +0800)]
MDL-33954: Assignment "submissionreceipthtml" Language change

Add the missing word: "see"

9 years agoAutomatically generated installer lang files
AMOS bot [Fri, 22 Jun 2012 00:31:21 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Thu, 21 Jun 2012 23:56:49 +0000 (11:56 +1200)]
Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle

Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php

9 years agoMDL-32769 completion: Fixed up display of completion information
Sam Hemelryk [Thu, 21 Jun 2012 22:42:56 +0000 (10:42 +1200)]
MDL-32769 completion: Fixed up display of completion information

9 years agoMerge branch 'MDL-33936-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Thu, 21 Jun 2012 21:47:13 +0000 (09:47 +1200)]
Merge branch 'MDL-33936-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Thu, 21 Jun 2012 21:33:25 +0000 (09:33 +1200)]
Merge branch 'wip-MDL-33928-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'MDL-33915' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Thu, 21 Jun 2012 21:02:50 +0000 (09:02 +1200)]
Merge branch 'MDL-33915' of git://github.com/danpoltawski/moodle

9 years agoMDL-33430 Notify user about file aliases failures at the final stage of the restore
David Mudrák [Thu, 21 Jun 2012 13:22:38 +0000 (15:22 +0200)]
MDL-33430 Notify user about file aliases failures at the final stage of the restore

9 years agoMDL-33430 Give tasks an access to their current plan's results
David Mudrák [Fri, 15 Jun 2012 14:46:08 +0000 (16:46 +0200)]
MDL-33430 Give tasks an access to their current plan's results

This in turn provides access to the plan's results for both structure and
execution steps so they can register something useful there.

9 years agoMDL-33430 Fix strict standards warning
David Mudrák [Thu, 21 Jun 2012 10:27:06 +0000 (12:27 +0200)]
MDL-33430 Fix strict standards warning

Only variables should be passed by reference.

9 years agoMDL-33381 Icon label removed for all file types to make it generic
Barbara Ramiro [Thu, 7 Jun 2012 12:31:02 +0000 (20:31 +0800)]
MDL-33381 Icon label removed for all file types to make it generic

9 years agoMDL-33430 Add caching into choose_repository() method
David Mudrák [Thu, 21 Jun 2012 10:15:48 +0000 (12:15 +0200)]
MDL-33430 Add caching into choose_repository() method

Simply do not repeat expensive search once the restore process decides how
to deal with the given repositoryid or repositorytype.

9 years agoMerge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Thu, 21 Jun 2012 09:34:57 +0000 (17:34 +0800)]
Merge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle

9 years agoMDL-33419 Reference/source icons in table view and list view displayed and smaller
Barbara Ramiro [Thu, 21 Jun 2012 09:13:43 +0000 (17:13 +0800)]
MDL-33419 Reference/source icons in table view and list view displayed and smaller

9 years agoMDL-33936 Detect activity chooser in block_site_main_menu correctly
Andrew Robert Nicols [Thu, 21 Jun 2012 08:19:11 +0000 (09:19 +0100)]
MDL-33936 Detect activity chooser in block_site_main_menu correctly

9 years agoMDL-32769 course: Moving the completion status to a new line
Ankit Agarwal [Thu, 21 Jun 2012 08:16:48 +0000 (16:16 +0800)]
MDL-32769 course: Moving the completion status to a new line

9 years agoMDL-33911 mathslib: add unit test to demonstrate problem
Dan Poltawski [Thu, 21 Jun 2012 07:58:23 +0000 (15:58 +0800)]
MDL-33911 mathslib: add unit test to demonstrate problem

9 years agoMerge branch 'MDL-33911' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 21 Jun 2012 08:00:08 +0000 (16:00 +0800)]
Merge branch 'MDL-33911' of git://github.com/timhunt/moodle

9 years agoMDL-33931 - themes - Change of the base theme to align the submit and cancel buttons...
Adrian Greeve [Thu, 21 Jun 2012 07:47:02 +0000 (15:47 +0800)]
MDL-33931 - themes - Change of the base theme to align the submit and cancel buttons with the rest of the mform (15%)

9 years agoMerge branch 'MDL-33878' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 21 Jun 2012 07:21:13 +0000 (15:21 +0800)]
Merge branch 'MDL-33878' of git://github.com/netspotau/moodle-mod_assign

9 years agoMerge branch 'MDL-33860' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 21 Jun 2012 06:56:07 +0000 (14:56 +0800)]
Merge branch 'MDL-33860' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-33850: Assignment: Change text to "Add submission" before anything has been submitted
Damyon Wiese [Wed, 20 Jun 2012 02:19:31 +0000 (10:19 +0800)]
MDL-33850: Assignment: Change text to "Add submission" before anything has been submitted

AMOS BEGIN
 CPY [addsubmission,mod_assignment],[addsubmission,mod_assign]
AMOS END

9 years agoMDL-33860: Use get_string for All option in assignment grading table
Damyon Wiese [Tue, 19 Jun 2012 14:19:29 +0000 (22:19 +0800)]
MDL-33860: Use get_string for All option in assignment grading table

9 years agoMDL-32769 course: Do not show a completion status of 0/0
Ankit Agarwal [Thu, 21 Jun 2012 05:29:46 +0000 (13:29 +0800)]
MDL-32769 course: Do not show a completion status of 0/0

9 years agoMDL-33785 theme_base: RTL fixes added to style/filemanager.css
Mary Evans [Fri, 15 Jun 2012 22:59:12 +0000 (23:59 +0100)]
MDL-33785 theme_base: RTL fixes added to style/filemanager.css

Conflicts:

theme/base/style/filemanager.css

9 years agoMDL-33915 - prevent use of rebuild_course_cache during upgrade
Dan Poltawski [Thu, 21 Jun 2012 02:49:17 +0000 (10:49 +0800)]
MDL-33915 - prevent use of rebuild_course_cache during upgrade

It depends on upgrade changes itself

9 years agoMDL-33928 - Installation - Fixing the size of the host field for database details...
Jason Fowler [Thu, 21 Jun 2012 03:18:51 +0000 (11:18 +0800)]
MDL-33928 - Installation - Fixing the size of the host field for database details in the installation stage

9 years agoMDL-33717 files: improved display_size() so that it displays something nice for -1
Andrew Davis [Thu, 21 Jun 2012 03:14:32 +0000 (10:14 +0700)]
MDL-33717 files: improved display_size() so that it displays something nice for -1

9 years agoMerge branch 'MDL-33877' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Thu, 21 Jun 2012 02:04:29 +0000 (10:04 +0800)]
Merge branch 'MDL-33877' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-33430 Add process_file_aliases_queue restore step to the final task
David Mudrák [Wed, 20 Jun 2012 23:05:06 +0000 (01:05 +0200)]
MDL-33430 Add process_file_aliases_queue restore step to the final task

This execution step tries to actually restore all aliases that were
stashed in the file aliases queue.

9 years agoMDL-33430 Set newcontextid and newitemid when sending file to the pool
David Mudrák [Wed, 20 Jun 2012 09:36:41 +0000 (11:36 +0200)]
MDL-33430 Set newcontextid and newitemid when sending file to the pool

9 years agoMDL-33430 Add newcontextid and newitemid to backup_files_template
David Mudrák [Wed, 20 Jun 2012 09:15:47 +0000 (11:15 +0200)]
MDL-33430 Add newcontextid and newitemid to backup_files_template

These new fields will be used to hold the new location of the file once
it is sent to the filepool during the restore.

9 years agoMDL-33430 Do not restore aliases yet, stash them for later processing
David Mudrák [Tue, 19 Jun 2012 14:56:33 +0000 (16:56 +0200)]
MDL-33430 Do not restore aliases yet, stash them for later processing

9 years agoMDL-27675 mod_feedback: Fixed up white space
Sam Hemelryk [Wed, 20 Jun 2012 23:40:38 +0000 (11:40 +1200)]
MDL-27675 mod_feedback: Fixed up white space

9 years agoMDL-33430 Include repository type in files.xml in MBZ backup file
David Mudrák [Tue, 19 Jun 2012 11:56:30 +0000 (13:56 +0200)]
MDL-33430 Include repository type in files.xml in MBZ backup file

This is a valuable information needed especially when restoring the MBZ
at another site. The repositoryid itself is not enough there to identify
the type of the repository.

9 years agoMDL-33430 Make file_storage::unpack_reference() more picky on what it gets
David Mudrák [Wed, 20 Jun 2012 09:48:42 +0000 (11:48 +0200)]
MDL-33430 Make file_storage::unpack_reference() more picky on what it gets

9 years agoMerge branch 'MDL-27675_master' of git://github.com/grabs/moodle
Sam Hemelryk [Wed, 20 Jun 2012 23:25:07 +0000 (11:25 +1200)]
Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle

9 years agoMerge branch 'MDL-33808' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Wed, 20 Jun 2012 22:19:05 +0000 (10:19 +1200)]
Merge branch 'MDL-33808' of git://github.com/danpoltawski/moodle

9 years agoMerge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle
Sam Hemelryk [Wed, 20 Jun 2012 22:01:49 +0000 (10:01 +1200)]
Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle

9 years agoMerge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Wed, 20 Jun 2012 21:46:32 +0000 (09:46 +1200)]
Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle

Conflicts:
theme/base/style/core.css

9 years agoMDL-33911 lib/evalmath: fix strict syntax notices
Tim Hunt [Wed, 20 Jun 2012 12:48:37 +0000 (13:48 +0100)]
MDL-33911 lib/evalmath: fix strict syntax notices