340aa2008f
Merge branch 'w43_MDL-30005_m21_uri' of git://github.com/skodak/moodle into MOODLE_21_STABLE
2011-10-31 15:17:15 +08:00
1322584287
Merge branch 'w43_MDL-28720_m21_calendarreturn' of git://github.com/skodak/moodle into MOODLE_21_STABLE
2011-10-31 17:31:49 +13:00
2df5a98299
MDL-27919 Fixed a regression where I was seeing that after choosing "Overwrite"
...
in a filemanager form component when subsequently trying to add another file the
file picker would then immediately close upon opening.
2011-10-31 17:18:58 +13:00
cb28940596
MDL-27919 also adding a callback to the filepicker when a file is overwritten
...
but a file with the same name. This is not necessary in most cases but is
instant and some code may expect a call to the function whether the url and / or
file name has changed or not so it can update itself when the file changes.
2011-10-31 17:18:58 +13:00
44915324c8
MDL-27919 Fixes 'undefined' message and similar problems when selecting a
...
recent file, server file or when renaming a file being uploaded with the same
name as a previous one.
2011-10-31 17:18:57 +13:00
7a6d43a3ee
Merge branch 'MDL-29810-21' of git://github.com/bostelm/moodle into MOODLE_21_STABLE
2011-10-31 17:10:41 +13:00
376d035af9
Merge branch 'MDL-30006-workshop-grades_21_STABLE' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE
2011-10-31 13:05:53 +13:00
c440076d2b
Merge branch 'm21_MDL-28559' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE
2011-10-31 13:00:08 +13:00
d612fa300e
Merge branch 'm21_MDL-29965' of git://github.com/danmarsden/moodle into MOODLE_21_STABLE
2011-10-31 12:56:18 +13:00
84ac3ff122
Merge branch 'MDL-29898-MOODLE_21_STABLE-1' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE
2011-10-31 12:44:31 +13:00
516dd9c525
MDL-30005 bump up version after lang string change
2011-10-30 23:54:01 +01:00
4064642b37
MDL-30005 fix general URI support in URL module
...
The recent change completely removed support for general URIs and enforced strict URL validation which was breaking backwards compatibility and was not user friendly at all.
This patch finally adds full URI support with basic validation and fixes some older xhtml strict issues.
Please note we do not try to explain the difference between URL and URI to our users. Also keep in mind that mod/url has XSS risk and does not do any security validation of the data.
2011-10-30 23:53:55 +01:00
08fb23840e
MDL-30006 Workshop / Number of errors grading: force graders to actually answer the form
...
QuickForms do not distinguish non-checked radio from the checked radio
with the value "0". So we map the database grade value "0" to a value
"-1" when displaying the form and vice versa when saving the form. This
allowed us to have none radios checked by default and force the grader
to actually answer the form themselves, using the 'required' rule.
2011-10-30 20:16:08 +01:00
112f7d41ea
MDL-30006 Workshop / Accumulative grading: force graders to actually pick a grade
...
This patch introduces a new hidden field with the value "-1". The grade
selectors are compared with this values and must be greater than it.
This should fit well for numerical grades with the range 0..x and scale
items with the range 1..x.
2011-10-30 20:16:01 +01:00
75658ad2ca
SCORM MDL-29965 improve display of SCORM package - decrease unecessary padding
2011-10-29 15:34:13 +13:00
0d2672748c
MDL-28720 fix set.php return url handling
2011-10-28 19:35:28 +02:00
716267f233
MDL-29810 Assignment grading: don't include teachers in list of students
2011-10-27 22:19:15 +01:00
9de8774f09
weekly release 2.1.2+
2011-10-27 18:53:34 +02:00
7f5d1ef3c0
Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle into MOODLE_21_STABLE
2011-10-27 18:49:09 +02:00
6e03d19df5
Automatically generated installer lang files
2011-10-27 00:55:34 +00:00
d21cdb8b3c
MDL-29912 course search - oracle inabilities with concats, empties, nulls and type-restrictions
2011-10-27 12:59:56 +13:00
21c5b22d97
MDL-29854 questions: display better message and more useful continue
...
when an error occurs in the middle of processing responeses.
2011-10-26 15:16:37 +08:00
006106d640
MDL-28559 - hide send for marking button from people that are enrolled but don't have capability to submit files - displays the same way as teachers/admins - keeps ability to display previously submitted files if they exist
2011-10-26 10:55:31 +13:00
5c6ec45706
Merge branch 'MDL-29569_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
2011-10-26 10:44:20 +13:00
23f3d0e4ac
MDL-26568 block_online_users - reporting incorrect number of users
...
When over 50 users were online the count used in the listing was incorrect
2011-10-25 23:35:22 +02:00
3f4186c6dc
MDL-29368 Assignment: Fixed a fatal error caused by a missing include
2011-10-25 19:19:35 +02:00
fd26ea4218
Merge branch 'MDL-29815_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
2011-10-25 17:44:10 +02:00
c96deddbe7
MDL-29815 dbtest - added one test_get_records_sql_complicated related test
2011-10-25 17:38:38 +02:00
c963b7e15b
MDL-28718 quiz : fixed plugin requires version to reflect current moodle MOODLE_21_STABLE version.
2011-10-25 15:48:05 +08:00
cd4336433c
MDL-29569: lesson_mod: in matching type questions, fixed and set default value for scoring and fixed jump page setting when response text is set to empty
2011-10-25 12:16:56 +08:00
68bbf58745
Merge branch 'MDL-28718_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
2011-10-25 16:47:03 +13:00
523f4aa787
Merge branch 'wip-MDL-29231-stable21' of git://github.com/phalacee/moodle into MOODLE_21_STABLE
2011-10-25 15:19:12 +13:00
b304495ee4
MDL-29444 use iframe embedding in IE
...
iframe is back in HTML 5, we can safely use it in IE for all text documents because object embedding has multiple problems
2011-10-25 14:32:12 +13:00
ce50619835
Automatically generated installer lang files
2011-10-25 00:55:21 +00:00
9ee2ba4676
Merge branch 'MDL-29339_b_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
2011-10-25 01:54:10 +02:00
35e2ec4df5
Merge branch 'MDL-29906_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
2011-10-25 12:25:06 +13:00
3a87f672b7
Merge branch 'w42_MDL-29862_m21_fullmeinit' of git://github.com/skodak/moodle into MOODLE_21_STABLE
2011-10-25 11:50:10 +13:00
9aa5b604ec
Merge branch 'w42_MDL-29867_m21_author' of git://github.com/skodak/moodle into MOODLE_21_STABLE
2011-10-24 23:14:49 +02:00
e52c5225ec
MDL-29906 quiz statistics report: replace use of deprectaed helpbutton.
2011-10-24 16:20:49 +01:00
3eb03012f0
MDL-29898: Fix documentation for CLI DB only installer
2011-10-24 12:32:10 +01:00
8c7d6037e6
MDL-29339 Manually cast objects to string before calling dmllib.
2011-10-24 11:20:42 +01:00
3cc9205676
Merge branch 'MDL-29542_m21' of git://github.com/rwijaya/moodle into MOODLE_21_STABLE
2011-10-24 17:05:39 +08:00
3d336f2264
Merge branch 'MDL-29828_21' of git://github.com/timhunt/moodle into MOODLE_21_STABLE
2011-10-24 16:43:21 +08:00
2cc4660758
MDL-29527 RSS : improved language string.
2011-10-24 16:21:12 +08:00
f1dc5d01e1
MDL-29527 - RSS: Add a description to the reset keys page
...
Thanks to Alexander Bias for the suggestion
2011-10-24 16:20:55 +08:00
fdb8574046
Merge branch 'MDL-29619-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE
2011-10-24 14:49:35 +08:00
e2236bac8c
MDL-29231 - Course, Resource - Fix so that the correct icon is displayed for courses that have had two or more files uploaded to them - Thanks Michael D for the patch
2011-10-24 14:36:09 +08:00
8eb6f9f7a7
Merge branch 'MDL-29646-m21' of git://github.com/ankitagarwal/moodle into MOODLE_21_STABLE
2011-10-24 13:52:51 +08:00
b35dc1beb7
Merge branch 'MDL-29818-MOODLE_21_STABLE' of git://git.luns.net.uk/moodle into MOODLE_21_STABLE
2011-10-24 13:06:58 +08:00
515b891bb7
Automatically generated installer lang files
2011-10-23 00:55:21 +00:00
Aparup Banerjee