Commit graph

54494 commits

Author SHA1 Message Date
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
Aparup Banerjee
900183ebf7 MDL-33357 theme : mymobile whitespace fixes 2012-06-20 12:49:20 +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
Jason Fowler
e85b7e7865 MDL-32290 - Repositories - Fixing missing slash from the URL path 2012-06-20 10:41:58 +08: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
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
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
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
Aparup Banerjee
36080a2da2 MDL-30337 : removed extra css affecting LTR when it shouldn't. 2012-06-19 14:27:41 +08:00
Dan Poltawski
4bf433b5fb MDL-33121 book - improve a lang string
+ Make a comment match coding style
2012-06-19 14:15:11 +08:00
Dan Poltawski
34741af185 Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle 2012-06-19 14:14:54 +08:00
Dan Poltawski
c1ac8fa189 Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle 2012-06-19 13:27:07 +08:00
Sam Hemelryk
9d7d2b03c8 MDL-33423 filepicker: Fixed visibility problem with loading icon 2012-06-19 16:53:44 +12:00
Dan Poltawski
a2e6088c7f MDL-33469 repository_picasa: oops, wrong pluginname in string 2012-06-19 11:56:45 +08:00
Marina Glancy
1778f310f3 MDL-33417 Show reference icon for files in filepicker 2012-06-19 11:15:51 +08:00
Eloy Lafuente (stronk7)
f18ad1b781 Merge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle 2012-06-19 03:09:30 +02:00
Eloy Lafuente (stronk7)
926b08ca4b Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle 2012-06-19 03:05:52 +02:00
Eloy Lafuente (stronk7)
25c94edb27 Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle 2012-06-19 03:01:30 +02:00
Eloy Lafuente (stronk7)
f98973c2ff Merge branch 'MDL-33294' of git://github.com/danpoltawski/moodle 2012-06-19 02:59:46 +02:00
Eloy Lafuente (stronk7)
f2904fe243 Merge branch 'MDL-33724' of git://github.com/danpoltawski/moodle 2012-06-19 02:56:19 +02:00
Eloy Lafuente (stronk7)
e165512d3a Merge branch 'MDL-33778' of git://github.com/timhunt/moodle 2012-06-19 00:54:39 +02:00
Sam Hemelryk
2e7ce603ff MDL-33423 filepicker: Added delay and fade in to loading icon 2012-06-19 10:11:21 +12:00
Andrew Robert Nicols
48e6de1c34 MDL-33821 Fix SQL syntax for recent glossary activity 2012-06-18 16:02:02 +01:00
Tim Hunt
72f2e13d04 MDL-33778 quiz statistics: part and class ids can be strings, not just ints. 2012-06-18 14:39:21 +01:00
Dan Poltawski
07384ecc8b Merge branch 'MDL-33818' of git://github.com/timhunt/moodle 2012-06-18 21:33:26 +08:00
Tim Hunt
584ae11a52 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.
2012-06-18 14:09:06 +01:00