49735 Commits

Author SHA1 Message Date
Sam Hemelryk
70f43a4789 Merge branch 'MDL-29993' of git://github.com/stronk7/moodle 2011-10-31 15:19:31 +13:00
Sam Hemelryk
01dc193786 Merge branch 'MDL-29992' of git://github.com/stronk7/moodle 2011-10-31 14:56:06 +13:00
Sam Hemelryk
a6d832f022 Merge branch 'MDL-29978' of git://github.com/stronk7/moodle 2011-10-31 13:51:07 +13:00
Sam Hemelryk
cdf30a11a8 Merge branch 'MDL-30006-workshop-grades' of git://github.com/mudrd8mz/moodle 2011-10-31 13:06:10 +13:00
Sam Hemelryk
81ad059658 Merge branch 'master_MDL-28559' of git://github.com/danmarsden/moodle 2011-10-31 12:59:35 +13:00
Sam Hemelryk
75dab90e3d Merge branch 'master_MDL-29965' of git://github.com/danmarsden/moodle 2011-10-31 12:55:57 +13:00
Sam Hemelryk
ad7592f32b Merge branch 'master_MDL-30009' of git://github.com/danmarsden/moodle 2011-10-31 12:47:21 +13:00
Sam Hemelryk
385f30f7a7 Merge branch 'MDL-29898-master-1' of git://git.luns.net.uk/moodle 2011-10-31 12:44:05 +13:00
Dan Marsden
503dfba895 SCORM MDL-30009 fix issue with started on/last accessed when iterating through users. 2011-10-31 11:04:20 +13:00
David Mudrak
8df95cf7f4 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:17:54 +01:00
David Mudrak
60a3e801f3 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:17:50 +01:00
Eloy Lafuente (stronk7)
350f973d38 MDL-29993 filters - new filter/data filter replacement for legacy mod/data/filter. 2011-10-30 02:33:11 +02:00
Eloy Lafuente (stronk7)
9ff8c803be MDL-29992 filters - move related css from mod/glossary to filter/glossary 2011-10-29 19:02:22 +02:00
Eloy Lafuente (stronk7)
d307a1a70d MDL-29992 filters - move js popup from mod/glossary to filter/glossary
This commit moves the js popup to the new location of the filter. Also
it fixes one bug, with the js processing also glossary category links
leading to error, so now the categories are working again.
2011-10-29 19:02:07 +02:00
Eloy Lafuente (stronk7)
85a69ce123 MDL-29992 filters - new filter/glossary filter replacement for legacy mod/glossary/filter. 2011-10-29 17:50:58 +02:00
Dan Marsden
61c347cc73 SCORM MDL-29965 improve display of SCORM package - decrease unecessary padding 2011-10-29 15:28:09 +13:00
Eloy Lafuente (stronk7)
3f123d9227 MDL-29978 install - dependencies must be checked against disk (target) versions 2011-10-28 01:41:04 +02:00
Andreas Grabs
9c5bc7a580 MDL-29804 - Clean up Feedback modules coding style 2011-10-28 00:30:42 +02:00
Eloy Lafuente (stronk7)
38e9a1cc79 weekly release 2.2dev 2011-10-27 18:51:29 +02:00
Eloy Lafuente (stronk7)
d2822153b0 Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-10-27 18:48:55 +02:00
Petr Skoda
8d1da74863 MDL-29474 fix undefined release, phpdocs and one TODO 2011-10-27 15:07:34 +02:00
Petr Skoda
2dfef18842 MDL-29474 tell AMOS we have a new install string 2011-10-27 14:36:20 +02:00
Petr Skoda
c1f55426ee MDL-29474 fix cli upgrade regression 2011-10-27 14:04:19 +02:00
Petr Skoda
72081a6f75 MDL-29474 add env and plugin test to cli db install 2011-10-27 13:56:22 +02:00
Petr Skoda
f433088d5a MDL-29474 fix regressions in CLI install 2011-10-27 13:55:41 +02:00
AMOS bot
4ca17ac303 Automatically generated installer lang files 2011-10-27 00:55:29 +00:00
Sam Hemelryk
7b27861217 Merge branch 'MDL-29912' of git://github.com/stronk7/moodle 2011-10-27 12:57:21 +13:00
Eloy Lafuente (stronk7)
86e00f970b MDL-29912 course search - oracle inabilities with concats, empties, nulls and type-restrictions 2011-10-26 19:04:31 +02:00
Eloy Lafuente (stronk7)
85819105a6 Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle 2011-10-26 11:40:01 +02:00
Petr Skoda
dcb9a0c1f1 MDL-29688 rewrite complex joins to be compatible with MySQL
Unfortunately MySQL does not handle complex EXISTS queries properly…
2011-10-26 11:35:42 +02:00
Eloy Lafuente (stronk7)
75d9479f8b MDL-29474 plugin dependencies: version minibump 2011-10-26 10:34:28 +02:00
Eloy Lafuente (stronk7)
10dd4995da Merge branch 'MDL-29474' of git://github.com/timhunt/moodle 2011-10-26 10:33:37 +02:00
Aparup Banerjee
a0b10b271f Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle 2011-10-26 11:23:09 +08:00
Dan Marsden
da69510f2a 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:59:13 +13:00
Eloy Lafuente (stronk7)
036f27a420 Merge branch 'w42_MDL-29670_m22_croncleanup' of git://github.com/skodak/moodle 2011-10-25 23:51:10 +02:00
Sam Hemelryk
e6369d951c Merge branch 'MDL-29569' of git://github.com/rwijaya/moodle 2011-10-26 10:44:41 +13:00
Dan Poltawski
10aeaf0f74 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:34:46 +02:00
Sam Hemelryk
462a064cf0 Merge branch 'MDL-29716' of git://github.com/mouneyrac/moodle 2011-10-26 10:21:35 +13:00
Petr Skoda
4332cc468c MDL-29670 add more timeout resets 2011-10-25 22:07:04 +02:00
Stephen Bourget
d31a1ad808 MDL-29368 Assignment: Fixed a fatal error caused by a missing include 2011-10-25 19:19:02 +02:00
Eloy Lafuente (stronk7)
f65cd7f46c Merge branch 'w42_MDL-29918_m22_accesslibdocs' of git://github.com/skodak/moodle 2011-10-25 17:47:09 +02:00
Eloy Lafuente (stronk7)
35454bd55d Merge branch 'MDL-29815' of git://github.com/timhunt/moodle 2011-10-25 17:43:51 +02:00
Eloy Lafuente (stronk7)
44a9630623 MDL-29815 dbtest - added one test_get_records_sql_complicated related test 2011-10-25 17:37:34 +02:00
Eloy Lafuente (stronk7)
94da1daf40 Merge branch 'w42_MDL-29866_m22_setupinit' of git://github.com/skodak/moodle 2011-10-25 16:41:11 +02:00
Eloy Lafuente (stronk7)
a7fc769154 Merge branch 'w42_MDL-29914_m22_codesniffer' of git://github.com/skodak/moodle 2011-10-25 16:34:04 +02:00
Eloy Lafuente (stronk7)
bad48c0cbc MDL-29881 pear/console/getopt - deleting one more occurrence 2011-10-25 16:21:35 +02:00
Eloy Lafuente (stronk7)
980dfc5720 Merge branch 'w42_MDL-29881_m22_profiling' of git://github.com/skodak/moodle 2011-10-25 16:17:40 +02:00
Tim Hunt
bed495578f MDL-29854 questions: display better message and more useful continue
when an error occurs in the middle of processing responeses.
2011-10-25 14:49:57 +01:00
Petr Skoda
99ddfdf4c4 MDL-29918 improve accesslib inline docs 2011-10-25 14:20:22 +02:00
Eloy Lafuente (stronk7)
1bf0076e83 Merge branch 'w42_MDL-29882_m22_overlib' of git://github.com/skodak/moodle 2011-10-25 13:27:09 +02:00