56666 Commits

Author SHA1 Message Date
Sam Hemelryk
382d11a43c Merge branch 'MDL-35288_dndupload_folder_warning' of git://github.com/davosmith/moodle 2012-10-08 11:18:54 +13:00
Sam Hemelryk
68b9d1f408 Merge branch 'MDL-35211_master' of git://github.com/kordan/moodle 2012-10-08 11:02:44 +13:00
Sam Hemelryk
2a00249df5 Merge branch 'MDL-35763' of git://github.com/netspotau/moodle-mod_assign 2012-10-08 10:44:10 +13:00
Sam Hemelryk
da2ebe0474 Merge branch 'MDL-35764' of git://github.com/netspotau/moodle-mod_assign 2012-10-08 10:40:35 +13:00
Sam Hemelryk
e8edb00c73 Merge branch 'MDL-34992' of git://github.com/nebgor/moodle 2012-10-08 10:33:48 +13:00
Sam Hemelryk
9201c33bb7 Merge branch 'MDL-33646-master' of git://github.com/ankitagarwal/moodle 2012-10-08 10:22:18 +13:00
Sam Hemelryk
2a2d855e14 Merge branch 'MDL-35667_extra_credit_loop' of git://github.com/andyjdavis/moodle 2012-10-08 10:15:49 +13:00
Sam Hemelryk
4c5f42b400 Merge branch 'MDL-35730' of https://github.com/aolley/moodle 2012-10-08 10:06:30 +13:00
Eloy Lafuente (stronk7)
ccd90e765e weekly release 2.4dev 2012-10-05 13:40:36 +02:00
Eloy Lafuente (stronk7)
76fd95e687 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-10-05 13:32:46 +02:00
Dan Poltawski
f7e8f312ca Revert "MDL-33117 grade: added some smarts to the user report method inject_rowspans() to deal with activity conditional availability"
This reverts commit 69c8bcec70f8ffacabb4ba228c5de674aa3520c7.
2012-10-05 16:21:14 +08:00
Aparup Banerjee
3df3c6773b MDL-34992 message : improved component sorting and some minor code clean up. 2012-10-05 10:58:28 +08:00
Eloy Lafuente (stronk7)
5e6f26bdbe MDL-34657 tests: amend tests to verify lower() is used 2012-10-05 02:46:49 +02:00
Eloy Lafuente (stronk7)
b5d155a417 MDL-34657 gropus UI: delete unused var. 2012-10-04 23:49:12 +02:00
Eloy Lafuente (stronk7)
7ba4b17f00 Merge branch 'MDL-34657_fixup' of git://github.com/timhunt/moodle 2012-10-04 23:42:47 +02:00
Tim Hunt
965d167068 MDL-34657 stats / user sorting: fix SQL regression. 2012-10-04 11:47:39 +01:00
Tim Hunt
e451c11616 MDL-34657 workshop / user sorting: fix SQL regression. 2012-10-04 11:47:04 +01:00
Tim Hunt
70f5ed370f MDL-34657 gropus UI: sort existing group memebers. 2012-10-04 11:45:56 +01:00
Tim Hunt
d0577078fa MDL-34657 system admins: main admin mis-identified in the UI. 2012-10-04 11:44:50 +01:00
Tim Hunt
c2004a7952 MDL-34657 user sort: exact match logic should be case-insensitive. 2012-10-04 11:43:33 +01:00
Dan Poltawski
e12a3e64ac Merge branch 'MDL-35767-master' of git://git.luns.net.uk/moodle 2012-10-04 16:57:40 +08:00
Ankit Agarwal
5219cc87ec MDL-33646 book: Adding a notice instead of error when there is no content in the book 2012-10-04 13:25:18 +08:00
Damyon Wiese
848ade1d18 MDL-35764: Change the language string on the assignment grading summary to say "Editing status" 2012-10-04 12:51:49 +08:00
AMOS bot
434d22b6fe Automatically generated installer lang files 2012-10-04 00:34:58 +00:00
Ruslan Kabalin
2596265b36 MDL-35767 Fix missing target event group check
Prevent interfering between items from different groups (and no groups)
2012-10-03 14:34:54 +01:00
Davo Smith
91813c1b4b MDL-35288 drag and drop upload - adjust error message text when attempting to upload a folder 2012-10-03 08:46:55 +01:00
David Monllao
d91750bc5a MDL-35187 groups Adding admin pagelayout to group members edition 2012-10-03 14:40:22 +08:00
Damyon Wiese
8e9efe602a MDL-35763: Add ignoredirty class to drop down lists in assignment grading options form. 2012-10-03 11:52:50 +08:00
Dan Poltawski
fcdd35d0fc Merge branch 'MDL-35754-master' of git://github.com/FMCorz/moodle 2012-10-03 10:26:14 +08:00
Frederic Massart
df435dda49 MDL-35754 libraries: openpopup() does not fail when window name is not set 2012-10-03 09:54:27 +08:00
Eloy Lafuente (stronk7)
b478f2ec10 Merge branch 'MDL-35744' of git://github.com/timhunt/moodle 2012-10-03 00:40:10 +02:00
Sam Hemelryk
40b26758db Merge branch 'wip-MDL-33829-master' of https://github.com/andyjdavis/moodle 2012-10-03 10:07:37 +13:00
Sam Hemelryk
a0251e5006 Merge branch 'MDL-35654_master' of git://github.com/lazydaisy/moodle 2012-10-03 09:53:05 +13:00
Eloy Lafuente (stronk7)
db0ea4323d Merge branch 'MDL-35660' of git://github.com/netspotau/moodle-mod_assign 2012-10-02 22:02:23 +02:00
Eloy Lafuente (stronk7)
c740703c18 Merge branch 'w40_MDL-31437_m24_cohortsync' of git://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2012-10-02 22:00:12 +02:00
Eloy Lafuente (stronk7)
60e5d95a31 Merge branch 'master_MDL-35227' of git://github.com/danmarsden/moodle 2012-10-02 21:39:07 +02:00
Eloy Lafuente (stronk7)
5a2c374326 Merge branch 'w40_MDL-35701_m24_enroldb' of git://github.com/skodak/moodle 2012-10-02 21:27:55 +02:00
Eloy Lafuente (stronk7)
f7a506fb87 Merge branch 'master_MDL-35557' of git://github.com/danmarsden/moodle 2012-10-02 20:26:32 +02:00
Tim Hunt
b3c18b8621 MDL-35744 quiz: fix review options for Never submitted attempts 2012-10-02 15:51:45 +01:00
Eloy Lafuente (stronk7)
b94ffc6d8c Merge branch 'master_MDL-35562' of git://github.com/danmarsden/moodle 2012-10-02 15:54:32 +02:00
Eloy Lafuente (stronk7)
2aeb0fbb60 Merge branch 'MDL-35673-master' of git://git.luns.net.uk/moodle 2012-10-02 09:55:20 +02:00
Dan Poltawski
001d5a034c Merge branch 'MDL-35687' of git://github.com/netspotau/moodle-mod_assign 2012-10-02 14:44:28 +08:00
Dan Poltawski
813a7724cf Merge branch 'MDL-35636' of git://github.com/mouneyrac/moodle 2012-10-02 14:40:23 +08:00
Dan Poltawski
497359f970 Merge branch 'MDL-33789_master' of git://github.com/kordan/moodle 2012-10-02 14:38:20 +08:00
Dan Poltawski
c38e18ec37 Merge branch 'MDL-35684' of git://github.com/netspotau/moodle-mod_assign 2012-10-02 14:33:01 +08:00
Dan Poltawski
1e12c7a4f2 Merge branch 'wip-MDL-35263-master' of git://github.com/marinaglancy/moodle 2012-10-02 14:20:07 +08:00
Marina Glancy
d0c05602f5 MDL-35263 removed unit test test_format_display_course_content()
since the function global_navigation::format_display_course_content() is removed
2012-10-02 14:16:54 +08:00
Dan Poltawski
ed27ce0163 Merge branch 'MDL-34570-master' of git://github.com/FMCorz/moodle 2012-10-02 13:56:48 +08:00
Dan Poltawski
f14ecbfff8 Merge branch 'MDL-35187' of git://github.com/lazydaisy/moodle 2012-10-02 13:45:19 +08:00
Adam Olley
e3d9426ab5 enrol_manual: Set context correctly in manual enrolment user selector 2012-10-02 14:51:24 +09:30