moodle.git
10 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

10 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

10 years agoMerge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle
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

10 years agoMerge branch 'MDL-33891-master-1' 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

10 years agoMDL-33683 Determine sectionid for activity chooser at display time
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.

10 years agoMDL-33891 Ensure that listen events are cancelled correctly when closing the dialogue
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

10 years agoMerge branch 'wip-MDL-33811-m23' of git://github.com/samhemelryk/moodle
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

10 years agoMerge branch 'wip-MDL-33715-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

10 years agoMerge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/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

10 years agoMerge branch 'wip-MDL-33825-m23' of git://github.com/samhemelryk/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

10 years agoMerge branch 'MDL-27156_part2' of git://github.com/andyjdavis/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

10 years agoMDL-27156 repositories: altered a check as the !empty() test on $PAGE->course was...
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

10 years agoMDL-33832 Fixed filling of files.source field
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

10 years agoMerge branch 'MDL-33649-master-2' of git://git.luns.net.uk/moodle
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

10 years agoMerge branch 'MDL-33722-master-wip' 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

10 years agoMerge branch 'MDL-33728-master-1' 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

10 years agoMerge branch 'MDL-33703-master-3' 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

10 years agoMerge branch 'MDL-33729-master-1' of git://git.luns.net.uk/moodle
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

10 years agoMerge branch 'w25_MDL-33831_m23_glossestrict' of git://github.com/skodak/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

10 years agoMerge branch 'MDL-33875' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 20 Jun 2012 05:45:49 +0000 (13:45 +0800)]
Merge branch 'MDL-33875' of git://github.com/stronk7/moodle

10 years agoMerge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/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

10 years agoMerge branch 'MDL-33862-master-1' of git://git.luns.net.uk/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

10 years agoMDL-33357 theme : mymobile whitespace fixes
Aparup Banerjee [Wed, 20 Jun 2012 04:49:20 +0000 (12:49 +0800)]
MDL-33357 theme : mymobile whitespace fixes

10 years agoMDL-27156 repositories: altered filepicker.php so that users with the ability to...
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

10 years agoMDL-33357 theme : mymobile whitespaces fixup
Aparup Banerjee [Wed, 20 Jun 2012 03:56:00 +0000 (11:56 +0800)]
MDL-33357 theme : mymobile whitespaces fixup

10 years agoMerge branch 'MDL-33357-3' of git://github.com/epsd/moodle
Aparup Banerjee [Wed, 20 Jun 2012 04:11:07 +0000 (12:11 +0800)]
Merge branch 'MDL-33357-3' of git://github.com/epsd/moodle

10 years agoMerge branch 'MDL-33773' of git://github.com/netspotau/moodle-mod_assign
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

10 years agoMerge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle
Dan Poltawski [Wed, 20 Jun 2012 03:17:01 +0000 (11:17 +0800)]
Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-33856-master-1' of git://git.luns.net.uk/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

10 years agoMDL-32290 - Repositories - Fixing missing slash from the URL path
Jason Fowler [Wed, 20 Jun 2012 01:52:53 +0000 (09:52 +0800)]
MDL-32290 - Repositories - Fixing missing slash from the URL path

10 years agoMDL-33875 delete category: fix E_STRICT reset() by ref.
Eloy Lafuente (stronk7) [Wed, 20 Jun 2012 01:31:44 +0000 (03:31 +0200)]
MDL-33875 delete category: fix E_STRICT reset() by ref.

10 years agoMDL-32003 xmldb: Use action error for filemodified check instead of structure one...
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).

10 years agoMerge branch 'w25_MDL-32003_m23_dbcleanup' of git://github.com/skodak/moodle
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

10 years agoMerge branch 'MDL-3971' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 19 Jun 2012 23:39:59 +0000 (11:39 +1200)]
Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/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

10 years agoMerge branch 'MDL-32908' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Tue, 19 Jun 2012 22:31:52 +0000 (10:31 +1200)]
Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33843' of git://github.com/netspotau/moodle-mod_assign
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

10 years agoMerge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 19 Jun 2012 21:15:48 +0000 (09:15 +1200)]
Merge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle

10 years agoMDL-33357 update mymobile inline for 2.3, attempt 3
John Stabinger [Tue, 19 Jun 2012 17:44:51 +0000 (13:44 -0400)]
MDL-33357 update mymobile inline for 2.3, attempt 3

10 years agoMDL-33862 Ensure that a chooserspan exists before trying to set it up
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

10 years agoMDL-33703 Adjust chooser location when changing browser orientation or size
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

10 years agoMDL-33773: Make view/grade all submissions a link in assignment module
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

10 years agoMerge branch 'MDL-33842_antivirus_message' of git://github.com/davosmith/moodle
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

10 years agoMDL-33842 Filemanager dndupload - now displays error messages (including antivirus)
Davo Smith [Tue, 19 Jun 2012 13:27:12 +0000 (14:27 +0100)]
MDL-33842 Filemanager dndupload - now displays error messages (including antivirus)

10 years agoMDL-33831 fix E_STRICT issues in glossary
Petr Škoda [Tue, 19 Jun 2012 11:57:11 +0000 (13:57 +0200)]
MDL-33831 fix E_STRICT issues in glossary

10 years agoMDL-33856 Correct CSS selectors for chooser dialogues in RTL languages
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

10 years agoMerge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle
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

10 years agoMDL-31330 fixed whitespace
Aparup Banerjee [Tue, 19 Jun 2012 08:13:29 +0000 (16:13 +0800)]
MDL-31330 fixed whitespace

10 years agoMerge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle
Aparup Banerjee [Tue, 19 Jun 2012 08:09:43 +0000 (16:09 +0800)]
Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle

Conflicts:
theme/base/style/core.css
theme/base/style/filemanager.css

10 years agoMDL-33845 Removed the hideous amounts of whitespace around the folder edit view for...
Martin Dougiamas [Tue, 19 Jun 2012 08:08:28 +0000 (16:08 +0800)]
MDL-33845 Removed the hideous amounts of whitespace around the folder edit view for canvas theme (and moved Folder CSS together)

10 years agoMerge branch 'MDL-33582-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 19 Jun 2012 07:39:03 +0000 (15:39 +0800)]
Merge branch 'MDL-33582-master-integration' of git://github.com/FMCorz/moodle

10 years agoMDL-33843: Remove custom dirty form handling and use default behaviour in assignment
Damyon Wiese [Tue, 19 Jun 2012 07:10:28 +0000 (15:10 +0800)]
MDL-33843: Remove custom dirty form handling and use default behaviour in assignment

10 years agoMDL-32908 - drop $USER->ajax
Dan Poltawski [Mon, 18 Jun 2012 15:11:07 +0000 (23:11 +0800)]
MDL-32908 - drop $USER->ajax

Its not been respected for some time and is just confusing

10 years agoMerge branch 'wip-MDL-32990-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Tue, 19 Jun 2012 06:59:48 +0000 (14:59 +0800)]
Merge branch 'wip-MDL-32990-master' of git://github.com/phalacee/moodle

10 years agoMDL-32990 - Repositories - Updating Box.net API calls to use HTTPS
Jason Fowler [Wed, 13 Jun 2012 00:33:18 +0000 (08:33 +0800)]
MDL-32990 - Repositories - Updating Box.net API calls to use HTTPS

10 years agoMDL-33130 Filemanager/Filepicker buttons, Activitity Chooser and Quiz revised to...
Barbara Ramiro [Tue, 19 Jun 2012 06:36:13 +0000 (14:36 +0800)]
MDL-33130 Filemanager/Filepicker buttons, Activitity Chooser and Quiz revised to look consistent

10 years agoMerge branch 'wip-MDL-33423-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 19 Jun 2012 06:29:25 +0000 (14:29 +0800)]
Merge branch 'wip-MDL-33423-m23' of git://github.com/samhemelryk/moodle

10 years agoMDL-30337 : removed extra css affecting LTR when it shouldn't.
Aparup Banerjee [Tue, 19 Jun 2012 06:26:32 +0000 (14:26 +0800)]
MDL-30337 : removed extra css affecting LTR when it shouldn't.

10 years agoMDL-33121 book - improve a lang string
Dan Poltawski [Tue, 19 Jun 2012 06:09:58 +0000 (14:09 +0800)]
MDL-33121 book - improve a lang string

+ Make a comment match coding style

10 years agoMerge branch 'MDL-33121' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 19 Jun 2012 06:14:54 +0000 (14:14 +0800)]
Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle

10 years agoMerge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Tue, 19 Jun 2012 05:27:07 +0000 (13:27 +0800)]
Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle

10 years agoMDL-33423 filepicker: Fixed visibility problem with loading icon
Sam Hemelryk [Tue, 19 Jun 2012 04:49:28 +0000 (16:49 +1200)]
MDL-33423 filepicker: Fixed visibility problem with loading icon

10 years agoMDL-33469 repository_picasa: oops, wrong pluginname in string
Dan Poltawski [Tue, 19 Jun 2012 03:56:45 +0000 (11:56 +0800)]
MDL-33469 repository_picasa: oops, wrong pluginname in string

10 years agoMDL-33417 Show reference icon for files in filepicker
Marina Glancy [Mon, 18 Jun 2012 08:17:30 +0000 (16:17 +0800)]
MDL-33417 Show reference icon for files in filepicker

10 years agoMerge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 01:09:30 +0000 (03:09 +0200)]
Merge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle

10 years agoMerge branch 'MDL-33623' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 01:05:52 +0000 (03:05 +0200)]
Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33469' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 01:01:30 +0000 (03:01 +0200)]
Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33294' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 00:59:46 +0000 (02:59 +0200)]
Merge branch 'MDL-33294' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33724' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 19 Jun 2012 00:56:19 +0000 (02:56 +0200)]
Merge branch 'MDL-33724' of git://github.com/danpoltawski/moodle

10 years agoMDL-33825 css_optimiser: Fixed bug where !important was being lost for advanced backg...
Sam Hemelryk [Tue, 19 Jun 2012 00:32:56 +0000 (12:32 +1200)]
MDL-33825 css_optimiser: Fixed bug where !important was being lost for advanced background styles

10 years agoMDL-33811 Fixed left over debugging code preventing proper setting of YUI gallery...
Sam Hemelryk [Mon, 18 Jun 2012 23:26:23 +0000 (11:26 +1200)]
MDL-33811 Fixed left over debugging code preventing proper setting of YUI gallery version

10 years agoMerge branch 'MDL-33778' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 22:54:39 +0000 (00:54 +0200)]
Merge branch 'MDL-33778' of git://github.com/timhunt/moodle

10 years agoMDL-33423 filepicker: Added delay and fade in to loading icon
Sam Hemelryk [Wed, 13 Jun 2012 00:01:19 +0000 (12:01 +1200)]
MDL-33423 filepicker: Added delay and fade in to loading icon

10 years agoMDL-33715 css_optimiser: enablecssoptimiser setting now triggers theme_reset_all_cach...
Sam Hemelryk [Wed, 13 Jun 2012 21:46:53 +0000 (09:46 +1200)]
MDL-33715 css_optimiser: enablecssoptimiser setting now triggers theme_reset_all_caches when changed

10 years agoMDL-33821 Fix SQL syntax for recent glossary activity
Andrew Robert Nicols [Mon, 18 Jun 2012 15:02:02 +0000 (16:02 +0100)]
MDL-33821 Fix SQL syntax for recent glossary activity

10 years agoMDL-33778 quiz statistics: part and class ids can be strings, not just ints.
Tim Hunt [Fri, 15 Jun 2012 12:53:02 +0000 (13:53 +0100)]
MDL-33778 quiz statistics: part and class ids can be strings, not just ints.

10 years agoMerge branch 'MDL-33818' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 18 Jun 2012 13:33:26 +0000 (21:33 +0800)]
Merge branch 'MDL-33818' of git://github.com/timhunt/moodle

10 years agoMDL-33818 quiz restore: quiz_attempt.state not restoring old MBZ
Tim Hunt [Mon, 18 Jun 2012 13:09:06 +0000 (14:09 +0100)]
MDL-33818 quiz restore: quiz_attempt.state not restoring old MBZ

This field was new in 2.3, so we need to set it when restoring backups
from 2.2 or before, using the same logic as in upgrade.

10 years agoMDL-33722 Set z-index for dndupload-status message to prevent it hiding other items
Andrew Robert Nicols [Mon, 18 Jun 2012 10:35:49 +0000 (11:35 +0100)]
MDL-33722 Set z-index for dndupload-status message to prevent it hiding other items

10 years agoMerge branch 'MDL-33552' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 10:31:37 +0000 (12:31 +0200)]
Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle

10 years agoMerge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith...
Dan Poltawski [Mon, 18 Jun 2012 09:36:03 +0000 (17:36 +0800)]
Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle

10 years agoMerge branch 'MDL-33175' of git://github.com/danpoltawski/moodle
Aparup Banerjee [Mon, 18 Jun 2012 09:14:11 +0000 (17:14 +0800)]
Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle

10 years agoMoodle release 2.3beta v2.3.0-beta
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 08:34:52 +0000 (10:34 +0200)]
Moodle release 2.3beta

10 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Mon, 18 Jun 2012 08:29:12 +0000 (10:29 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

10 years agoMDL-33121 Book Module: removing prev/next value from book_preload_chapters and more...
Rossiani Wijaya [Mon, 18 Jun 2012 08:10:15 +0000 (16:10 +0800)]
MDL-33121 Book Module: removing prev/next value from book_preload_chapters and more code cleaning

10 years agoMerge branch 'MDL-33794' of git://github.com/stronk7/moodle
Dan Poltawski [Mon, 18 Jun 2012 08:08:39 +0000 (16:08 +0800)]
Merge branch 'MDL-33794' of git://github.com/stronk7/moodle

Conflicts:
mod/assign/version.php

10 years agoMerge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle
Aparup Banerjee [Mon, 18 Jun 2012 08:03:08 +0000 (16:03 +0800)]
Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle

10 years agoMDL-30337 theme : cleanup after conflict.
Aparup Banerjee [Mon, 18 Jun 2012 08:02:34 +0000 (16:02 +0800)]
MDL-30337 theme : cleanup after conflict.

10 years agoMDL-33136 Dndupload filemanager - moved 'overwrite all' and 'rename all' buttons...
Davo Smith [Mon, 18 Jun 2012 07:56:39 +0000 (08:56 +0100)]
MDL-33136 Dndupload filemanager - moved 'overwrite all' and 'rename all' buttons onto new line

10 years agoMDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping...
Davo Smith [Sat, 16 Jun 2012 14:42:07 +0000 (15:42 +0100)]
MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name

10 years agoMerge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 18 Jun 2012 07:35:05 +0000 (15:35 +0800)]
Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 18 Jun 2012 07:18:02 +0000 (15:18 +0800)]
Merge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle

10 years agoMDL-33775 Course: fix redirect to course/section in paged mode
Frederic Massart [Fri, 15 Jun 2012 08:16:52 +0000 (16:16 +0800)]
MDL-33775 Course: fix redirect to course/section in paged mode

10 years agoMerge branch 'wip-MDL-33603-master-v2' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 18 Jun 2012 07:07:10 +0000 (15:07 +0800)]
Merge branch 'wip-MDL-33603-master-v2' of git://github.com/abgreeve/moodle

10 years agoMerge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 18 Jun 2012 06:34:35 +0000 (14:34 +0800)]
Merge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/moodle

10 years agoMerge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 18 Jun 2012 05:49:16 +0000 (13:49 +0800)]
Merge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'MDL-33779' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 18 Jun 2012 05:43:36 +0000 (13:43 +0800)]
Merge branch 'MDL-33779' of git://github.com/timhunt/moodle

10 years agoMerge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 18 Jun 2012 05:28:07 +0000 (13:28 +0800)]
Merge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign

10 years agoMerge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 18 Jun 2012 05:12:56 +0000 (13:12 +0800)]
Merge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign

10 years agoMDL-27156 repositories: altered filepicker.php so that users with the ability to...
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