Commit graph

54808 commits

Author SHA1 Message Date
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
Andrew Robert Nicols
a386e6e017 MDL-33916 Ensure that capabilities are checked for cached user enrolments 2012-06-20 17:07:30 +01: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
Jerome Mouneyrac
e6d1218ade MDL-33776 Web services: get_categories - subcategories should be checked against visible/theme keys 2012-06-20 15:49:20 +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
Jonathan Harker
def4a8f5b7 MDL-27125 better manage file handles when downloading multiple files.
Based on Dongsheng Cai's branch: s11_MDL-27125_curl_file_handler_master
2012-06-20 16:46:29 +12: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
Frederic Massart
f97aee76e7 MDL-9073 Glossary: uncategorised entries are printable 2012-06-20 12:24:44 +08:00
Aparup Banerjee
b2d1c67e2c MDL-33357 theme : mymobile whitespaces fixup 2012-06-20 12:11:28 +08:00
Aparup Banerjee
23099d5beb Merge branch 'MDL-33357-3' of git://github.com/epsd/moodle 2012-06-20 12:11:07 +08:00
Dan Poltawski
d8d2eebb44 Merge branch 'MDL-33773' of git://github.com/netspotau/moodle-mod_assign 2012-06-20 11:25:08 +08:00
Dan Poltawski
f14651b6b1 Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle 2012-06-20 11:17:01 +08:00
Aparup Banerjee
e77fe8f020 Merge branch 'MDL-33856-master-1' of git://git.luns.net.uk/moodle 2012-06-20 11:00:38 +08:00
Adrian Greeve
35ca63c166 MDL-33297 - forum - workshop - glossary - data - Updated the check for files to allow students to see files they recently uploaded. 2012-06-20 10:49:18 +08:00
Jason Fowler
e85b7e7865 MDL-32290 - Repositories - Fixing missing slash from the URL path 2012-06-20 10:41:58 +08:00
Ankit Agarwal
7c05cd0e1f MDL-32769 course: Adding completion summary to course sections 2012-06-20 09:38:35 +08:00
Eloy Lafuente (stronk7)
4388b63177 MDL-33875 delete category: fix E_STRICT reset() by ref. 2012-06-20 03:31:44 +02:00
AMOS bot
2406894a20 Automatically generated installer lang files 2012-06-20 00:31:14 +00:00
Eloy Lafuente (stronk7)
7128d8fca2 MDL-32003 xmldb: Use action error for filemodified check instead of structure one (protected attr). 2012-06-20 02:04:02 +02:00
Eloy Lafuente (stronk7)
cb172822e5 Merge branch 'w25_MDL-32003_m23_dbcleanup' of git://github.com/skodak/moodle 2012-06-20 02:03:47 +02:00
Dan Marsden
0c4390ed21 MDL-33835 Marking Guide - set currentfocus var to the first criteria comment to avoid JS errors. 2012-06-20 11:48:24 +12:00
Sam Hemelryk
f7dc4a5630 Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle 2012-06-20 11:39:59 +12:00