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
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
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
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
Sam Hemelryk
f7dc4a5630
Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle
2012-06-20 11:39:59 +12:00
Sam Hemelryk
1e3d84785a
Merge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/moodle
2012-06-20 11:32:04 +12:00
Sam Hemelryk
a9efc8ddb8
Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle
2012-06-20 10:31:52 +12:00
Sam Hemelryk
ec1ca38996
Merge branch 'MDL-33843' of git://github.com/netspotau/moodle-mod_assign
2012-06-20 09:36:22 +12:00
Sam Hemelryk
dae0c90dbd
Merge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle
2012-06-20 09:15:48 +12:00
John Stabinger
256c51fab0
MDL-33357 update mymobile inline for 2.3, attempt 3
2012-06-19 13:44:51 -04:00
Andrew Robert Nicols
a51cf9302b
MDL-33862 Ensure that a chooserspan exists before trying to set it up
2012-06-19 15:43:14 +01:00
Andrew Robert Nicols
baca909631
MDL-33703 Adjust chooser location when changing browser orientation or size
2012-06-19 15:33:07 +01:00
Damyon Wiese
d9a88f427d
MDL-33773: Make view/grade all submissions a link in assignment module
2012-06-19 22:08:21 +08:00
Dan Poltawski
f189c540b9
Merge branch 'MDL-33842_antivirus_message' of git://github.com/davosmith/moodle
2012-06-19 21:52:27 +08:00
Davo Smith
78b4da1963
MDL-33842 Filemanager dndupload - now displays error messages (including antivirus)
2012-06-19 14:27:12 +01:00
Petr Škoda
9bba13089d
MDL-33831 fix E_STRICT issues in glossary
2012-06-19 13:57:11 +02:00
Andrew Robert Nicols
61eadb51af
MDL-33856 Correct CSS selectors for chooser dialogues in RTL languages
2012-06-19 10:32:32 +01:00
Dan Poltawski
5e3698fda0
Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle
...
Conflicts:
theme/base/style/core.css
2012-06-19 16:28:00 +08:00
Aparup Banerjee
4214bc63a8
MDL-31330 fixed whitespace
2012-06-19 16:13:29 +08:00
Aparup Banerjee
9e4d54e15d
Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle
...
Conflicts:
theme/base/style/core.css
theme/base/style/filemanager.css
2012-06-19 16:09:43 +08:00
Martin Dougiamas
c23170914a
MDL-33845 Removed the hideous amounts of whitespace around the folder edit view for canvas theme (and moved Folder CSS together)
2012-06-19 16:08:28 +08:00
Dan Poltawski
139d3639c8
Merge branch 'MDL-33582-master-integration' of git://github.com/FMCorz/moodle
2012-06-19 15:39:03 +08:00
Damyon Wiese
5382eabbec
MDL-33843: Remove custom dirty form handling and use default behaviour in assignment
2012-06-19 15:18:07 +08:00
Dan Poltawski
a80b5a0cf0
MDL-32908 - drop $USER->ajax
...
Its not been respected for some time and is just confusing
2012-06-19 15:07:18 +08:00
Aparup Banerjee
1ee9b37880
Merge branch 'wip-MDL-32990-master' of git://github.com/phalacee/moodle
2012-06-19 14:59:48 +08:00
Jason Fowler
9e9382530f
MDL-32990 - Repositories - Updating Box.net API calls to use HTTPS
2012-06-19 14:46:44 +08:00
Barbara Ramiro
af9c48cbe9
MDL-33130 Filemanager/Filepicker buttons, Activitity Chooser and Quiz revised to look consistent
2012-06-19 14:36:13 +08:00
Dan Poltawski
bb046e61b6
Merge branch 'wip-MDL-33423-m23' of git://github.com/samhemelryk/moodle
2012-06-19 14:29:25 +08:00