Dan Poltawski
7cd1c5251a
Merge branch 'w31_MDL-17830_m24_zipresult' of git://github.com/skodak/moodle
2012-07-31 11:22:07 +08:00
Dan Poltawski
b95744a3b5
Merge branch 'MDL-34624' of git://github.com/lazydaisy/moodle
2012-07-31 11:10:29 +08:00
Dan Poltawski
8ba2123739
Merge branch 'MDL-34532' of git://github.com/timhunt/moodle
2012-07-31 10:42:55 +08:00
Dan Poltawski
1383794b35
Merge branch 'MDL-34255' of git://github.com/rwijaya/moodle
2012-07-31 10:31:41 +08:00
Ankit Agarwal
f14f9842d5
MDL-32827 calendar: update eventtype of broken event in bulk instead of doing it one by one
2012-07-31 10:28:32 +08:00
Jerome Mouneyrac
48a7b182f1
MDL-33869 user_get_user_details: add support for 'Show user identity' fields set by administrator
2012-07-31 10:24:50 +08:00
Crafton Williams
3a3f3b223f
MDL-33869 user_get_user_details: allow return of idnumber
2012-07-31 10:24:35 +08:00
Dan Poltawski
08765665c7
Merge branch 'master_MDL-34440' of git://github.com/danmarsden/moodle
2012-07-31 10:06:57 +08:00
Adam Olley
b1d76077fc
MDL-34647: admintool: uploaduser enrolments now obey enrolperiod directive
2012-07-31 11:35:55 +09:30
Adam Olley
2e7e9403b2
MDL-34645: enrol_manual: enrolment init to pass default duration setting
2012-07-31 11:11:54 +09:30
Dan Poltawski
93e1ff245d
Merge branch 'MDL-34483' of git://github.com/timhunt/moodle
2012-07-31 09:11:48 +08:00
Sam Hemelryk
989e5c49fa
Merge branch 'MDL-34494_master' of git://github.com/kordan/moodle
2012-07-31 12:43:44 +12:00
Sam Hemelryk
7d5f2ac2e6
Merge branch 'MDL-29007-master-3' of git://git.luns.net.uk/moodle
2012-07-31 12:05:38 +12:00
Sam Hemelryk
30585a3752
Merge branch 'MDL-28568_noncontact_warning' of git://github.com/andyjdavis/moodle
2012-07-31 12:00:53 +12:00
Tim Hunt
453022307e
MDL-34483 qformat_examview: Commit example file.
...
Supplied by Rick Jerz.
2012-07-30 11:57:36 +01:00
Fred Woolard
9f2470937d
MDL-34440 Site registration failing with mysqli
2012-07-30 20:04:55 +12:00
Nathan Mares
6bfa9c49d5
MDL-34368: Fix broken query in so tokens are correctly checked against the linked service
2012-07-30 15:49:38 +08:00
Dan Poltawski
87dd647f04
Merge branch 'wip-MDL-34465-master' of git://github.com/abgreeve/moodle
2012-07-30 15:23:27 +08:00
Dan Poltawski
31e8166797
Merge branch 'MDL-34467-master' of git://github.com/ankitagarwal/moodle
2012-07-30 15:14:27 +08:00
Dan Poltawski
1afa82dd30
Merge branch 'wip-MDL-34469-master' of git://github.com/abgreeve/moodle
2012-07-30 15:06:59 +08:00
Dan Poltawski
090a5337d5
Merge branch 'MDL-34466_master' of git://github.com/dmonllao/moodle
2012-07-30 15:02:01 +08:00
Adrian Greeve
a689cd1def
MDL-34469 - lib - replacement of the deprecated get_context_instance and get_context_by_id functions (group 15)
2012-07-30 14:59:57 +08:00
Dan Poltawski
1ffc3e427a
MDL-34464 - mod_feedback: remove mistaken ignore_missing
2012-07-30 14:55:50 +08:00
Dan Poltawski
8dd154905b
Merge branch 'MDL-34464_master' of git://github.com/dmonllao/moodle
2012-07-30 14:48:33 +08:00
Dan Poltawski
bc8db7649b
MDL-34460 - remove uncessary context retrival
...
spotted during review
2012-07-30 14:26:19 +08:00
Dan Poltawski
957a8d48fc
Merge branch 'MDL-34460-master-integration' of git://github.com/FMCorz/moodle
2012-07-30 14:18:54 +08:00
Dan Poltawski
3f140cdc3f
Merge branch 'MDL-34507-master' of git://github.com/FMCorz/moodle
2012-07-30 14:04:46 +08:00
Dan Poltawski
82ee961aca
Merge branch 'MDL-34589' of git://github.com/timhunt/moodle
2012-07-30 13:55:43 +08:00
Dan Poltawski
171b18d2d1
Merge branch 'MDL-34513-WIP-MyMobile_rtl_support' of git://github.com/nadavkav/moodle
2012-07-30 13:52:11 +08:00
Dan Poltawski
73454d017a
Merge branch 'MDL-33537_master' of git://github.com/dmonllao/moodle
2012-07-30 13:46:22 +08:00
Dan Poltawski
31f29535d1
Merge branch 'master_MDL-32227_add_plagiarism_api_support_to_workshop' of git://github.com/kanikagoyal/moodle
2012-07-30 13:34:20 +08:00
Dan Poltawski
f129427fa9
Merge branch 'w31_MDL-34616_m24_tinymceresize' of git://github.com/skodak/moodle
2012-07-30 13:14:53 +08:00
Dan Poltawski
a38514ac3f
Merge branch 'w31_MDL-34538_m24_validatefloats' of git://github.com/skodak/moodle
2012-07-30 12:35:05 +08:00
Dan Poltawski
20031268b6
Merge branch 'MDL-31509' of git://github.com/timhunt/moodle
2012-07-30 12:15:39 +08:00
Dan Poltawski
098eccf1b8
Merge branch 'MDL-34433-master-1' of git://git.luns.net.uk/moodle
2012-07-30 12:09:20 +08:00
Dan Poltawski
2e3d5ef1eb
Merge branch 'wip-mdl-34239' of git://github.com/rajeshtaneja/moodle
2012-07-30 12:05:14 +08:00
Dan Poltawski
4a1c6c586c
Merge branch 'MDL-34519_course_reset_patch' of git://github.com/rlorenzo/moodle
...
Conflicts:
course/reset.php
2012-07-30 11:57:26 +08:00
Adrian Greeve
92dfce6be7
MDL-34075 - lib - Alteration to the csv import lib to include rfc-4180 compliance
2012-07-30 11:34:11 +08:00
Charles Fulton
94efdedcc3
MDL-34629 wiki: convert default format value during restore
2012-07-29 20:17:41 -07:00
Mary Evans
4543168efb
MDL-34526 theme_canvas: incorporating MDL-34528 - Remove redundent exclude stylesheet configurations from CANVAS theme
2012-07-29 21:31:47 +01:00
Mary Evans
6f7cb98f10
MDL-34526 theme_canvas: added custommenu + enabled dock + defined block-regions in frontpage.php & general.php
2012-07-29 17:51:05 +01:00
Petr Škoda
f6b49abf9b
MDL-17830 fix zip_packer return status add debugging for invalid files and dirs
2012-07-29 16:09:18 +02:00
kordan
e7d53b43ec
MDL-34405 theme_formal_white: added background for quiz overview
2012-07-29 15:55:23 +02:00
kordan
3518d78f10
MDL-34494 theme_formal_white: replaced old style core_renderer::MAIN_CONTENT_TOKEN with $OUTPUT->main_content()
2012-07-29 15:27:09 +02:00
Mary Evans
e0c380994a
MDL-34624 theme_base: added background color to style/admin.css for role edit default
2012-07-29 14:23:19 +01:00
Petr Škoda
4b8d031a4e
MDL-34616 fix editor resizing regression
2012-07-29 14:48:23 +02:00
Tim Hunt
f8b665224f
MDL-34532 quiz reports: error when showing users without attempts.
...
We were not checking if attempt state was null before trying to convert it to a string.
2012-07-27 23:21:32 +01:00
Tim Hunt
7e48778b87
MDL-31509 quiz outcomes: let people associate quizzes with outcomes.
...
The quiz does not really support outcomes, but even so in 1.9 you could
select outcomes on the quiz edit form, and apparently this was useful to
some people, therefore we should re-enable it.
2012-07-27 18:06:24 +01:00
Petr Škoda
fea52c11cb
MDL-34538 fix PARAM_FLOAT validation
2012-07-27 18:44:41 +02:00
Petr Škoda
9a97fa5a65
MDL-34538 add float validation tests
2012-07-27 18:44:27 +02:00