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

46267 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
0f13630691 Merge branch 'MDL-25836_wip' of git://github.com/skodak/moodle 2011-01-17 10:17:40 +08:00
Sam Hemelryk
c5ea8d0bcc Merge branch 'MDL-25935-user_picture_fields' of git://github.com/mudrd8mz/moodle 2011-01-17 09:35:34 +08:00
Petr Skoda
79abc6d1eb MDL-25836 fixed stripped src attribute from script tag 2011-01-12 19:33:18 +01:00
Petr Skoda
5a7f931ee5 weekly version bump 2011-01-12 10:50:18 +01:00
Petr Skoda
f4f374176d Merge branch 'MDL-25596-fixed' of git://github.com/samhemelryk/moodle 2011-01-12 09:57:18 +01:00
Sam Hemelryk
0022a97f24 blocks-navigation MDL-25596 Fixed notice when block config doesn't already exist 2011-01-12 09:53:08 +08:00
Petr Skoda
90c42e0f43 MDL-25501 reverting PULL-95 2011-01-11 22:53:16 +01:00
Petr Skoda
65beff8ea4 Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle 2011-01-11 16:21:58 +01:00
AMOS bot
b9fe01bf1a Automatic installer lang files (20110111) 2011-01-11 16:08:58 +01:00
Eloy Lafuente (stronk7)
742d877eaf Merge branch 'MDL-25793' of git://github.com/samhemelryk/moodle 2011-01-11 00:33:56 +01:00
David Mudrak
9ecbf8018f MDL-25935 user_picture::unalias() now handles null values correctly 2011-01-11 00:27:42 +01:00
Eloy Lafuente (stronk7)
ff14fd71fd Merge branch 'MDL-24521' of git://github.com/samhemelryk/moodle 2011-01-10 23:20:30 +01:00
Eloy Lafuente (stronk7)
a9af868943 Merge branch 'MDL-24561_forum_subscribe_sesskey' of git://github.com/mudrd8mz/moodle 2011-01-10 21:38:13 +01:00
Eloy Lafuente (stronk7)
a3c896ae4d Merge branch 'm20_MDL-25794_sections_typo' of git://github.com/danmarsden/moodle 2011-01-10 21:22:02 +01:00
Petr Skoda
4bbcdcec0d Merge branch 'wip-MDL-25927' of git://github.com/sammarshallou/moodle 2011-01-10 15:16:22 +01:00
sam marshall
2af26b123d completion MDL-25927 Added old function back as deprecated, to preserve API compatibility 2011-01-10 14:08:10 +00:00
Petr Skoda
9c15755633 Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng/moodle 2011-01-10 14:54:53 +01:00
Petr Skoda
4761e6334f Merge branch 'm20_MDL-25669_course_sortorder' of git://github.com/dongsheng/moodle 2011-01-10 14:51:22 +01:00
Petr Skoda
d0dbd5a345 Merge branch 'm20_MDL-25219_question_text' of git://github.com/dongsheng/moodle 2011-01-10 14:44:26 +01:00
Petr Skoda
6fa8c7ea86 Merge branch 'MDL-25596' of git://github.com/samhemelryk/moodle 2011-01-10 14:41:04 +01:00
Petr Skoda
0e3fdf10c2 Merge branch 'MDL-24984' of git://git.luns.net.uk/moodle 2011-01-10 14:38:16 +01:00
Petr Skoda
5301285d87 Merge branch 'MDL-24742' of git://git.luns.net.uk/moodle 2011-01-10 14:37:21 +01:00
Petr Skoda
2f1b1abc83 Merge branch 'MDL-25232' of git://git.luns.net.uk/moodle 2011-01-10 14:35:38 +01:00
Petr Skoda
e168f8cca6 Merge branch 'MDL-25675' of git://git.luns.net.uk/moodle 2011-01-10 14:34:18 +01:00
Petr Skoda
29612524f3 Merge branch 'MDL-25854' of git://github.com/samhemelryk/moodle 2011-01-10 14:31:21 +01:00
Petr Skoda
d32c077bf6 Merge commit 'ed5c4cf44d0b38e129ad57747dfaf16d9677d465' 2011-01-10 14:21:15 +01:00
Petr Skoda
b2d6484598 Merge commit '246cc0e6b52f455dcb1ab23039202d7498d91d30' 
Conflicts:
	course/request.php
 2011-01-10 14:12:34 +01:00
sam marshall
563e97b8b9 completion MDL-25927 Change print_help_icon to display_help_icon (returns html instead of printing) 2011-01-10 13:04:54 +00:00
Petr Skoda
b2f806cd92 Merge branch 'MDL-25886-user_picture_fields' of git://github.com/mudrd8mz/moodle 2011-01-10 13:43:00 +01:00
Sam Hemelryk
d481e2a8e3 mod-wiki MDL-25793 Bumped version number and adjusted version number in new upgrade code. 2011-01-10 17:31:40 +08:00
Sam Hemelryk
4b3c86b152 Merge branch 'MDL-24133' of git://git.luns.net.uk/moodle 2011-01-10 16:40:30 +08:00
Sam Hemelryk
5539372b27 Merge branch 'MDL-25909' of git://git.luns.net.uk/moodle 2011-01-10 16:36:49 +08:00
Sam Hemelryk
0017173f1a Merge branch 'MDL-23393' of git://git.luns.net.uk/moodle 2011-01-10 16:26:17 +08:00
Sam Hemelryk
1cc0c36e04 Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle 2011-01-10 16:12:50 +08:00
Sam Hemelryk
03364f9e2f Merge branch 'MDL-25869' of git://git.luns.net.uk/moodle 2011-01-10 16:10:46 +08:00
Sam Hemelryk
726bc52504 Merge remote branch 'mouneyrac/MDL-25768' 2011-01-10 16:01:08 +08:00
Sam Hemelryk
6b9240c55e Merge branch 'MDL-23657' of git://git.luns.net.uk/moodle 2011-01-10 13:39:44 +08:00
Sam Hemelryk
9e41043ca4 Merge branch 'MDL-23224' of git://github.com/mouneyrac/moodle 2011-01-10 13:33:48 +08:00
Sam Hemelryk
1861a2875a Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle 2011-01-10 13:10:33 +08:00
Sam Hemelryk
34e54bbb62 Merge branch 'MDL-25478' of git://git.luns.net.uk/moodle 2011-01-10 13:02:52 +08:00
Sam Hemelryk
0d2d7a6553 Merge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle 2011-01-10 12:08:10 +08:00
Dongsheng Cai
77064d2b4f WIKI MDL-25501 1. check if wiki entry exists before insert new entry 2. check wiki version record mimetype, if it is not empty, try to export the content to file pool 2011-01-10 10:07:34 +08:00
Dongsheng Cai
3acbe663af MDL-25669, fix_course_sortorder should check MAX_COURSE_CATEGORIES limit, and print debugging message when the number of courses in a category reach the limit 2011-01-10 09:57:15 +08:00
Dan Marsden
2e3c31bca3 SCORM MDL-25794 fix db call to use select_menu to pass into single_select renderer - also fix small typo for label/lable 2011-01-10 11:22:50 +13:00
Dan Poltawski
ed4a7e4b07 forum MDL-25232 - fix unbalanced divs 2011-01-09 21:11:01 +00:00
Paul Vaughan
43fa145137 course/lib MDL-24984 - fix lack of spacing on category list 
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
 2011-01-09 20:35:21 +00:00
Dan Marsden
ed5c4cf44d SCORM MDL-25891 typo causing general exception for some SCORM objects - thanks to Hais Deakin for report/fix 2011-01-10 09:24:16 +13:00
Dan Poltawski
7de9bfad15 course-format-weeks MDL-24742 dont redefine maincontent 
It was breaking XHTML validation due to duplicate id
 2011-01-09 20:02:21 +00:00
Dan Poltawski
e594fc8d13 mod/data MDL-24133 - footer called before header 2011-01-09 19:31:25 +00:00
Myles Carrick
94b8fa5aad course: MDL-23425 use correct config setting in check for displaying course request buttons 
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
 2011-01-09 18:28:41 +00:00