Commit graph

54610 commits

Author SHA1 Message Date
Dan Poltawski
2a67e6f28b MDL-33911 mathslib: add unit test to demonstrate problem 2012-06-21 16:00:45 +08:00
Dan Poltawski
1e485acd7d Merge branch 'MDL-33911' of git://github.com/timhunt/moodle 2012-06-21 16:00:08 +08:00
Adrian Greeve
612aee17b0 MDL-33931 - themes - Change of the base theme to align the submit and cancel buttons with the rest of the mform (15%) 2012-06-21 15:47:02 +08:00
Dan Poltawski
75c8a109e5 Merge branch 'MDL-33878' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 15:21:13 +08:00
Dan Poltawski
22b0514e27 Merge branch 'MDL-33860' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 14:56:07 +08:00
Damyon Wiese
caff10a0b0 MDL-33850: Assignment: Change text to "Add submission" before anything has been submitted
AMOS BEGIN
 CPY [addsubmission,mod_assignment],[addsubmission,mod_assign]
AMOS END
2012-06-21 14:48:53 +08:00
Damyon Wiese
7056953a1c MDL-33860: Use get_string for All option in assignment grading table 2012-06-21 14:48:28 +08:00
Ankit Agarwal
68b8cc84af MDL-32769 course: Do not show a completion status of 0/0 2012-06-21 13:29:46 +08:00
Mary Evans
088511ded6 MDL-33785 theme_base: RTL fixes added to style/filemanager.css
Conflicts:

	theme/base/style/filemanager.css
2012-06-21 17:24:07 +12:00
Dan Poltawski
026082b401 MDL-33915 - prevent use of rebuild_course_cache during upgrade
It depends on upgrade changes itself
2012-06-21 11:43:54 +08:00
Jason Fowler
3d24b287be MDL-33928 - Installation - Fixing the size of the host field for database details in the installation stage 2012-06-21 11:18:51 +08:00
Andrew Davis
7db6bb7f61 MDL-33717 files: improved display_size() so that it displays something nice for -1 2012-06-21 10:14:32 +07:00
Dan Poltawski
334de6b691 Merge branch 'MDL-33877' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 10:04:29 +08:00
David Mudrák
2c1426743a 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.
2012-06-21 02:31:26 +02:00
David Mudrák
83b2cc562d MDL-33430 Set newcontextid and newitemid when sending file to the pool 2012-06-21 02:31:18 +02:00
David Mudrák
38ca2f1a83 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.
2012-06-21 02:29:42 +02:00
David Mudrák
4b6b087faf MDL-33430 Do not restore aliases yet, stash them for later processing 2012-06-21 02:29:34 +02:00
Sam Hemelryk
5f17311f52 MDL-27675 mod_feedback: Fixed up white space 2012-06-21 11:40:38 +12:00
David Mudrák
79b810fdc0 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.
2012-06-21 01:32:25 +02:00
David Mudrák
6feae1d256 MDL-33430 Make file_storage::unpack_reference() more picky on what it gets 2012-06-21 01:32:24 +02:00
Sam Hemelryk
d2448b8bd2 Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle 2012-06-21 11:25:07 +12:00
Sam Hemelryk
92e0842978 Merge branch 'MDL-33808' of git://github.com/danpoltawski/moodle 2012-06-21 10:19:05 +12:00
Sam Hemelryk
21cb669f36 Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle 2012-06-21 10:01:49 +12:00
Sam Hemelryk
45d011c896 Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/base/style/core.css
2012-06-21 09:46:32 +12:00
Tim Hunt
4efc3d4096 MDL-33911 lib/evalmath: fix strict syntax notices 2012-06-20 13:48:37 +01:00
Aparup Banerjee
c575842ce9 Merge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle 2012-06-20 19:36:22 +08:00
Dan Poltawski
5649520d9b Merge branch 'MDL-33891-master-1' of git://git.luns.net.uk/moodle 2012-06-20 17:43:47 +08:00
Andrew Robert Nicols
ae86017339 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.
2012-06-20 10:32:10 +01:00
Andrew Robert Nicols
dfe15e0ef9 MDL-33891 Ensure that listen events are cancelled correctly when closing the dialogue 2012-06-20 10:18:19 +01:00
Aparup Banerjee
4c7d9eb5c2 Merge branch 'wip-MDL-33811-m23' of git://github.com/samhemelryk/moodle 2012-06-20 17:18:00 +08:00
Aparup Banerjee
01158d86c4 Merge branch 'wip-MDL-33715-m23' of git://github.com/samhemelryk/moodle 2012-06-20 16:57:51 +08:00
Dan Poltawski
73ec069e3b Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle 2012-06-20 16:55:29 +08:00
Aparup Banerjee
c949723817 Merge branch 'wip-MDL-33825-m23' of git://github.com/samhemelryk/moodle 2012-06-20 16:50:54 +08:00
Dan Poltawski
e3c7845314 Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle 2012-06-20 16:38:13 +08:00
Andrew Davis
703ffaea05 MDL-27156 repositories: altered a check as the !empty() test on $PAGE->course was always failing for some reason 2012-06-20 15:17:12 +07:00
Marina Glancy
83d2700ec9 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
2012-06-20 16:09:37 +08:00
Aparup Banerjee
3262f547fc Merge branch 'MDL-33649-master-2' of git://git.luns.net.uk/moodle 2012-06-20 15:19:18 +08:00
Rajesh Taneja
99f374c457 MDL-33419 Filepicker: Reference/source icons are visible in filemanager list and table view 2012-06-20 15:07:58 +08:00
Aparup Banerjee
cd29a5822f Merge branch 'MDL-33722-master-wip' of git://git.luns.net.uk/moodle 2012-06-20 14:53:20 +08:00
Aparup Banerjee
7189225b7a Merge branch 'MDL-33728-master-1' of git://git.luns.net.uk/moodle 2012-06-20 14:49:16 +08:00
Aparup Banerjee
f65d3d1d18 Merge branch 'MDL-33703-master-3' of git://git.luns.net.uk/moodle 2012-06-20 14:39:58 +08:00
Damyon Wiese
1f417de84a 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.
2012-06-20 14:33:33 +08:00
Aparup Banerjee
eca0371465 Merge branch 'MDL-33729-master-1' of git://git.luns.net.uk/moodle 2012-06-20 14:28:05 +08:00
Dan Poltawski
b1c43c3f64 Merge branch 'w25_MDL-33831_m23_glossestrict' of git://github.com/skodak/moodle 2012-06-20 13:57:26 +08:00
Dan Poltawski
a3086f3233 Merge branch 'MDL-33875' of git://github.com/stronk7/moodle 2012-06-20 13:45:49 +08:00
Dan Poltawski
6e471afe8b Merge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/moodle 2012-06-20 13:42:19 +08:00
Dan Poltawski
b19af5b41c Merge branch 'MDL-33862-master-1' of git://git.luns.net.uk/moodle 2012-06-20 13:22:42 +08:00
Damyon Wiese
14c46e24a9 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.
2012-06-20 13:11:19 +08:00
Aparup Banerjee
900183ebf7 MDL-33357 theme : mymobile whitespace fixes 2012-06-20 12:49:20 +08:00
Andrew Davis
bc8da017b5 MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted 2012-06-20 11:27:31 +07:00