Commit graph

46809 commits

Author SHA1 Message Date
Sam Hemelryk
13738840b2 Merge branch 'MDL-26031_20_wip_guestsession' of git://github.com/skodak/moodle 2011-01-18 15:40:50 +08:00
Sam Hemelryk
07d4c7ac6e Merge branch 'MDL-26007_20_wip_enverror' of git://github.com/skodak/moodle 2011-01-18 15:34:43 +08:00
Sam Hemelryk
dcad74e406 Merge branch 'MDL-25910_20_wip_mysqlsocket' of git://github.com/skodak/moodle 2011-01-18 14:18:24 +08:00
Sam Hemelryk
e5654cad1e Merge branch 'MDL-25754_20_wip' of git://github.com/skodak/moodle 2011-01-18 13:47:31 +08:00
Sam Hemelryk
ec9b044d12 Merge rebased branch 'MDL-25769' of git://github.com/andyjdavis/moodle.git 2011-01-18 12:03:11 +08:00
Sam Hemelryk
25081b95f9 gradebook MDL-25769 Fixed SQL syntax formatting 2011-01-18 11:56:21 +08:00
andyjdavis
f2491a11a1 gradebook MDL-25769 switched a query over to use named params 2011-01-18 11:56:20 +08:00
andyjdavis
2dc5e58466 gradebook MDL-25769 fixed some problems identified by peer review 2011-01-18 11:56:06 +08:00
andyjdavis
387815db61 gradebook MDL-25769 fixed up the grader report 2011-01-18 11:49:46 +08:00
andyjdavis
b61e4f4624 gradebook MDL-25769 fixed grade/import/lib.php get_unenrolled_users_in_import() 2011-01-18 11:49:46 +08:00
andyjdavis
ef8f084cc6 gradebook MDL-25769 fixed the loading of users in the grader report 2011-01-18 11:49:40 +08:00
Sam Hemelryk
3d12d1682e Merge branch 'MDL-25887' of git://github.com/andyjdavis/moodle.git 2011-01-18 10:56:51 +08:00
Sam Hemelryk
e8aad16f7e gradebook MDL-25887 Fixed whitespace 2011-01-18 10:55:36 +08:00
Petr Skoda
e565c9baf7 Merge branch 'MDL-25789' of git://github.com/samhemelryk/moodle 2011-01-17 21:22:43 +01:00
Petr Skoda
696a6ee12f Merge branch 'MDL-25790' of git://github.com/samhemelryk/moodle 2011-01-17 21:13:07 +01:00
Petr Skoda
2f20e23ba6 MDL-25791 PULL-125 reverting commits that create null problems during upgrade 2011-01-17 21:08:05 +01:00
Petr Skoda
1f50b85867 Merge branch 'MDL-25791' of git://github.com/samhemelryk/moodle 2011-01-17 20:52:31 +01:00
Petr Skoda
9c170a4323 Merge branch 'MDL-25792' of git://github.com/samhemelryk/moodle 2011-01-17 20:49:53 +01:00
Petr Skoda
5cfe8aecb8 Merge branch 'MDL-25672' of git://github.com/samhemelryk/moodle 2011-01-17 20:45:53 +01:00
Petr Skoda
295710b069 Merge branch 'MDL-25750' of git://github.com/samhemelryk/moodle 2011-01-17 20:42:17 +01:00
Petr Skoda
dd265e3091 Merge branch 'MDL-25987' of git://github.com/timhunt/moodle 2011-01-17 20:25:56 +01:00
Petr Skoda
39e316e167 Merge branch 'MDL-25722' of git://github.com/timhunt/moodle 2011-01-17 20:22:26 +01:00
Petr Skoda
c6947dd878 Merge branch 'MDL-26029' of git://github.com/timhunt/moodle 2011-01-17 20:20:43 +01:00
Petr Skoda
af929b8d09 Merge branch 'MDL-25881' of git://git.luns.net.uk/moodle 2011-01-17 19:12:33 +01:00
Petr Skoda
bb871bc4ca Merge branch 'workshop_random_allocator' of git://github.com/mudrd8mz/moodle 2011-01-17 19:02:55 +01:00
Petr Skoda
a477c0da6e Merge branch 'MDL-25980-mnet_remote_enrolment' of git://github.com/mudrd8mz/moodle 2011-01-17 19:01:02 +01:00
Petr Skoda
3827ee9415 Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle 2011-01-17 18:57:22 +01:00
John Stabinger
a7302c7128 MDL-25913 fix for Arialist custom menu 2011-01-17 12:33:00 -05:00
Petr Skoda
673a8f7781 MDL-26031 purge timed-out sessions of guest user 2011-01-17 18:25:00 +01:00
Tim Hunt
897fee6b6f unit tests MDL-26029 fix notices from CheckSpecifiedFieldsExpectation. 2011-01-17 16:19:26 +00:00
John Stabinger
2e84ebda4d MDL-25892 fix for nonzero theme layout 2011-01-17 09:15:08 -05:00
Tim Hunt
c97325f6e8 quiz MDL-25722 get rid of annoying alerts when quiz is in 'secure' mode.
See http://moodle.org/mod/forum/discuss.php?d=165772, where people have tried out this fix and found that it works.
2011-01-17 13:34:46 +00:00
John Stabinger
91227f9cee MDL-25914 fix for Binarius custom menu 2011-01-17 07:44:06 -05:00
John Stabinger
2553bf60e2 MDL-25834 fix for Overlay theme custom menu 2011-01-17 07:20:08 -05:00
AMOS bot
64edd130f3 Automatic installer lang files (20110117) 2011-01-17 10:26:47 +01:00
Sam Hemelryk
9498654c1d Merge branch 'MDL-17884_m20' of git://github.com/rwijaya/moodle 2011-01-17 16:00:20 +08:00
Sam Hemelryk
fe1f367a11 Merge branch 'MDL-25729_m20' of git://github.com/rwijaya/moodle 2011-01-17 15:54:27 +08:00
Sam Hemelryk
ca08b132e3 Merge branch 'MDL-25860_20_wip_grpblocks' of git://github.com/skodak/moodle 2011-01-17 15:36:10 +08:00
Sam Hemelryk
83be8fce3a Merge branch 'MDL-25973_20_wip_charset' of git://github.com/skodak/moodle 2011-01-17 15:24:01 +08:00
Sam Hemelryk
c4592a2ac0 Merge branch 'MDL-25971' of git://github.com/timhunt/moodle 2011-01-17 15:12:18 +08:00
Dongsheng Cai
a7db0a260e MDL-25895, prevent repository_ajax.php being downloaded by IE when php file is associated with other programs 2011-01-17 13:56:57 +08:00
Sam Hemelryk
616e81cee9 Merge branch 'MDL-25962_20_wip_removeyui' of git://github.com/skodak/moodle 2011-01-17 13:17:04 +08:00
Sam Hemelryk
242c4319ab Merge branch 'MDL-25936_wip' of git://github.com/skodak/moodle 2011-01-17 13:08:33 +08:00
Sam Hemelryk
bec662a0f6 Merge branch 'MDL-25837_wip' of git://github.com/skodak/moodle 2011-01-17 11:35:06 +08:00
Sam Hemelryk
227d6da5d8 Merge branch 'MDL-25907_wip' 2011-01-17 10:53:24 +08:00
Sam Hemelryk
3b15d04013 sessions MDL-25907 Fixed typo prior to integration 2011-01-17 10:48:00 +08:00
Sam Hemelryk
0f13630691 Merge branch 'MDL-25836_wip' of git://github.com/skodak/moodle 2011-01-17 10:17:40 +08:00
Sam Hemelryk
c5ea8d0bcc Merge branch 'MDL-25935-user_picture_fields' of git://github.com/mudrd8mz/moodle 2011-01-17 09:35:34 +08:00
Petr Skoda
5f01417372 MDL-26007 fix error message when can not found env data 2011-01-16 20:47:22 +01:00
David Mudrak
241e58e44b MDL-25982 Workshop: users from the same group may be excluded from allocation in visible group mode
If the Workshop is in the visible group mode, members of the same group
can be now optionally excluded from random allocation for a given user.
2011-01-16 19:38:56 +01:00