mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
49,578 Commits 36 Branches 519 Tags
Commit Graph

49578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
065d6d80a2 Merge branch 'MDL-29627' of git://github.com/timhunt/moodle 2011-10-18 01:44:58 +02:00
Tim Hunt
613002ced4 MDL-29627 quiz access rules: fix two little problems found during integration. 
Missing include was breaking unit tests if they were run separately.

Missing breaks in one switch.
 2011-10-18 00:39:22 +01:00
Eloy Lafuente (stronk7)
b0ef6d0420 NOBUG: Minibump to get css/js pruned everywhere 2011-10-18 01:37:09 +02:00
Eloy Lafuente (stronk7)
c6015af280 Merge branch 'MDL-28613' of git://github.com/timhunt/moodle 2011-10-18 01:35:34 +02:00
Eloy Lafuente (stronk7)
c78238f151 Merge branch 'MDL-28614' of git://github.com/timhunt/moodle 2011-10-18 00:58:09 +02:00
Tim Hunt
6fd1995d3b MDL-28614 questions: remove another obsolete editing_head_contributions fn. 2011-10-17 23:53:53 +01:00
Sam Hemelryk
4f50a62635 Merge branch 'MDL-29501-master' of git://github.com/sammarshallou/moodle 2011-10-18 11:38:26 +13:00
Sam Hemelryk
e797476fd2 MDL-29695 enrol-cohort: Minor code improvement 2011-10-18 11:02:00 +13:00
Ruslan Kabalin
543009cba4 MDL-29695 cohorts: Add pagination and search to cohorts adminstartion page 2011-10-18 10:54:59 +13:00
Ruslan Kabalin
22a811be2d MDL-29695 enrol: cohort: Add pagination and search to quickenrolment interface 2011-10-18 10:54:51 +13:00
Eloy Lafuente (stronk7)
ebb9cd230b Merge branch 'MDL-28614' of git://github.com/timhunt/moodle 2011-10-17 23:09:03 +02:00
Eloy Lafuente (stronk7)
cb284e953c Merge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle 2011-10-17 21:24:39 +02:00
Tim Hunt
46e40567fa MDL-28614 qtypes: get_editing_head_contributions not used any more. Remove from base class. 2011-10-17 11:42:41 +01:00
Tim Hunt
891df4a949 MDL-28613 question CSS. Some text in the grey info box is the wrong size. 
Note that according to http://www.quirksmode.org/css/contents.html, the > CSS selector works in IE 7+, so is probably now safe to use.
 2011-10-17 11:28:49 +01:00
Eloy Lafuente (stronk7)
a598a8d4b1 Merge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle 2011-10-17 12:05:05 +02:00
sam marshall
7fb4699266 MDL-29719 Option to display course shortname alongside fullname on course lists 2011-10-17 10:50:59 +01:00
Eloy Lafuente (stronk7)
22ca3e49e0 NOBUG - whitespace fixes (MDL-19488, MDL-27242, MDL-29435) 2011-10-17 10:19:59 +02:00
Sam Hemelryk
ff90023b00 Merge branch 'MDL-28170' of git://github.com/stronk7/moodle 2011-10-17 18:52:23 +13:00
Sam Hemelryk
22ca670f88 Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle 2011-10-17 17:37:49 +13:00
Sam Hemelryk
5f6de5dc6b Merge branch 'MDL-29435' of git://github.com/mouneyrac/moodle 2011-10-17 17:31:52 +13:00
Sam Hemelryk
d97505d2a3 Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle 2011-10-17 17:28:32 +13:00
Sam Hemelryk
a6ec1940c8 Merge branch 'MDL-28945-master' of git://github.com/sammarshallou/moodle 2011-10-17 16:25:33 +13:00
Sam Hemelryk
f7e8e43f2d Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle 2011-10-17 15:21:45 +13:00
Sam Hemelryk
b55853ff63 Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle 2011-10-17 13:54:03 +13:00
Sam Hemelryk
92fe97f922 Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements 2011-10-17 13:18:30 +13:00
Eloy Lafuente (stronk7)
77c36d4ce8 MDL-28170 environment - add new 2.2 section 
nothing changes from 2.1 as far as it was agreed that this will be
the last version supporting 1.9 upgrade. See issue for details.
 2011-10-17 02:09:46 +02:00
Sam Hemelryk
f35c45006a MDL-19488 mod_feedback: Coding style improvement 2011-10-17 11:12:33 +13:00
Sam Hemelryk
629aa44873 Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle 2011-10-17 11:07:25 +13:00
Eloy Lafuente (stronk7)
e02ddb9be8 Merge branch 'MDL-28219d' of git://github.com/bostelm/moodle 2011-10-16 21:16:38 +02:00
Eloy Lafuente (stronk7)
6966fea5f8 Merge branch 'MDL-27351' of git://github.com/nebgor/moodle 2011-10-16 19:21:57 +02:00
Eloy Lafuente (stronk7)
3452a2db90 Merge branch 'MDL-28436' of git://github.com/nebgor/moodle 2011-10-16 19:13:00 +02:00
Eloy Lafuente (stronk7)
140af2a0f0 MDL-29191 wiki - avoid one more username leak 2011-10-16 19:03:19 +02:00
Sun Zhigang
6b3e5ab959 MDL-29191 - Show creator's fullname instead of username 2011-10-16 18:52:35 +02:00
Stephen Bourget
e4784b616a MDL-29698 Assignment: Fix broken logentry 2011-10-16 18:26:38 +02:00
Eloy Lafuente (stronk7)
39b3ee70c4 MDL-29768 debugstringids new help lang string now used 2011-10-16 17:51:59 +02:00
Eloy Lafuente (stronk7)
f3c34143f9 Merge branch 'MDL-29768-master' of git://github.com/sammarshallou/moodle 2011-10-16 17:46:18 +02:00
Petr Skoda
626509d478 MDL-29785 enable TinyMCE on iOS 5 devices 2011-10-16 17:37:12 +02:00
Eloy Lafuente (stronk7)
28a01625f0 Merge branch 'MDL-28483-master' of git://github.com/ankitagarwal/moodle 2011-10-16 17:30:45 +02:00
Eloy Lafuente (stronk7)
29fb2bcc39 Merge branch 'MDL-29788-langpack_version' of git://github.com/mudrd8mz/moodle 2011-10-16 17:23:35 +02:00
Petr Skoda
9ef8d17ab2 MDL-29785 import latest TinyMCE 3.4.6 
using https://github.com/moodle/custom-tinymce/tree/MOODLE_22_3.4.6 and https://github.com/moodle/custom-tinymce_spellchecker_php/tree/MOODLE_22_2.0.6 customised branches
 2011-10-16 17:14:33 +02:00
David Mudrak
f3a99ef8f7 MDL-29788 Fixed the version of installed language packs 2011-10-15 00:01:44 +02:00
Mary Evans
7846a85bc1 MDL-29781 FIX for side-post-only layout 2011-10-14 20:39:36 +01:00
Petr Skoda
260c4a5b09 MDL-29773 prevent negative unix timestamps in the files table 2011-10-14 15:52:49 +02:00
Petr Skoda
694f3b74c7 MDL-29773 use db debuginfo when file record insertion fails 2011-10-14 15:30:54 +02:00
Mary Evans
d4bb762643 MDL-26953 FIX for side-post-only layout 2011-10-14 02:28:03 +01:00
Tony Levi
1f186372ea MDL-28945: Fix course/activity completion reports initial selection broken 2011-10-13 17:00:52 +01:00
sam marshall
2e98ae02ec MDL-29768 debugstringids option did not do anything 2011-10-13 12:57:55 +01:00
Tim Hunt
c999d841b4 MDL-29627 add quizaccess plugins to standard_plugins_list. 2011-10-13 11:13:26 +01:00
Tim Hunt
5adace99f8 MDL-29627 quiz access rules: backup and restore of data. 2011-10-13 11:13:24 +01:00
Tim Hunt
ffe162d44d MDL-29627 quiz access move strings only used in one subplugin into that plugin. 
AMOS BEGIN
 MOV [youcannotwait,mod_quiz],[youcannotwait,quizaccess_delaybetweenattempts]
 MOV [youmustwait,mod_quiz],[youmustwait,quizaccess_delaybetweenattempts]
 MOV [subnetwrong,mod_quiz],[subnetwrong,quizaccess_ipaddress]
 MOV [attemptsallowedn,mod_quiz],[attemptsallowedn,quizaccess_numattempts]
 MOV [notavailable,mod_quiz],[notavailable,quizaccess_openclosedate]
 MOV [quiznotavailable,mod_quiz],[quiznotavailable,quizaccess_openclosedate]
 MOV [passworderror,mod_quiz],[passworderror,quizaccess_password]
 MOV [requirepasswordmessage,mod_quiz],[requirepasswordmessage,quizaccess_password]
 MOV [requiresafeexambrowser,mod_quiz],[requiresafeexambrowser,quizaccess_safebrowser]
 MOV [safebrowsererror,mod_quiz],[safebrowsererror,quizaccess_safebrowser]
 MOV [safebrowsernotice,mod_quiz],[safebrowsernotice,quizaccess_safebrowser]
 MOV [popupwithjavascriptsupport,mod_quiz],[popupwithjavascriptsupport,quizaccess_securewindow]
 MOV [quiztimelimit,mod_quiz],[quiztimelimit,quizaccess_timelimit]
AMOS END
 2011-10-13 11:13:22 +01:00