moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 19:36:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
50200 commits 37 branches 544 tags 1.3 GiB
Commit graph

50200 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Mudrak
8168299d7e Improved integration into the settings block 2011-10-16 19:40:47 +02:00
David Mudrak
03d448e5ff Activity module's settings form redirects to the management screen when advanced grading method was selected to use 2011-10-16 19:40:47 +02:00
David Mudrak
3bd217aaa4 Grading manager's set_active_method() returns bool now 2011-10-16 19:40:46 +02:00
David Mudrak
6b5b05dc3b Fixing the nullability of levelid field in the gradingform_rubric_fillings table 
Credit goes to Marina Glency for spotting this.
 2011-10-16 19:40:46 +02:00
David Mudrak
44354f9e32 Adding a unique key to the gradingform_rubric_fillings table 
Credit goes to Marina Glency for the suggestion.
 2011-10-16 19:40:45 +02:00
David Mudrak
998085c9f7 Dropping the uq_rater_per_item from the table grading_instances 
It was realized that we may need multiple instances per one rater/item
to be able to 1) implement a draft instance and 2) eventually keep the
history of advanced grading.
 2011-10-16 19:40:34 +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
Petr Skoda
e922fe23b6 MDL-29602 accesslib improvements 
Refactoring and improvements of the accesslib.php library including prevention of access for not-logged-in users when forcelogin enabled, improved context caching, OOP refactoring of contexts, fixed context loading, deduplication of role definitions in user sessions, installation improvements, decoupling of enrolment checking from capability loading, added detection of deleted and non-existent users in has_capability(), new function accesslib test, auth and enrol upgrade notes.

More details are available in tracker subtasks.
 2011-10-16 14:05:18 +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
AMOS bot
49bfc8be29 Automatically generated installer lang files 2011-10-14 00:55:22 +00:00
David Mudrak
7ece4a0798 Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric 2011-10-13 22:45:30 +02:00
David Mudrak
20c207ab21 Merge branch 'master' into rubric 
Conflicts:
	lib/db/upgrade.php
 2011-10-13 22:42:47 +02:00
David Mudrak
ba2a25a816 Merge pull request #14 from marinaglancy/wip-MDL-29481-rubric 
MDL-29481: Filling rubric by teacher (first steps)
 2011-10-13 13:24:37 -07: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
Tim Hunt
987c2d491e MDL-29627 quiz access refactor password check into a generic check page. 2011-10-13 11:13:20 +01:00
Tim Hunt
4344c5d5d9 MDL-29627 quiz old popup int column => new browsersecurity column. 
The new column store more meaningful string constants.
 2011-10-13 11:13:18 +01:00
Tim Hunt
0eafc98852 MDL-29627 fix code-checker issues throughout the quiz code. 2011-10-13 11:13:16 +01:00
Tim Hunt
1d9e1a3c06 MDL-29627 refactor the way the rules are constructed from the quiz. 2011-10-13 11:13:14 +01:00
Tim Hunt
d755b0f577 MDL-29627 quiz_access_manager move all output code to the renderer. 
This achieves a massive clean-up. It simplifies comples code in a number
of places. It allows some methods and functions to be moved to a more
appropriate home (for example cannot_review_message to the quiz class).
It moves more logic out of the renderer.
 2011-10-13 11:13:12 +01:00
Tim Hunt
dd70d561ef MDL-29627 quiz load access settings when a quiz is being attempted. 2011-10-13 11:13:10 +01:00
Tim Hunt
c18ba64c3e MDL-29627 load the existing settings when the quiz settings are re-edited. 2011-10-13 11:13:08 +01:00
Tim Hunt
b83c32d39f MDL-29627 quiz access plugins can add fields to mod_form and save the data. 2011-10-13 11:13:06 +01:00
Tim Hunt
ea38245cfb MDL-29627 quiz access: move the unit tests into the relevant plugins. 2011-10-13 11:13:04 +01:00
Tim Hunt
e5844040a0 MDL-29627 quiz access: fix variable names that don't match the coding style. 2011-10-13 11:13:02 +01:00