47971 Commits

Author SHA1 Message Date
David Mudrak
b61cf3ff8a MDL-22414 Merge branch 'master' into backup-convert
Conflicts:
	theme/base/style/core.css
2011-06-09 13:04:49 +02:00
David Mudrak
fad0f24499 MDL-22414 Removing obj_to_readable helper 2011-06-09 11:38:15 +02:00
Eloy Lafuente (stronk7)
6911fa130b weekly release 2.1dev 2011-06-09 03:41:42 +02:00
David Mudrak
4ece48dc36 MDL-22414 Fixed the order of course modules in the restored course
During the restore, the section's sequence field is ignored and the
order of modules is controlled by the order of the <contents> activity
elements. This patch makes sure that the modules are listed in that
section in the right order.

Also, the patch removes the obsolete stash sectionidslist which was
introduced when the method get_stash_itemids() had not existed yet.
2011-06-09 02:41:27 +02:00
Eloy Lafuente (stronk7)
c7dbcc9452 Merge branch 'MDL-27770' of git://github.com/timhunt/moodle 2011-06-09 01:41:24 +02:00
Eloy Lafuente (stronk7)
d92858291a Merge branch 'wip-MDL-27638-master' of git://github.com/samhemelryk/moodle 2011-06-09 01:20:54 +02:00
Eloy Lafuente (stronk7)
2cb791ebc5 Merge branch 'wip-mdl-27577-master' of git://github.com/rajeshtaneja/moodle 2011-06-09 00:59:11 +02:00
Eloy Lafuente (stronk7)
112c26e9dd Merge branch 'wip-MDL-27676-master' of git://github.com/samhemelryk/moodle 2011-06-09 00:36:00 +02:00
David Mudrak
30d5190a9b MDL-27452 Workshop 1.9 backups conversion support 2011-06-09 00:00:03 +02:00
David Mudrak
a5f2b97b7f MDL-22414 Fixed debugging information when a particular exception is thrown 2011-06-08 19:15:40 +02:00
Tim Hunt
810c5b9e5a MDL-27770 unnecessary upgrade step copied into quiz upgrade script. 2011-06-08 17:48:43 +01:00
Sam Hemelryk
82ee5a1f41 MDL-27676 Requests for a users profile pic that doesnt exist now redirect to the requested f1/f2 rather than just f1 2011-06-08 18:05:23 +08:00
Sam Hemelryk
32825ebd3d MDL-27566 Fixed up typo with user prefs 2011-06-08 17:54:25 +08:00
Sam Hemelryk
00a33dcbac Merged branch 'MDL-26777-wip' of git://github.com/mouneyrac/moodle.git 2011-06-08 17:52:59 +08:00
Sam Hemelryk
96e0194c05 Merged branch 'MLD-27551' of git://github.com/mouneyrac/moodle.git with changes 2011-06-08 17:34:17 +08:00
Sam Hemelryk
0b8dea80dc Merge branch 'MDL-27747' of git://github.com/timhunt/moodle 2011-06-08 17:09:05 +08:00
Sam Hemelryk
f6bd0b9e39 Merged branch 'MDL-27695' of git://github.com/nebgor/moodle.git with changes 2011-06-08 16:25:57 +08:00
David Mudrak
33560f50fb MDL-22414 Added new inforef manager
This helper class keeps the referenced ids to be dumped into the
inforef.xml files. For now, it uses a in-memory storage structures but
in the future we may refactor it so that it can use some persistent
storage (like converter's stashes).
2011-06-08 10:18:56 +02:00
David Mudrak
e29746c25f MDL-22414 Added scales conversion handler 2011-06-08 10:18:44 +02:00
Jerome Mouneyrac
c1b658832d MDL-27551 add enable mobile feature (enable web services + mobile service - add mobile builtin service - add unique shortname for service) 2011-06-08 15:10:26 +08:00
Sam Hemelryk
287d1c0c2c Merged branch 'MDL-25775_head' of git://github.com/grabs/moodle.git 2011-06-08 13:49:36 +08:00
Aparup Banerjee
3b6711d5ce MDL-27695 Documentation : updated the moodle docs link at the footer of pages to point to new docs url 2011-06-08 13:44:35 +08:00
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
Tim Hunt
e84dacffeb MDL-27747 don't truncate essay responses in the reports. #601 2011-06-07 17:01:11 +01:00
Tim Hunt
47678d60f8 MDL-27747 quiz_statistics fix edit question icons. #737 2011-06-07 16:46:30 +01:00
Tim Hunt
0f1c59c552 MDL-27747 quiz locallib remove unnecessary try/catch. #475
delegated_transaction just does the right thing. Thanks to Justin Wyllie for spotting this.
2011-06-07 16:27:49 +01:00
Tim Hunt
3b049b7626 MDL-27747 question engine stupid typo in DB query broke regrading. #472 2011-06-07 16:22:10 +01:00
Tim Hunt
adf7fe2148 MDL-27747 Missing information and errors on the quiz view page. #720 2011-06-07 16:05:17 +01:00
Tim Hunt
f57d75bdf8 MDL-27747 quiz review, time taken and overtime were formatted incorrectly #598 2011-06-07 15:33:31 +01:00
Tim Hunt
97cdc1de72 MDL-27747 quiz summary, add a CSS class to the table rows based on question state.
The standard themes do not use this for anything, but it makes it easier for themers to do cool stuff.
Also improve the API for getting the question state class.
2011-06-07 15:11:04 +01:00
Tim Hunt
4464734bb6 MDL-27747 qtype_truefalse, false feedback went missing whenre-editing a question. #465 2011-06-07 14:38:05 +01:00
Tim Hunt
c9272e87f9 MDL-27747 quiz End test... link was not working. #387
I don't know why this was ever changed from class to id. That was done in commit a1eb3a4466cd.
2011-06-07 14:29:11 +01:00
Tim Hunt
e198992b20 MDL-27747 Fix a lot of coding style issues in question/format.php 2011-06-07 14:04:24 +01:00
Tim Hunt
92111e8d2c MDL-27747 questions remove all references to the recently deprecated get_grade_options() 2011-06-07 14:00:07 +01:00
Tim Hunt
af2f98ee39 MDL-27747 Imporove API for getting the standard fraction choices.
This includes moving the None option to the top, which is slightly better for usability.
2011-06-07 13:53:29 +01: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