Eloy Lafuente (stronk7)
01acbc42e1
Merge branch 'MDL-27073_multilang-custommenu' of git://github.com/mudrd8mz/moodle
2011-06-22 14:11:18 +02:00
David Mudrak
9153248d22
MDL-27969 workshop - prevent PHP notices in the random allocator
...
When generating the output of the allocation results, the names of
reviewers and authors are obtained based on the current state of assigned
roles and the 'musthavesubmission' setting. Therefore, when we want to
display information about a re-used allocation, the name of the author
or the name of the author may not be available.
In case of reviewers, we first try to reload the list including the
users without own submission. If it does not help, we just display the
id of the user instead of the name. In case of authors, we just display
the id the user. I can't see much point of eventual fetching the user
record from the database just to populate the list that almost no-one
reads anyway.
2011-06-22 12:03:56 +02:00
Sam Hemelryk
a0977339b0
Merge branch 'MDL-27952' of git://github.com/stronk7/moodle
2011-06-22 17:20:49 +08:00
Rajesh Taneja
92c93432bd
MDL-26281 Lesson - Fixed short answer with apostrophe and other html formats
2011-06-22 17:17:55 +08:00
Sam Hemelryk
115910dccd
Merge branch 'MDL-27966_master' of git://github.com/stronk7/moodle
2011-06-22 17:15:10 +08:00
Sam Hemelryk
df839f28dc
Merge branch 'MDL-25811_master' of git://github.com/stronk7/moodle
2011-06-22 17:06:12 +08:00
Andrew Davis (andyjdavis)
b822fc8511
MDL-27829 blocks: added some brains to generate_page_type_patterns() so that it can handle special cases like course reports
2011-06-22 17:01:21 +08:00
Rajesh Taneja
ba15c346b1
MDL-27956 Lesson - Fixed strings and readquestions scope
2011-06-22 09:11:32 +08:00
Eloy Lafuente (stronk7)
1e3ddd6bc4
Merge branch 's10_MDL-27341_flickr_json_error_master' of git://github.com/dongsheng/moodle
2011-06-22 03:06:14 +02:00
Eloy Lafuente (stronk7)
92f753eb99
Merge branch 'MDL-27860' of git://github.com/timhunt/moodle
2011-06-22 02:57:50 +02:00
Eloy Lafuente (stronk7)
96dc283b53
Merge branch 'MDL-27914' of git://github.com/nebgor/moodle
2011-06-22 02:52:50 +02:00
Eloy Lafuente (stronk7)
8032990022
Merge branch 'MDL-26948' of git://github.com/timhunt/moodle
2011-06-22 02:35:25 +02:00
Eloy Lafuente (stronk7)
6057bf5b05
MDL-27810 portfolio: Added ->portfolioenabled check to one more place
2011-06-22 02:10:11 +02:00
Eloy Lafuente (stronk7)
555cc4b4a0
Merge branch 'wip-MDL-27810-master' of git://github.com/samhemelryk/moodle
2011-06-22 01:56:30 +02:00
Eloy Lafuente (stronk7)
2fc832a1ae
Merge branch 'MDL-27906_HEAD' of git://github.com/rwijaya/moodle
2011-06-22 01:52:57 +02:00
Eloy Lafuente (stronk7)
f5a6bf5e35
Merge branch 'master_MDL-27959' of git://github.com/danmarsden/moodle
2011-06-22 01:35:15 +02:00
David Mudrak
c1ab2b109e
MDL-27970 workshop submission can't be edited after the deadline even if late submissions are allowed
2011-06-22 00:34:45 +02:00
Eloy Lafuente (stronk7)
ea1e73843b
MDL-27966 timezones - updated to 2011g version + fix minor notice
2011-06-21 16:23:24 +02:00
Aparup Banerjee
38adb0def9
MDL-27914 data fixed image gallery template CSS selector for #singleimage to include img tag and set height to auto
2011-06-21 14:22:00 +08:00
Dan Marsden
b447192e8f
Choice MDL-27959 invalid strings
2011-06-21 16:39:46 +12:00
Andrew Davis (andyjdavis)
7ce5df8620
MDL-27920 gradebook: export was always excluding course totals and xml export was failing
2011-06-21 11:13:34 +08:00
Sam Hemelryk
6708a1f525
MDL-27810 portfolio: Added ->portfolioenabled checks before creating portfolio buttons to avoid initialising portfolio requirements
2011-06-21 10:35:53 +08:00
Eloy Lafuente (stronk7)
beae4a6684
MDL-25811 automated backups - clean running status after 90 mins of inactivity
2011-06-21 02:41:12 +02:00
Eloy Lafuente (stronk7)
1b8655ab0f
MDL-27952 quiz - fix navigation for users having 0 nodes in module nav
2011-06-21 02:38:04 +02:00
Eloy Lafuente (stronk7)
3552484b91
on-demand release 2.1beta
2011-06-21 02:31:40 +02:00
Eloy Lafuente (stronk7)
b3c1b5f1a6
Merge branch 'install_master' of git://github.com/amosbot/moodle
2011-06-21 02:30:37 +02:00
Eloy Lafuente (stronk7)
9192e9fe45
Merge branch 'master_MDL-27366' of git://github.com/danmarsden/moodle
2011-06-20 23:38:47 +02:00
Eloy Lafuente (stronk7)
5e811bb000
Merge branch 's11_MDL-27941_partipants_page_master' of github.com:dongsheng/moodle
2011-06-20 18:44:08 +02:00
Eloy Lafuente (stronk7)
ca31e935e6
Merge branch 'wip-MDL-27899-master' of git://github.com/samhemelryk/moodle
2011-06-20 18:38:42 +02:00
Eloy Lafuente (stronk7)
aed0dbe70a
Merge branch 'MDL-27942' of git://github.com/timhunt/moodle
2011-06-20 17:05:54 +02:00
Eloy Lafuente (stronk7)
8edbfba909
Merge branch 'MDL-24594_wip' of git://github.com/timhunt/moodle
2011-06-20 12:48:55 +02:00
Eloy Lafuente (stronk7)
6f9297b48b
Merge branch 'MDL-27915' of git://github.com/timhunt/moodle
2011-06-20 12:39:19 +02:00
Eloy Lafuente (stronk7)
ee37607188
Merge branch 'MDL-27925' of git://github.com/timhunt/moodle
2011-06-20 11:56:34 +02:00
Sam Hemelryk
0ebb526f85
MDL-27899 Moved initialise_fullme during setup to after sam has been initialised
2011-06-20 17:40:03 +08:00
Tim Hunt
e28bbd8919
MDL-27942 Use picture not displayed during quiz attempts.
2011-06-20 10:26:01 +01:00
Dongsheng Cai
3712f7aaca
MDL-27941 Fixed a bug introduced by block setting improvement, the
...
context should be course context
2011-06-20 16:30:16 +08:00
Sam Hemelryk
8a322fc19b
Merge branch 'MDL-24255' of git://github.com/timhunt/moodle
2011-06-20 15:51:59 +08:00
Rossiani Wijaya
18d63ffb67
MDL-27906 calendar event: fixed retrieving coursemodule by replacing get_coursemodule_from_id() to get_coursemodule_from_instance()
2011-06-20 14:32:47 +08:00
Sam Hemelryk
fe70d8814b
Merge branch 's11_MDL-27880_get_course_participants_ws' of git://github.com/dongsheng/moodle
2011-06-20 14:31:23 +08:00
Sam Hemelryk
8e307054d3
Merge branch 'MDL-27907' of git://github.com/timhunt/moodle
2011-06-20 14:10:41 +08:00
Dongsheng Cai
4be8a7d55c
MDL-27866, set page context for $OUTPUT->pix_url
2011-06-20 13:52:03 +08:00
Dongsheng Cai
ea4e96c248
MDL-27880
...
1. moodle_user_get_course_participants_by_id web service to get user details in course context
2. Fixed the proformance issues of get_users_by_id web service
2011-06-20 13:46:47 +08:00
Sam Hemelryk
70e35c4d1d
Merge branch 'MDL-27916' of git://github.com/timhunt/moodle
2011-06-20 13:45:12 +08:00
Sam Hemelryk
1533a25e51
Merge branch 'MDL-27927' of git://github.com/timhunt/moodle
2011-06-20 13:15:37 +08:00
Sam Hemelryk
8ffaf7b4dd
Merge branch 'MDL-27928' of git://github.com/timhunt/moodle
2011-06-20 13:06:10 +08:00
Sam Hemelryk
3fc7c06b99
Merge branch 'quiz_feedback_for_grade' of git://github.com/stronk7/moodle
2011-06-20 13:02:02 +08:00
AMOS bot
e0dd2857ea
Automatically generated installer lang files
2011-06-20 00:55:10 +00:00
Eloy Lafuente (stronk7)
1b327dec8a
MDL-27932 quiz - fix some calls to quiz_feedback_for_grade()
2011-06-20 01:46:29 +02:00
Eloy Lafuente (stronk7)
f2113d66cd
Merge branch 'MDL-27910' of git://github.com/timhunt/moodle
2011-06-20 01:26:03 +02:00
Eloy Lafuente (stronk7)
b9412668c4
Merge branch 'MDL-27902' of git://github.com/timhunt/moodle
2011-06-20 01:21:18 +02:00