Dan Poltawski [Mon, 25 Jun 2012 03:20:40 +0000 (11:20 +0800)]
Merge branch 'MDL-33980' of github.com:equella/moodle
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
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
Eloy Lafuente (stronk7) [Sun, 24 Jun 2012 16:37:12 +0000 (18:37 +0200)]
Moodle release 2.3rc1
Eloy Lafuente (stronk7) [Sun, 24 Jun 2012 16:31:09 +0000 (18:31 +0200)]
Fix permissions.
Eloy Lafuente (stronk7) [Sun, 24 Jun 2012 16:27:53 +0000 (18:27 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/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
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
Sam Hemelryk [Fri, 22 Jun 2012 02:40:09 +0000 (14:40 +1200)]
Merge branch 'MDL-32769-master' of git://github.com/ankitagarwal/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
Damyon Wiese [Fri, 22 Jun 2012 01:03:18 +0000 (09:03 +0800)]
MDL-33954: Assignment "submissionreceipthtml" Language change
Add the missing word: "see"
AMOS bot [Fri, 22 Jun 2012 00:31:21 +0000 (00:31 +0000)]
Automatically generated installer lang files
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
Sam Hemelryk [Thu, 21 Jun 2012 22:42:56 +0000 (10:42 +1200)]
MDL-32769 completion: Fixed up display of completion information
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
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
Sam Hemelryk [Thu, 21 Jun 2012 21:02:50 +0000 (09:02 +1200)]
Merge branch 'MDL-33915' of git://github.com/danpoltawski/moodle
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
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.
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.
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
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.
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
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
Ankit Agarwal [Thu, 21 Jun 2012 08:16:48 +0000 (16:16 +0800)]
MDL-32769 course: Moving the completion status to a new line
Dan Poltawski [Thu, 21 Jun 2012 07:58:23 +0000 (15:58 +0800)]
MDL-33911 mathslib: add unit test to demonstrate problem
Dan Poltawski [Thu, 21 Jun 2012 08:00:08 +0000 (16:00 +0800)]
Merge branch 'MDL-33911' of git://github.com/timhunt/moodle
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%)
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
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
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
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
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
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
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
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
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
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
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.
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
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.
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
Sam Hemelryk [Wed, 20 Jun 2012 23:40:38 +0000 (11:40 +1200)]
MDL-27675 mod_feedback: Fixed up white space
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.
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
Sam Hemelryk [Wed, 20 Jun 2012 23:25:07 +0000 (11:25 +1200)]
Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle
Sam Hemelryk [Wed, 20 Jun 2012 22:19:05 +0000 (10:19 +1200)]
Merge branch 'MDL-33808' of git://github.com/danpoltawski/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
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
Tim Hunt [Wed, 20 Jun 2012 12:48:37 +0000 (13:48 +0100)]
MDL-33911 lib/evalmath: fix strict syntax notices
Aparup Banerjee [Wed, 20 Jun 2012 11:36:22 +0000 (19:36 +0800)]
Merge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle
Dan Poltawski [Wed, 20 Jun 2012 09:43:47 +0000 (17:43 +0800)]
Merge branch 'MDL-33891-master-1' of git://git.luns.net.uk/moodle
Andrew Robert Nicols [Wed, 13 Jun 2012 14:16:05 +0000 (15:16 +0100)]
MDL-33683 Determine sectionid for activity chooser at display time
Rather than calculate the sectionid for the activity chooser on page load,
we do so when opening the chooser. This resolves issues where sections have
been moved without swapping all of the section IDs around.
Andrew Robert Nicols [Wed, 20 Jun 2012 09:18:19 +0000 (10:18 +0100)]
MDL-33891 Ensure that listen events are cancelled correctly when closing the dialogue
Aparup Banerjee [Wed, 20 Jun 2012 09:18:00 +0000 (17:18 +0800)]
Merge branch 'wip-MDL-33811-m23' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Wed, 20 Jun 2012 08:57:51 +0000 (16:57 +0800)]
Merge branch 'wip-MDL-33715-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 20 Jun 2012 08:55:29 +0000 (16:55 +0800)]
Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle
Aparup Banerjee [Wed, 20 Jun 2012 08:50:54 +0000 (16:50 +0800)]
Merge branch 'wip-MDL-33825-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 20 Jun 2012 08:38:13 +0000 (16:38 +0800)]
Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle
Andrew Davis [Wed, 20 Jun 2012 08:17:12 +0000 (15:17 +0700)]
MDL-27156 repositories: altered a check as the !empty() test on $PAGE->course was always failing for some reason
Marina Glancy [Wed, 20 Jun 2012 08:09:37 +0000 (16:09 +0800)]
MDL-33832 Fixed filling of files.source field
- also supress the error on unserialise (because people already may have broken files.source field)
- also display details about unparseable JSON error
- make source field look the same across repositories
Aparup Banerjee [Wed, 20 Jun 2012 07:19:18 +0000 (15:19 +0800)]
Merge branch 'MDL-33649-master-2' of git://git.luns.net.uk/moodle
Aparup Banerjee [Wed, 20 Jun 2012 06:53:20 +0000 (14:53 +0800)]
Merge branch 'MDL-33722-master-wip' of git://git.luns.net.uk/moodle
Aparup Banerjee [Wed, 20 Jun 2012 06:49:16 +0000 (14:49 +0800)]
Merge branch 'MDL-33728-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Wed, 20 Jun 2012 06:39:58 +0000 (14:39 +0800)]
Merge branch 'MDL-33703-master-3' of git://git.luns.net.uk/moodle
Damyon Wiese [Wed, 20 Jun 2012 06:33:33 +0000 (14:33 +0800)]
MDL-33877: Prevent duplicate records in grade items table after running assignment upgrade tool
The cause was multiple calls to set_field on the same table. Changed to update_record.
Aparup Banerjee [Wed, 20 Jun 2012 06:28:05 +0000 (14:28 +0800)]
Merge branch 'MDL-33729-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Wed, 20 Jun 2012 05:57:26 +0000 (13:57 +0800)]
Merge branch 'w25_MDL-33831_m23_glossestrict' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 20 Jun 2012 05:45:49 +0000 (13:45 +0800)]
Merge branch 'MDL-33875' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 20 Jun 2012 05:42:19 +0000 (13:42 +0800)]
Merge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 20 Jun 2012 05:22:42 +0000 (13:22 +0800)]
Merge branch 'MDL-33862-master-1' of git://git.luns.net.uk/moodle
Damyon Wiese [Wed, 20 Jun 2012 05:11:19 +0000 (13:11 +0800)]
MDL-33878: Assignment - prevent error when removing overridden flag in gradebook
This error only occurs when there is a submission but no grade in the assignment
and the feedback comments plugin is enabled.
Aparup Banerjee [Wed, 20 Jun 2012 04:49:20 +0000 (12:49 +0800)]
MDL-33357 theme : mymobile whitespace fixes
Andrew Davis [Mon, 18 Jun 2012 04:33:28 +0000 (11:33 +0700)]
MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted
Aparup Banerjee [Wed, 20 Jun 2012 03:56:00 +0000 (11:56 +0800)]
MDL-33357 theme : mymobile whitespaces fixup
Aparup Banerjee [Wed, 20 Jun 2012 04:11:07 +0000 (12:11 +0800)]
Merge branch 'MDL-33357-3' of git://github.com/epsd/moodle
Dan Poltawski [Wed, 20 Jun 2012 03:25:08 +0000 (11:25 +0800)]
Merge branch 'MDL-33773' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Wed, 20 Jun 2012 03:17:01 +0000 (11:17 +0800)]
Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Wed, 20 Jun 2012 03:00:38 +0000 (11:00 +0800)]
Merge branch 'MDL-33856-master-1' of git://git.luns.net.uk/moodle
Adrian Greeve [Fri, 25 May 2012 03:45:08 +0000 (11:45 +0800)]
MDL-33297 - forum - workshop - glossary - data - Updated the check for files to allow students to see files they recently uploaded.
Jason Fowler [Wed, 20 Jun 2012 01:52:53 +0000 (09:52 +0800)]
MDL-32290 - Repositories - Fixing missing slash from the URL path
Ankit Agarwal [Wed, 20 Jun 2012 01:33:32 +0000 (09:33 +0800)]
MDL-32769 course: Adding completion summary to course sections
Eloy Lafuente (stronk7) [Wed, 20 Jun 2012 01:31:44 +0000 (03:31 +0200)]
MDL-33875 delete category: fix E_STRICT reset() by ref.
AMOS bot [Wed, 20 Jun 2012 00:31:14 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 23:26:06 +0000 (01:26 +0200)]
MDL-32003 xmldb: Use action error for filemodified check instead of structure one (protected attr).
Eloy Lafuente (stronk7) [Wed, 20 Jun 2012 00:03:47 +0000 (02:03 +0200)]
Merge branch 'w25_MDL-32003_m23_dbcleanup' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 19 Jun 2012 23:39:59 +0000 (11:39 +1200)]
Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 19 Jun 2012 23:32:04 +0000 (11:32 +1200)]
Merge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 19 Jun 2012 22:31:52 +0000 (10:31 +1200)]
Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 19 Jun 2012 21:36:22 +0000 (09:36 +1200)]
Merge branch 'MDL-33843' of git://github.com/netspotau/moodle-mod_assign
Sam Hemelryk [Tue, 19 Jun 2012 21:15:48 +0000 (09:15 +1200)]
Merge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle
John Stabinger [Tue, 19 Jun 2012 17:44:51 +0000 (13:44 -0400)]
MDL-33357 update mymobile inline for 2.3, attempt 3
Andrew Robert Nicols [Tue, 19 Jun 2012 14:43:14 +0000 (15:43 +0100)]
MDL-33862 Ensure that a chooserspan exists before trying to set it up
Andrew Robert Nicols [Wed, 13 Jun 2012 09:49:38 +0000 (10:49 +0100)]
MDL-33703 Adjust chooser location when changing browser orientation or size
Damyon Wiese [Tue, 19 Jun 2012 14:08:21 +0000 (22:08 +0800)]
MDL-33773: Make view/grade all submissions a link in assignment module
Dan Poltawski [Tue, 19 Jun 2012 13:52:27 +0000 (21:52 +0800)]
Merge branch 'MDL-33842_antivirus_message' of git://github.com/davosmith/moodle
Davo Smith [Tue, 19 Jun 2012 13:27:12 +0000 (14:27 +0100)]
MDL-33842 Filemanager dndupload - now displays error messages (including antivirus)
Petr Škoda [Tue, 19 Jun 2012 11:57:11 +0000 (13:57 +0200)]
MDL-33831 fix E_STRICT issues in glossary
Andrew Robert Nicols [Tue, 19 Jun 2012 09:32:32 +0000 (10:32 +0100)]
MDL-33856 Correct CSS selectors for chooser dialogues in RTL languages
Dan Poltawski [Tue, 19 Jun 2012 08:28:00 +0000 (16:28 +0800)]
Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle
Conflicts:
theme/base/style/core.css
