2308 Commits

Author SHA1 Message Date
Tim Hunt
22c97c6446 MDL-28471 Further tweaks to the question flag code. 2011-07-26 17:43:55 +01:00
Petr Skoda
d39afd96ff Merge branch 'wip-MDL-28191-master' 2011-07-25 16:45:40 +02:00
Sam Hemelryk
1092bd6db4 Merge branch 'w29_MDL-28145_m22_renderer' of git://github.com/skodak/moodle 2011-07-25 10:39:11 +08:00
Sam Hemelryk
310758d655 Merge branch 'MDL-27768' of git://github.com/lazydaisy/moodle 2011-07-25 09:39:31 +08:00
Petr Skoda
92372aba01 MDL-28145 fix renderer typo in comments 2011-07-22 23:42:26 +02:00
Sam Hemelryk
0e01784c44 MDL-28191 Continue button after selecting a theme now redirects back to the theme selector 2011-07-22 14:57:26 +08:00
Mary Evans
080fbe680d fix for MDL-27768 removed reference to gradient-sb image 2011-07-18 23:37:33 +01:00
Petr Skoda
83162b2612 Merge branch 'wip-MDL-25125-master' of github.com:marinaglancy/moodle 2011-07-18 09:18:31 +02:00
Petr Skoda
656749c18a MDL-28363 make dimmed selectors more specific to prevent overriding from other themes 2011-07-16 21:03:06 +02:00
Marina Glancy
4173ef4a04 MDL-25125 fix YUI bug with overriding styles 2011-07-14 09:40:00 +08:00
Eloy Lafuente (stronk7)
26635fd7f9 Merge branch 'MDL-28169' of git://github.com/nebgor/moodle 2011-07-07 10:21:32 +02:00
Aparup Banerjee
c5a8abfedd MDL-28169 Installation Added 2.1 upgrade (idiot proof) lines to upgrade scripts. 2011-07-07 11:40:38 +08:00
Eloy Lafuente (stronk7)
6eb2cf62bd MDL-27989 whitespace fix 2011-07-07 02:21:44 +02:00
Eloy Lafuente (stronk7)
5b77684af7 Merge branch 'MDL-27989_master' of git://github.com/kordan/moodle 2011-07-07 02:19:15 +02:00
Sam Hemelryk
5b966cbb3b Merge branch 'MDL-28135' of git://github.com/nebgor/moodle 2011-07-06 10:53:48 +08:00
Kordan
c5b7c9357f addition to previous fix for MDL-27989 in master 2011-07-05 11:32:20 +02:00
Kordan
7843d2d609 MDL-27989 fix for master 2011-07-05 10:26:01 +02:00
Aparup Banerjee
728ebac7f2 MDL-28135 general Updating all hardcoded "docs.moodle.org/en/Development:" type doc links to "docs.moodle.org/dev/" 2011-07-05 14:27:31 +08:00
Petr Skoda
e1c2a211f2 MDL-28147 do not double cache theme css/js 2011-07-04 11:29:23 +02:00
stabijoh
5fc36f559f MDL-27998 canvas theme - fix font sizes 2011-06-23 17:28:29 +02:00
Tim Hunt
da72991636 MDL-27979 Should be an edit link for each question when previewing or reviewing a quiz. 2011-06-22 21:07:40 +01:00
Tim Hunt
fde4560dae MDL-27490 Implement a manage question behaviours admin page
While doing this, I found various bugs in the manages question types admin page, and so fixed them, and updated the code
there to use $OUTPUT and html_writer.

AMOS BEGIN
 MOV [cannotdeletemissingqtype,admin],[cannotdeletemissingqtype,question]
 MOV [cannotdeleteqtypeinuse,admin],[cannotdeleteqtypeinuse,question]
 MOV [cannotdeleteqtypeneeded,admin],[cannotdeleteqtypeneeded,question]
 MOV [deleteqtypeareyousure,admin],[deleteqtypeareyousure,question]
 MOV [deleteqtypeareyousuremessage,admin],[deleteqtypeareyousuremessage,question]
 MOV [deletingqtype,admin],[deletingqtype,question]
 MOV [numquestions,admin],[numquestions,question]
 MOV [numquestionsandhidden,admin],[numquestionsandhidden,question]
 MOV [qtypedeletefiles,admin],[qtypedeletefiles,question]
 MOV [uninstallqtype,admin],[uninstallqtype,question]
AMOS END
2011-06-17 16:21:32 +01:00
Eloy Lafuente (stronk7)
28e23ea737 fix permissions 2011-06-16 19:06:07 +02:00
Eloy Lafuente (stronk7)
d55ecccb9b Merge branch 'MDL-27848_for_master' of git://github.com/kordan/moodle 2011-06-15 00:48:56 +02:00
Eloy Lafuente (stronk7)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Eloy Lafuente (stronk7)
260dd13064 Merge branch 'wip-MDL-27825-master' of git://github.com/samhemelryk/moodle 2011-06-14 12:32:47 +02:00
Kordan
db3b8953ce MDL-27835_for_master fix 2011-06-14 11:04:39 +02:00
Sam Hemelryk
e625feaf0b MDL-27825 Improved check of themedesignermode to prevent errors if it isn't set 2011-06-14 15:48:10 +08:00
Sam Hemelryk
0e36d0cdf5 Merge branch 'MDL-27834' of git://github.com/kordan/moodle 2011-06-14 09:52:39 +08:00
Kordan
b2d606a4e3 MDL-27834 fix 2011-06-13 14:49:26 +02:00
Sam Hemelryk
954adfc923 Merged branch 'MDL-27801' of git://github.com/kordan/moodle.git with changes 2011-06-13 10:33:39 +08:00
kordan
b0f37206c6 fix MDL-27801 2011-06-09 21:47:09 +02:00
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
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
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
David Mudrak
a78b139ce6 Merge branch 'master' into backup-convert 2011-06-03 23:22:23 +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
Sam Hemelryk
e5824bb9c6 MDL-25394 Tidied up several things in order to get this integrated 2011-05-31 14:28:03 +08:00
Anthony Forth
37959dd471 MDL-25394 Improved support for mobile and device themes 2011-05-31 14:25:52 +08:00
Sam Hemelryk
8dc13ee7b0 Merge branch 'MDL-25512_master' of git://github.com/MaryE/moodle.git 2011-05-30 13:03:07 +08:00
Mary Evans
df7962f977 wip-MDL-25512 Correct CSS rules in Canvas theme to align with YUI3 CSS Fonts 2011-05-30 00:41:06 +01:00
Ruslan Kabalin
814e373576 MDL-27171 messages: upgrade user profile messaging preferences interface
Existing user messaging preferences should accomodate default settings and
permissions.  This also includes some changes to default outputs preferences.

Signed-off-by: Ruslan Kabalin <ruslan.kabalin@luns.net.uk>
2011-05-27 13:49:28 +01:00