Aparup Banerjee [Mon, 31 Oct 2011 06:13:46 +0000 (14:13 +0800)]
Merge branch 'w43_MDL-30005_m22_uri' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 05:02:03 +0000 (18:02 +1300)]
Merge branch 'w43_MDL-29883_m22_mp3player' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 04:59:11 +0000 (17:59 +1300)]
Merge branch 'w43_MDL-29824_m22_enrolmax' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 04:28:57 +0000 (17:28 +1300)]
Merge branch 'w43_MDL-28720_m22_calendarreturn' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 04:18:13 +0000 (17:18 +1300)]
Merge branch 'MDL-27919' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Mon, 31 Oct 2011 04:11:08 +0000 (17:11 +1300)]
Merge branch 'MDL-29810' of git://github.com/bostelm/moodle
Sam Hemelryk [Mon, 31 Oct 2011 03:53:24 +0000 (16:53 +1300)]
Merge branch 'MDL-29994' of git://github.com/stronk7/moodle
Aparup Banerjee [Mon, 31 Oct 2011 02:23:59 +0000 (10:23 +0800)]
Merge branch 'w43_MDL-29923_m22_removesearch' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 31 Oct 2011 02:19:31 +0000 (15:19 +1300)]
Merge branch 'MDL-29993' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 31 Oct 2011 01:56:06 +0000 (14:56 +1300)]
Merge branch 'MDL-29992' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 31 Oct 2011 00:51:07 +0000 (13:51 +1300)]
Merge branch 'MDL-29978' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 31 Oct 2011 00:06:10 +0000 (13:06 +1300)]
Merge branch 'MDL-30006-workshop-grades' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 30 Oct 2011 23:59:35 +0000 (12:59 +1300)]
Merge branch 'master_MDL-28559' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 30 Oct 2011 23:55:57 +0000 (12:55 +1300)]
Merge branch 'master_MDL-29965' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 30 Oct 2011 23:47:21 +0000 (12:47 +1300)]
Merge branch 'master_MDL-30009' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 30 Oct 2011 23:44:05 +0000 (12:44 +1300)]
Merge branch 'MDL-29898-master-1' of git://git.luns.net.uk/moodle
Petr Skoda [Sun, 30 Oct 2011 11:55:08 +0000 (12:55 +0100)]
MDL-30005 bump up version after lang string change
Petr Skoda [Sun, 30 Oct 2011 22:53:17 +0000 (23:53 +0100)]
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.
Dan Marsden [Sun, 30 Oct 2011 22:04:20 +0000 (11:04 +1300)]
SCORM MDL-30009 fix issue with started on/last accessed when iterating through users.
David Mudrak [Sun, 30 Oct 2011 19:05:27 +0000 (20:05 +0100)]
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.
David Mudrak [Sun, 30 Oct 2011 17:57:57 +0000 (18:57 +0100)]
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.
Petr Skoda [Sun, 30 Oct 2011 12:35:12 +0000 (13:35 +0100)]
MDL-29824 bump up version after new lang string
Petr Skoda [Sun, 30 Oct 2011 12:34:23 +0000 (13:34 +0100)]
MDL-29824 improve notification of max number of enrolled users
Eloy Lafuente (stronk7) [Sun, 30 Oct 2011 01:35:59 +0000 (02:35 +0100)]
MDL-29994 filters - prevent mod/data and mod/glossary to be re-added
Eloy Lafuente (stronk7) [Sun, 30 Oct 2011 00:33:11 +0000 (02:33 +0200)]
MDL-29993 filters - new filter/data filter replacement for legacy mod/data/filter.
Eloy Lafuente (stronk7) [Sat, 29 Oct 2011 16:57:08 +0000 (18:57 +0200)]
MDL-29992 filters - move related css from mod/glossary to filter/glossary
Eloy Lafuente (stronk7) [Sat, 29 Oct 2011 16:40:56 +0000 (18:40 +0200)]
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.
Eloy Lafuente (stronk7) [Fri, 24 Jun 2011 23:29:28 +0000 (01:29 +0200)]
MDL-29992 filters - new filter/glossary filter replacement for legacy mod/glossary/filter.
Dan Marsden [Sat, 29 Oct 2011 02:28:09 +0000 (15:28 +1300)]
SCORM MDL-29965 improve display of SCORM package - decrease unecessary padding
Petr Skoda [Fri, 28 Oct 2011 17:35:04 +0000 (19:35 +0200)]
MDL-28720 fix set.php return url handling
Petr Skoda [Fri, 28 Oct 2011 08:20:00 +0000 (10:20 +0200)]
MDL-29923 remove all traces of experimental global search
Hopefully it will be replaced by something fully functional soon, see http://moodle.org/mod/forum/discuss.php?d=189023
Petr Skoda [Fri, 28 Oct 2011 07:17:31 +0000 (09:17 +0200)]
MDL-29883 remove unused mp3player
Eloy Lafuente (stronk7) [Thu, 27 Oct 2011 23:39:18 +0000 (01:39 +0200)]
MDL-29978 install - dependencies must be checked against disk (target) versions
Andreas Grabs [Thu, 27 Oct 2011 22:30:42 +0000 (00:30 +0200)]
MDL-29804 - Clean up Feedback modules coding style
Henning Bostelmann [Sat, 22 Oct 2011 11:19:18 +0000 (12:19 +0100)]
MDL-29810 Assignment grading: don't include teachers in list of students
Eloy Lafuente (stronk7) [Thu, 27 Oct 2011 16:51:29 +0000 (18:51 +0200)]
weekly release 2.2dev
Eloy Lafuente (stronk7) [Thu, 27 Oct 2011 16:48:55 +0000 (18:48 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Petr Skoda [Thu, 27 Oct 2011 13:07:34 +0000 (15:07 +0200)]
MDL-29474 fix undefined release, phpdocs and one TODO
Petr Skoda [Thu, 27 Oct 2011 12:36:20 +0000 (14:36 +0200)]
MDL-29474 tell AMOS we have a new install string
Petr Skoda [Thu, 27 Oct 2011 12:04:19 +0000 (14:04 +0200)]
MDL-29474 fix cli upgrade regression
Petr Skoda [Thu, 27 Oct 2011 11:56:22 +0000 (13:56 +0200)]
MDL-29474 add env and plugin test to cli db install
Petr Skoda [Thu, 27 Oct 2011 10:47:05 +0000 (12:47 +0200)]
MDL-29474 fix regressions in CLI install
AMOS bot [Thu, 27 Oct 2011 00:55:29 +0000 (00:55 +0000)]
Automatically generated installer lang files
Sam Hemelryk [Wed, 26 Oct 2011 23:57:21 +0000 (12:57 +1300)]
Merge branch 'MDL-29912' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Wed, 26 Oct 2011 17:04:31 +0000 (19:04 +0200)]
MDL-29912 course search - oracle inabilities with concats, empties, nulls and type-restrictions
Eloy Lafuente (stronk7) [Wed, 26 Oct 2011 09:40:01 +0000 (11:40 +0200)]
Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle
Petr Skoda [Wed, 26 Oct 2011 09:35:42 +0000 (11:35 +0200)]
MDL-29688 rewrite complex joins to be compatible with MySQL
Unfortunately MySQL does not handle complex EXISTS queries properly…
Eloy Lafuente (stronk7) [Wed, 26 Oct 2011 08:34:28 +0000 (10:34 +0200)]
MDL-29474 plugin dependencies: version minibump
Eloy Lafuente (stronk7) [Wed, 26 Oct 2011 08:33:37 +0000 (10:33 +0200)]
Merge branch 'MDL-29474' of git://github.com/timhunt/moodle
Aparup Banerjee [Wed, 26 Oct 2011 03:23:09 +0000 (11:23 +0800)]
Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle
Dan Marsden [Tue, 25 Oct 2011 21:55:31 +0000 (10:55 +1300)]
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
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 21:51:10 +0000 (23:51 +0200)]
Merge branch 'w42_MDL-29670_m22_croncleanup' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 25 Oct 2011 21:44:41 +0000 (10:44 +1300)]
Merge branch 'MDL-29569' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 3 Aug 2011 14:16:13 +0000 (15:16 +0100)]
MDL-26568 block_online_users - reporting incorrect number of users
When over 50 users were online the count used in the listing was incorrect
Sam Hemelryk [Tue, 25 Oct 2011 21:21:35 +0000 (10:21 +1300)]
Merge branch 'MDL-29716' of git://github.com/mouneyrac/moodle
Petr Skoda [Tue, 25 Oct 2011 20:07:04 +0000 (22:07 +0200)]
MDL-29670 add more timeout resets
Stephen Bourget [Wed, 19 Oct 2011 14:58:50 +0000 (10:58 -0400)]
MDL-29368 Assignment: Fixed a fatal error caused by a missing include
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 15:47:09 +0000 (17:47 +0200)]
Merge branch 'w42_MDL-29918_m22_accesslibdocs' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 15:43:51 +0000 (17:43 +0200)]
Merge branch 'MDL-29815' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 15:37:34 +0000 (17:37 +0200)]
MDL-29815 dbtest - added one test_get_records_sql_complicated related test
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 14:41:11 +0000 (16:41 +0200)]
Merge branch 'w42_MDL-29866_m22_setupinit' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 14:34:04 +0000 (16:34 +0200)]
Merge branch 'w42_MDL-29914_m22_codesniffer' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 14:21:35 +0000 (16:21 +0200)]
MDL-29881 pear/console/getopt - deleting one more occurrence
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 14:17:40 +0000 (16:17 +0200)]
Merge branch 'w42_MDL-29881_m22_profiling' of git://github.com/skodak/moodle
Tim Hunt [Tue, 25 Oct 2011 13:49:57 +0000 (14:49 +0100)]
MDL-29854 questions: display better message and more useful continue
when an error occurs in the middle of processing responeses.
Petr Skoda [Tue, 25 Oct 2011 12:20:22 +0000 (14:20 +0200)]
MDL-29918 improve accesslib inline docs
Eloy Lafuente (stronk7) [Tue, 25 Oct 2011 11:27:09 +0000 (13:27 +0200)]
Merge branch 'w42_MDL-29882_m22_overlib' of git://github.com/skodak/moodle
Petr Skoda [Tue, 25 Oct 2011 07:10:38 +0000 (09:10 +0200)]
MDL-29914 remove unused CodeSniffer lib
Petr Skoda [Tue, 25 Oct 2011 06:54:30 +0000 (08:54 +0200)]
MDL-29866 fix p tags and more docs
Rossiani Wijaya [Tue, 25 Oct 2011 04:22:02 +0000 (12:22 +0800)]
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
Sam Hemelryk [Tue, 25 Oct 2011 03:47:20 +0000 (16:47 +1300)]
Merge branch 'MDL-28718' of git://github.com/timhunt/moodle
Jerome Mouneyrac [Tue, 25 Oct 2011 03:17:18 +0000 (11:17 +0800)]
MDL-29716 Make token more flexible to support third party client - also fix issue with some code not matching the way the server authenticate/authorize token, missing iprestriction/validuntil for restricted users (there are iprestriction/validiuntil on token and on restricted user). Also add missing check when the user is not listed in the authorised list.
Sam Hemelryk [Tue, 25 Oct 2011 02:28:52 +0000 (15:28 +1300)]
MDL-29106 white space clean up
Sam Hemelryk [Tue, 25 Oct 2011 02:19:45 +0000 (15:19 +1300)]
Merge branch 'wip-MDL-29231-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 25 Oct 2011 01:28:53 +0000 (14:28 +1300)]
Merge branch 'w42_MDL-29444_m22_iframe' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 25 Oct 2011 01:02:20 +0000 (14:02 +1300)]
Merge branch 'w42_MDL-29688_m22_enrol' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 25 Oct 2011 00:10:43 +0000 (13:10 +1300)]
Merge branch 'MDL-29902' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 23:53:51 +0000 (01:53 +0200)]
Merge branch 'MDL-29339_b' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 23:42:48 +0000 (01:42 +0200)]
Merge branch 'w42_MDL-28627_m22_kses' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Oct 2011 23:25:28 +0000 (12:25 +1300)]
Merge branch 'MDL-29906' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 23:21:09 +0000 (01:21 +0200)]
Merge branch 'w42_MDL-29671_m22_odbc' of git://github.com/skodak/moodle
Conflicts:
lib/thirdpartylibs.xml
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 23:01:10 +0000 (01:01 +0200)]
Merge branch 'w42_MDL-29863_m22_extendsorder' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Oct 2011 22:49:25 +0000 (11:49 +1300)]
Merge branch 'w42_MDL-29862_m22_fullmeinit' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Oct 2011 22:46:51 +0000 (11:46 +1300)]
Merge branch 'MDL-29825' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 24 Oct 2011 22:45:58 +0000 (11:45 +1300)]
Merge branch 'MDL-29459' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 24 Oct 2011 22:43:53 +0000 (11:43 +1300)]
MDL-29106 webservices: Minor whitespace cleanup
Sam Hemelryk [Mon, 24 Oct 2011 22:42:40 +0000 (11:42 +1300)]
Merge branch 'MDL-29106' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 21:14:31 +0000 (23:14 +0200)]
Merge branch 'w42_MDL-29867_m22_author' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 21:04:54 +0000 (23:04 +0200)]
Merge branch 'w42_MDL-29878_m22_typo3' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 21:03:11 +0000 (23:03 +0200)]
Merge branch 'w42_MDL-29880_m22_geoip' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 16:25:52 +0000 (18:25 +0200)]
Merge branch 'w42_MDL-29887_m22_swfobject' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 16:03:42 +0000 (18:03 +0200)]
Merge branch 'w42_MDL-29884_m22_base32' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 15:50:27 +0000 (17:50 +0200)]
Merge branch 'w42_MDL-29885_m22_csshover' of git://github.com/skodak/moodle
Petr Skoda [Mon, 24 Oct 2011 15:43:05 +0000 (17:43 +0200)]
MDL-29887 add forgotten flashvars
Thanks Eloy!
Tim Hunt [Mon, 24 Oct 2011 15:19:46 +0000 (16:19 +0100)]
MDL-29906 quiz statistics report: replace use of deprectaed helpbutton.
Dan Poltawski [Mon, 24 Oct 2011 13:42:24 +0000 (14:42 +0100)]
MDL-29902: Course contacts display cleanup
This fixes warnings in course description when searching courses with
users assigned multiple display roles. It cleans up inconsistent behaviour
which I noticed whilst fixing the bug. Now course search and course listing
use the same logic to display users.
Eloy Lafuente (stronk7) [Mon, 24 Oct 2011 14:51:53 +0000 (16:51 +0200)]
Merge branch 'w42_MDL-29886_m22_md5js' of git://github.com/skodak/moodle
Andrew Robert Nicols [Mon, 24 Oct 2011 11:31:16 +0000 (12:31 +0100)]
MDL-29898: Fix documentation for CLI DB only installer
Tim Hunt [Mon, 24 Oct 2011 10:08:10 +0000 (11:08 +0100)]
MDL-29339 Manually cast objects to string before calling dmllib.
Aparup Banerjee [Mon, 24 Oct 2011 09:05:17 +0000 (17:05 +0800)]
Merge branch 'MDL-29542' of git://github.com/rwijaya/moodle
