mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-13 03:45:49 +01:00
Code Issues Projects Releases Wiki Activity
57,565 Commits 36 Branches 523 Tags
Commit Graph

57565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Škoda
741797453b MDL-36436 add simple svg hacking tool for icon designers 
This should solve some IE9 issues with icon cut-off.
 2012-11-20 13:00:53 +01:00
Aparup Banerjee
4bb2e5c4b2 Merge branch 'wip-mdl-36707' of git://github.com/rajeshtaneja/moodle 2012-11-20 16:22:27 +08:00
Dan Poltawski
c796b506be Merge branch 'MDL-33863' of git://github.com/timhunt/moodle 2012-11-20 16:15:16 +08:00
Dan Poltawski
7a12ad1286 Merge branch 'MDL-36634-master' of git://github.com/FMCorz/moodle 2012-11-20 16:09:49 +08:00
Dan Poltawski
3a31c0349a Merge branch 'MDL-36624-master-int' of git://github.com/FMCorz/moodle 2012-11-20 16:07:59 +08:00
Dan Poltawski
30e0a6e5ba Merge branch 'MDL-36659-master' of git://github.com/FMCorz/moodle 2012-11-20 16:06:08 +08:00
Dan Poltawski
dab8ed3b24 Merge branch 'MDL-36022-master' of git://git.luns.net.uk/moodle 2012-11-20 16:04:08 +08:00
Dan Poltawski
bdd3779064 Merge branch 'w47_MDL-36703_m24_enrolgenerator' of git://github.com/skodak/moodle 2012-11-20 16:01:41 +08:00
Dan Poltawski
109473368d Merge branch 'm24_MDL-36142_Incorrect_query_returns_HTTP_404' of https://github.com/scara/moodle 2012-11-20 15:57:53 +08:00
Dan Poltawski
f132526512 Merge branch 'MDL-30731-master' of git://github.com/FMCorz/moodle 2012-11-20 15:31:27 +08:00
Dan Poltawski
3d51f11c9a Merge branch 'MDL-36679-master' of github.com:damyon/moodle 2012-11-20 15:25:20 +08:00
Dan Poltawski
9d1989daa7 Merge branch 'wip-MDL-35678-master' of git://github.com/abgreeve/moodle 2012-11-20 15:15:43 +08:00
Dan Poltawski
430f5aaac0 Merge branch 'MDL-36646' of git://github.com/timhunt/moodle 2012-11-20 15:06:21 +08:00
Dan Poltawski
941cf79fdc Merge branch 'MDL-36613-master' of git://github.com/FMCorz/moodle 2012-11-20 15:03:39 +08:00
Dan Poltawski
91b0d0b75a Merge branch 'MDL-36571' of git://github.com/timhunt/moodle 2012-11-20 14:59:34 +08:00
Frederic Massart
f19d57e514 MDL-30731 calendar: Fixed display of images in event descriptions 2012-11-20 14:58:33 +08:00
Dan Poltawski
4dc87c7730 Merge branch 'MDL-36564-master-int' of git://github.com/FMCorz/moodle 2012-11-20 14:46:54 +08:00
Dan Poltawski
7a39c933b9 Merge branch 'MDL-36548_master' of git://github.com/pauln/moodle 2012-11-20 14:44:35 +08:00
Dan Poltawski
5b646bdc6c Merge branch 'wip-MDL-36544-m24' of github.com:amygroshek/moodle 2012-11-20 14:36:53 +08:00
Dan Poltawski
f2e1d671a9 Merge branch 'wip-MDL-36453-master' of git://github.com/abgreeve/moodle 2012-11-20 14:31:53 +08:00
Rajesh Taneja
6402047395 MDL-36707 Course: set conditionalhidden class properly, so it doesn't overlap with dimmed class 2012-11-20 13:40:25 +08:00
Frederic Massart
ae41a70b40 MDL-36634 usability: Minor CSS fixes in Wiki and Blog 2012-11-20 13:06:09 +08:00
Frederic Massart
59fa7fd006 MDL-36613 usability: Dock icons are correct in RTL mode 2012-11-20 13:00:01 +08:00
Dan Poltawski
f45ecda7f9 Merge branch 'w47_MDL-36229_m24_crawl' of git://github.com/skodak/moodle 2012-11-20 12:48:22 +08:00
Dan Poltawski
e741c4e4c0 Merge branch 'MDL-36204_master' of git://github.com/pauln/moodle 2012-11-20 12:45:08 +08:00
Dan Poltawski
1d907ae61e Merge branch 'master_MDL-36168' of git://github.com/danmarsden/moodle 2012-11-20 12:38:23 +08:00
Dan Poltawski
7b83e3019d Merge branch 'MDL-35158-master' of git://github.com/grabs/moodle 2012-11-20 12:28:49 +08:00
Damyon Wiese
eb189e08f2 MDL-36679: Assignment revert to draft should user the selected user id, not the logged in user id. 2012-11-20 12:23:45 +08:00
Dan Poltawski
56eaaecfa2 Merge branch 'MDL-32865' of git://github.com/jmvedrine/moodle 2012-11-20 12:05:36 +08:00
Dan Poltawski
e4b6c671ac Merge branch 'MDL-32806_master' of git://github.com/lazydaisy/moodle 2012-11-20 11:53:36 +08:00
Dan Poltawski
881f49841b Merge branch 'MDL-31847_master' of git://github.com/lazydaisy/moodle 2012-11-20 11:50:11 +08:00
Dan Poltawski
86ebf41545 Merge branch 'MDL-30871-master' of git://github.com/FMCorz/moodle 2012-11-20 11:47:17 +08:00
Sam Hemelryk
4d7259e53d Merge branch 'MDL-36592-master' of git://github.com/ankitagarwal/moodle 2012-11-20 16:42:52 +13:00
Ankit Agarwal
366e3dfaaf MDL-36592 calendar: Parse all line endings 
Conflicts:

	lib/bennu/iCalendar_components.php
 2012-11-20 11:38:24 +08:00
Dan Poltawski
32f741edea Merge branch 'MDL-26439_message_search' of git://github.com/andyjdavis/moodle 2012-11-20 11:20:43 +08:00
Eloy Lafuente (stronk7)
9e3f733f8a Merge branch 'MDL-36683' of git://github.com/timhunt/moodle 2012-11-20 01:33:39 +01:00
Jean-Michel Vedrine
334783a796 MDL-33863 question restore: better hint identification. 
This is very similar to what MDL-30018 did for question_answers.
 2012-11-19 23:27:44 +00:00
Sam Hemelryk
0d463df072 Merge branch 'wip-mdl-36352' of git://github.com/rajeshtaneja/moodle 2012-11-20 11:55:12 +13:00
Sam Hemelryk
41d17e48c7 Merge branch 'wip-mdl-36351' of git://github.com/rajeshtaneja/moodle 2012-11-20 11:51:13 +13:00
Petr Škoda
4f5789eae8 MDL-36703 very basic support for enrolments in data generator 2012-11-19 23:15:29 +01:00
Sam Hemelryk
cb33680c22 Merge branch 'MDL-36615-master' of git://github.com/ankitagarwal/moodle 2012-11-20 10:25:04 +13:00
Tim Hunt
acb9f7f47d MDL-36683 qtype match restore: better subq indentification. 
This is very similar to what MDL-30018 did for question_answers.
 2012-11-19 17:46:25 +00:00
Tim Hunt
8a7d763c77 MDL-36571 qtype multichoice: don't corrupt unicode characters. 
It seems that \s includes non-breaking space, and the typical one-byte
representation of that is the same as some parts of multibyte unicode
characters. Therefore, you need to include the u modifer on the regular
expressions.

Also, remove any number of <br /> at the end of the answer.

Thanks to Joseph Rézeau and Jean-Michel Vedrine for working out what the
problem was, and how to fix it.
 2012-11-19 17:21:00 +00:00
Paul Verrall
5f89e88dea MDL-36696 - filepicker: remove superfluous comma 
It causes problems with older versions of IE.
 2012-11-20 00:04:52 +08:00
Frederic Massart
ebc583e4a3 MDL-36659 usability: Adjust main menu block CSS 2012-11-19 20:23:42 +08:00
Dan Poltawski
1ffe4aefb1 Merge branch 'MDL-36655' of git://github.com/netspotau/moodle-mod_assign 2012-11-19 15:01:48 +08:00
Dan Poltawski
98d11a8c83 Merge branch 'w47_MDL-36682_m24_mcache' of git://github.com/skodak/moodle 2012-11-19 14:50:48 +08:00
Frederic Massart
3b59311047 MDL-36624 theme: Better look and feel on my page 2012-11-19 14:13:42 +08:00
Ankit Agarwal
f5b20ea317 MDL-36615 calendar: The type of event should be named site not global for consistencies 2012-11-19 12:05:09 +08:00
Dan Poltawski
1ae8e2f963 Merge branch 'MDL-36415-master-int' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/upgrade.txt
 2012-11-19 10:51:54 +08:00