Tim Hunt
13bd955e65
MDL-35776 user ajax: fix sort order in chrome.
...
It seems that Chrome orders fields of objects in order of array key.
Therefore we must stop using user.id in the PHP arrays, and instead
ensure that we use sequential numbers.
This commit fixes the enrol UI.
2012-10-03 19:06:17 +01:00
Tim Hunt
c62488c22f
MDL-35776 user ajax: fix sort order in chrome.
...
It seems that Chrome orders fields of objects in order of array key.
Therefore we must stop using user.id in the PHP arrays, and instead
ensure that we use sequential numbers.
This commit fixes the user selector.
2012-10-03 18:46:07 +01:00
David Monllao
d91750bc5a
MDL-35187 groups Adding admin pagelayout to group members edition
2012-10-03 14:40:22 +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
Dan Poltawski
0d24043d66
Merge branch 'wip-MDL-35263-master' of git://github.com/marinaglancy/moodle
2012-10-02 12:49:26 +08:00
Marina Glancy
76ab3fa18f
MDL-35263 corrected coding style
2012-10-02 12:23:43 +08:00
Dan Poltawski
dcc4c7199a
Merge branch 'MDL-35683' of git://github.com/netspotau/moodle-mod_assign
2012-10-02 12:19:38 +08:00
Dan Poltawski
76811d0bb8
Merge branch 'MDL-35370' of git://github.com/timhunt/moodle
2012-10-02 12:07:41 +08:00
Dan Poltawski
c07189ebe8
Merge branch 'MDL-35693' of git://github.com/timhunt/moodle
2012-10-02 11:47:50 +08:00
Dan Poltawski
afbdebee62
Merge branch 'MDL-35698' of git://github.com/timhunt/moodle
2012-10-02 11:40:16 +08:00
Dan Poltawski
49ab2d5fb2
Merge branch 'WIP-MDL-35708-master_quiz' of git://github.com/nadavkav/moodle
2012-10-02 11:36:49 +08:00
Dan Poltawski
61badb5989
Merge branch 'MDL-35437' of https://github.com/raymondAntonio/moodle
2012-10-02 11:35:59 +08:00
Dan Poltawski
f7b3ac9427
Merge branch 'w40_MDL-35619_m24_otheravatars' of git://github.com/skodak/moodle
2012-10-02 10:41:47 +08:00
Dan Poltawski
624feda48d
Merge branch 'MDL-35680' of git://github.com/timhunt/moodle
2012-10-02 09:52:12 +08:00
Dan Poltawski
a354add4c8
Merge branch 'MDL-33933-master' of https://github.com/mackensen/moodle
2012-10-02 09:43:38 +08:00
Dan Poltawski
229f543881
Merge branch 'MDL-33117_grade_display' of git://github.com/andyjdavis/moodle
2012-10-02 09:32:58 +08:00
Eloy Lafuente (stronk7)
1ef501ca03
MDL-35669 gravatar amend and complete gravatar tests.
2012-10-02 01:33:59 +02:00
Eloy Lafuente (stronk7)
b96a15cc11
MDL-35669 gravatar Fix secure image urls.
2012-10-02 01:19:33 +02:00
Sam Hemelryk
ee3502e793
Merge branch 'master_MDL-35472' of git://github.com/totara/moodle
2012-10-02 11:10:39 +13:00
Sam Hemelryk
e737ad93a1
Merge branch 'MDL-34257' of git://github.com/timhunt/moodle
2012-10-02 10:46:01 +13:00
Eloy Lafuente (stronk7)
1203b6ea05
Merge branch 'MDL-35669-master-2' of git://github.com/micaherne/moodle
2012-10-01 23:44:07 +02:00
Sam Hemelryk
cf45206006
Merge branch 'MDL-30885' of git://github.com/timhunt/moodle
2012-10-02 10:31:13 +13:00
Eloy Lafuente (stronk7)
8614cd72f0
Merge branch 'MDL-34657' of git://github.com/timhunt/moodle
2012-10-01 23:22:39 +02:00
Sam Hemelryk
6beec9ce60
Merge branch 'MDL-35547' of git://github.com/enovation/moodle
2012-10-02 10:15:41 +13:00
Michael Aherne
f127b1a538
MDL-35669 gravatar Provide default image URL to Gravatar
2012-10-01 14:17:11 +01:00
Eloy Lafuente (stronk7)
5522e44658
Merge branch 'MDL-34931-master' of git://github.com/FMCorz/moodle
2012-10-01 13:32:44 +02:00
Eloy Lafuente (stronk7)
a5fc5b6ceb
Merge branch 'MDL-35637_master' of git://github.com/markn86/moodle
2012-10-01 13:19:01 +02:00
Eloy Lafuente (stronk7)
a499689c8b
Merge branch 'MDL-35662' of git://github.com/netspotau/moodle-mod_assign
2012-10-01 13:14:43 +02:00
Eloy Lafuente (stronk7)
a88258ac9f
Merge branch 'wip-MDL-34234-m24' of git://github.com/samhemelryk/moodle
2012-10-01 13:09:44 +02:00
Eloy Lafuente (stronk7)
c3f06aacef
Merge branch 'MDL-34971-wip' of git://github.com/mouneyrac/moodle
2012-10-01 12:48:48 +02:00