Commit graph

47784 commits

Author SHA1 Message Date
Sam Hemelryk
131a9071d6 Merged branch 'MDL-27118' of git://github.com/epsd/moodle.git 2011-06-08 13:42:33 +08:00
Sam Hemelryk
de133aa87f Merge branch 'MDL-27294' of git://github.com/epsd/moodle 2011-06-08 13:38:35 +08:00
Sam Hemelryk
405f69eb7b Merge branch 'MDL-27704_master' of git://github.com/MaryE/moodle.git 2011-06-08 13:33:42 +08:00
kordan
b396e1678b MDL-27588 Fixed up several bugs with the formal_white theme
-> MDL-26934 has been fixed
-> MDL-27474 has been fixed
-> one more option to have blocks column with different background colours
-> one more option to use custom font size
-> version.php, and b/install.php to handle upgrades
-> increased the font size in the table with plugin list shown at upgrade time
-> minor fixes in IE7 when images from remote web sites are shown in the header
-> conformed the dock background colour to the block background colour to avoid unpleasant color combinations
-> conformed a.link, a.visited and a.active colours in tabs
-> conformed a.link, a.visited and a.active colours in the navigation block
-> deleted an awful box border from enrolment page
-> right aligned commands for resources and activities in the course page
-> increased the width of field item title column in mform
-> increased the padding-top to the help popup box messages
-> user menu restyled to fix some minor tweaks in IE7
-> minor repair to tabs to improve its look
-> restyling of the docked item panel header to look like all the other blocks
-> reduced the distance between elements in headermenu to look better even when only headings are shown in the header
-> links wherever and always black
-> the "search courses" field in the navigation bar does not force extra height
-> some unpleasant generalbox border duplicating some other border have been removed
-> some unpleasant margin/padding in notices and mtables has been removed
2011-06-08 13:17:06 +08:00
Sam Hemelryk
d1c96f6604 Merged branch 'MDL-27692_master' of git://github.com/MaryE/moodle.git 2011-06-08 13:03:11 +08:00
Sam Hemelryk
38a466084d Merge branch 'MDL-25477' of git://github.com/epsd/moodle 2011-06-08 11:30:28 +08:00
Sam Hemelryk
9186cb7e98 Merged branch 'ou-messaging-release' of git://git.luns.net.uk/moodle with conflict resolution for MDL-27171 2011-06-08 11:07:22 +08:00
Sam Hemelryk
7bff5441c8 Merged changes for MDL-25394 2011-06-08 10:58:42 +08:00
Sam Hemelryk
9bf5d894de Merge branch 'MDL-27564-wip' of git://github.com/mouneyrac/moodle with changes for MDL-27564 2011-06-08 10:38:29 +08:00
Sam Hemelryk
0373264c20 Merge branch 'MLD-27565-wip' of 'git://github.com/mouneyrac/moodle.git' with changes and conflict resolution for MDL-27565 2011-06-08 10:11:51 +08:00
Sam Hemelryk
78736e5d64 Merged branch 'MDL-27566-wip' of git://github.com/mouneyrac/moodle.git with changes and conflict resolution for MDL-27566 2011-06-08 10:02:59 +08:00
Sam Hemelryk
da1bf0e82a MDL-27721 Fixed up typo in upgrade comments 2011-06-08 09:49:43 +08:00
Eloy Lafuente (stronk7)
2b64de2008 MDL-27721 ratings - drop interim 'unknown' defaults 2011-06-07 12:58:59 +02:00
Jerome Mouneyrac
0e5fd1299a MDL-27564 most parameter should have been optional - return more common information so no extra web service required - note that it could be good to return role and group for each user in each course (it would make sens and save some web service call) 2011-06-07 18:20:07 +08:00
Jerome Mouneyrac
8d46dabb6e MDL-27565 implement moodle_notes_create_note 2011-06-07 17:28:51 +08:00
Jerome Mouneyrac
a623b6b892 MDL-27566-wip implement moodle_message_send_messages function (matching front end logic - TODO: 2 core functions to change to support bulk operations) 2011-06-07 16:40:55 +08:00
Sam Hemelryk
c464a23873 Merged branch 's9_MDL-26392_wiki_files_master' from git://github.com/dongsheng/moodle.git with fixes 2011-06-07 16:29:44 +08:00
Sam Hemelryk
e0f18a37c9 Merge branch 'MDL-27734-workshop-example-weight' of git://github.com/mudrd8mz/moodle 2011-06-07 16:24:17 +08:00
Sam Hemelryk
656bb6725b Merge branch 'MDL-27733-workshop-deadlines' of git://github.com/mudrd8mz/moodle 2011-06-07 16:23:34 +08:00
Sam Hemelryk
ac6668198b Merge branch 'MDL-27732-glossary-introformat' of git://github.com/mudrd8mz/moodle 2011-06-07 16:13:52 +08:00
Sam Hemelryk
f5936345cd Merge branch 'admin_whitespace_cleanup_master' of git://github.com/stronk7/moodle 2011-06-07 16:09:55 +08:00
Sam Hemelryk
6e76848427 Merge branch 'todo_wiki_upgrade_master' of git://github.com/stronk7/moodle 2011-06-07 16:01:49 +08:00
Eloy Lafuente (stronk7)
82b25e8e71 MDL-20636 fix local/qeupgradehelper perms 2011-06-06 23:28:50 +02:00
Tim Hunt
d9eb95433f MDL-20636 fix notice on qtypes admin page. (Eloy review comment I2) 2011-06-06 18:26:32 +01:00
Tim Hunt
aadad31a6e MDL-27737 numerical qtype upgrade bug 2.0dev -> 2.0. 2011-06-06 18:06:57 +01:00
Tim Hunt
70d248181c MDL-20636 remove QTYPE from some comments. 2011-06-06 17:48:29 +01:00
Tim Hunt
030fba85f1 MDL-20636 qe restor make method protected (Eloy review comment B1). 2011-06-06 17:26:33 +01:00
Tim Hunt
6e56da8347 MDL-20636 Fix quiz_statistics upgrade (Eloy review comment A3). 2011-06-06 17:22:49 +01:00
Eloy Lafuente (stronk7)
cc5937f4c0 MDL-20636 changes to report statistics DB layer 2011-06-06 17:16:41 +01:00
Eloy Lafuente (stronk7)
44c280c63e MDL-20636 changes to mod/quiz DB layer 2011-06-06 17:16:35 +01:00
Eloy Lafuente (stronk7)
cdda538128 MDL-20636 changes to core & questions DB layer 2011-06-06 17:16:28 +01:00
Eloy Lafuente (stronk7)
5abfa6a930 MDL-20636 changes to quiz and quiz reports upgrade code 2011-06-06 17:16:22 +01:00
Eloy Lafuente (stronk7)
1db15c2718 MDL-20636 changes to core & questions upgrade code
Changes include:

    - fixing versions and requires to current weekly (2011060313)
    - fix essay wrong upgrade step. Review & test!
    - fix numerical missing savepoint.
2011-06-06 17:16:11 +01:00
Tim Hunt
54771d89d1 Merge remote-tracking branch 'moodle/master' into MDL-20636_master_new_question_engine
Conflicts:
	lib/db/upgrade.php
	mod/quiz/lib.php
2011-06-06 17:14:59 +01:00
Tim Hunt
4c5743343f MDL-20636 make qe upgrade tests independent of html2text details.
Based on Eloy's change, but refactored to be slightly nicer.
2011-06-06 17:05:54 +01:00
Tim Hunt
0370e3ab0d MDL-27736 html2text add unit test for Eloy's new code. 2011-06-06 16:54:13 +01:00
Eloy Lafuente (stronk7)
3709ecb929 MDL-27736 improve a bit html2text to avoid some ugly & unnecessary trailing spaces 2011-06-06 16:42:55 +01:00
Eloy Lafuente (stronk7)
36e91f1de1 MDL-20636 Whitespace fixes 2011-06-06 16:38:46 +01:00
Eloy Lafuente (stronk7)
4561302dec MDL-20636 Prepare stuff for cleaner merging 2011-06-06 16:38:23 +01:00
David Mudrak
b34b969103 MDL-27734 Fixed weights of the example submission assessments 2011-06-06 17:37:59 +02:00
David Mudrak
ce8157ed91 MDL-27733 workshop: keep the phase deadlines during the 1.9 => 2.0 upgrade 2011-06-06 17:36:32 +02:00
David Mudrak
7e1450977e MDL-27732 Include the introformat field in the glossary module backups 2011-06-06 15:19:41 +02:00
Eloy Lafuente (stronk7)
b04aa92544 MDL-27724 wiki - update commented upgrade step to avoid future problems 2011-06-05 19:47:38 +02:00
Eloy Lafuente (stronk7)
6e9cd6698e MDL-27723 whitespace cleanup of admin directory 2011-06-05 19:35:42 +02:00
Mary Evans
5d224075ae MDL-27704_master Fix for Overlapping problems in Fusion theme 2011-06-03 17:41:39 +01:00
Mary Evans
3ae75b44c7 MDL-27692_master Fixes issue - bullets not numbers in ordered list... 2011-06-03 12:11:09 +01:00
Dongsheng Cai
12c9bbbdd2 MDL-26392 WIKI added file managment support to wiki editor 2011-06-03 11:22:18 +08:00
Eloy Lafuente (stronk7)
a56c68e3f4 weekly release 2.1dev 2011-06-02 23:35:35 +02:00
Ruslan Kabalin
8e26531519 MDL-27171 messages: add processor uninstall function
Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-06-02 09:27:05 +01:00
Ruslan Kabalin
d004c4b20a MDL-27171 messages: fix bug in upgrade_populate_default_messaging_prefs
isset check assumed that $defaultpreferences is the object

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-06-01 12:30:28 +01:00