Sam Hemelryk
e6c9fdb384
Merge branch 'w12_MDL-32079_m22_folderrev' of git://github.com/skodak/moodle into MOODLE_22_STABLE
2012-03-20 11:34:09 +13:00
Sam Hemelryk
33ce9928d8
Merge branch 'MDL-32064_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2012-03-20 10:37:27 +13:00
Rajesh Taneja
2e32076884
MDL-26674 wiki2.0: cleaned wiki event logging patch
2012-03-19 11:20:17 +08:00
Diane Villemure
e10faa46a6
MDL-26674 wiki2.0: Fixed wiki activity log
2012-03-19 11:20:11 +08:00
Tim Hunt
b1ddd85ca1
MDL-32064 quiz navigation: JS form submit must fire submit event handlers.
2012-03-16 15:00:51 +00:00
Petr Skoda
1f373dfef0
MDL-32071 fix incorrect get_dbfamily() call
2012-03-16 10:31:30 +01:00
Petr Skoda
96f953cbe2
MDL-32079 folder revision must be incremented after any file change
2012-03-16 10:11:40 +01:00
Rossiani Wijaya
7f7aac7ad1
MDL-31266 Lesson module: Improve feedback so that the responses are concatenated instead of overwritten
2012-03-13 14:54:39 +08:00
Aparup Banerjee
08ba77f32e
Merge branch 'MDL-30867_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
2012-03-13 11:32:29 +08:00
Aparup Banerjee
d047098e46
MDL-31910 Quiz : fixed whitespace
2012-03-13 10:15:30 +08:00
M Kassaei
52b26f8a5b
MDL-31910 Quiz : Error on Manual Grading report
2012-03-13 10:15:24 +08:00
Ruslan Kabalin
e9f2ede177
MDL-31808 Upload assignment: fix user feedback display
2012-03-13 14:10:31 +13:00
Ruslan Kabalin
861de3cda1
MDL-31917 Improve assigment submission usability
...
Say 'View' if assignment has been graded via gradebook and changing
grades via submissions interface is not possible.
2012-03-13 14:05:08 +13:00
Ruslan Kabalin
2b6a38f5c2
MDL-31919 Fix assignment overview output to respect gradebook grading.
...
Currenly, if assigment has been graded in gradebook only, in the assigment
overview it is listed as not graded.
2012-03-13 14:01:04 +13:00
Sam Hemelryk
ec2b87aede
Merge branch 'MDL-31702_22' of git://github.com/timhunt/moodle into MOODLE_22_STABLE
2012-03-13 10:33:39 +13:00
Sam Hemelryk
b3fe3fb6c8
Merge branch 'm22_MDL-31888' of git://github.com/danmarsden/moodle into MOODLE_22_STABLE
...
Conflicts:
mod/scorm/styles.css
2012-03-12 17:29:11 +13:00
Sam Hemelryk
12d0b6c5ae
MDL-27304 mod_wiki: Fixed up phpdocs for globals
2012-03-12 17:20:48 +13:00
Sam Hemelryk
25ff180756
Merge branch 'MDL-27304-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE
2012-03-12 17:05:21 +13:00
Sam Hemelryk
cbb8087b30
Merge branch 'MDL-31664-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE
2012-03-12 17:02:07 +13:00
Andrew Robert Nicols
aacacde221
MDL-31811 Add/Correct checks on activity read-only periods
2012-03-12 15:15:38 +13:00
Tim Hunt
53e40ebe2d
MDL-31702 quiz: clarify error message that has been confusing people.
2012-03-09 15:29:19 +00:00
Rossiani Wijaya
f822433322
MDL-30867 Lesson module: fix lesson essay question formtting to be consistent with user selection
2012-03-09 17:36:44 +08:00
Eloy Lafuente (stronk7)
009d72139f
Revert "[MDL-31708] - wiki 2.0 non-group member can see edit option in navigation block."
...
This reverts commit c583993d8c
.
2012-03-09 02:21:30 +01:00
Eloy Lafuente (stronk7)
478207515c
Revert "MDL-31708 wiki groups: whitespace fix"
...
This reverts commit 27da392f3c
.
2012-03-09 02:21:26 +01:00
Charles Fulton
b1f60fe2f7
MDL-27304 wiki: link to user's course profile
2012-03-08 05:07:06 -08:00
Eloy Lafuente (stronk7)
2615855713
Merge branch 'wip-MDL-29086-MOODLE_22_STABLE' of git://github.com/abgreeve/moodle into MOODLE_22_STABLE
2012-03-08 00:48:22 +01:00
Eloy Lafuente (stronk7)
49b4703187
MDL-23787 data: Init 2 arrays (global scope) that may conflict with other global scope code
2012-03-07 01:49:07 +01:00
Marina Glancy
0736188d75
MDL-23787 added possibility to embed images into textarea fields in database activity
2012-03-07 01:49:02 +01:00
Dan Marsden
cbf6a4989e
MDL-31888 SCORM prevent scrollbars on yui div
2012-03-07 09:03:14 +13:00
Eloy Lafuente (stronk7)
27da392f3c
MDL-31708 wiki groups: whitespace fix
2012-03-06 11:46:22 +01:00
Gilles-Philippe Leblanc
c583993d8c
[MDL-31708] - wiki 2.0 non-group member can see edit option in navigation block.
2012-03-06 10:20:51 +08:00
Sam Hemelryk
ec5a34443c
MDL-30724 mod_assignment: Minor fixes during integration
2012-03-05 16:09:50 +13:00
Sam Hemelryk
0c0ae1c696
Merge branch '22_MDL-30724_count_real_submissions_eloy_suggests' of git://github.com/gerrywastaken/moodle into MOODLE_22_STABLE
2012-03-05 16:08:30 +13:00
Charles Fulton
a7bc85ea03
MDL-29848 glossary: get proper context for comments on exported entry
2012-03-02 07:48:42 -08:00
Adrian Greeve
d1deac2d80
MDL-29086 - data - Fix for allowing the deletion of database activity presets.
...
Thank you to Matthias Hunstock for providing the patch for this.
2012-03-02 14:32:37 +08:00
Dan Marsden
50147ef444
MDL-31749 - remove extra space from scorm pop-up - especially for afterburner theme
2012-03-02 09:13:32 +13:00
Eloy Lafuente (stronk7)
cafbb73f5b
Merge branch 'MDL-26496_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
2012-02-29 02:06:07 +01:00
Eloy Lafuente (stronk7)
46ccd8b12b
Merge branch 'wip-MDL-31738-MOODLE_22_STABLE' of git://github.com/marinaglancy/moodle into MOODLE_22_STABLE
2012-02-29 00:30:27 +01:00
Aparup Banerjee
fe4e706f3a
Merge branch 'MDL-31399_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
2012-02-28 12:05:20 +08:00
Eloy Lafuente (stronk7)
edb03ff65b
Merge branch 'MDL-29256-resource-format_22_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_22_STABLE
2012-02-27 18:54:35 +01:00
Marina Glancy
ccd6fa9e44
MDL-31738: added functions mod_xxx_get_file_info() to glossary and data modules
2012-02-27 14:14:03 +08:00
Gerard (Gerry) Caulfield
69beea7165
MDL-30724 Limit assignment_count_real_submissions() to only select real
...
submissions
I've also refactored some code so that it is more structured and allows
for easier overriding of function associated with counting submissions
and updated associated doc blocks.
2012-02-27 12:30:30 +08:00
Dan Poltawski
08bcf220b3
MDL-31546 wiki: remove stray semicolon
...
causing errors on oracle
Thanks to Jonathon Fowler for the patch
2012-02-24 11:39:56 +08:00
Rossiani Wijaya
4fbf7ca46c
MDL-31399 Lesson Module: Fixed horizontal scroll bar issue when using rtl language format (eg: arabic)
2012-02-23 15:08:21 +08:00
Eduardo Pinto
c468eab4f0
MDL-26496 Lesson Module: removed warning when no answer is selected from single choice question
2012-02-23 14:05:07 +08:00
Sam Hemelryk
68eeca8621
Merge branch 'MDL-30910_m22' of git://github.com/rwijaya/moodle into MOODLE_22_STABLE
2012-02-22 10:21:53 +13:00
David Mudrak
2d89ead370
MDL-29256 Fixed incorrect calculation of contentformat
...
Legacy Resource modules of the type Web page force the HTML format for
their content. The format stored in the reference field is valid only
for legacy resources of the type Plain text page. See page_20_migrate()
function.
2012-02-21 11:12:00 +01:00
Rossiani Wijaya
9551675cf9
MDL-30910: Lesson Module: fix lesson progress bar for screen readers
...
AMOS BEGIN
CPY [progresscompleted, mod_lesson]
AMOS END
2012-02-21 12:38:33 +08:00
Sam Hemelryk
f231525992
Merge branch 'MDL-29402-22' of https://github.com/mackensen/moodle into MOODLE_22_STABLE
2012-02-21 10:43:41 +13:00
Andrew Robert Nicols
e546d72787
MDL-19421 Correct lesson dependency mapping on restore
2012-02-20 17:17:12 +01:00