David Mudrak [Tue, 1 Nov 2011 02:16:54 +0000 (03:16 +0100)]
MDL-29794 Initial support for re-using a shared grading form
The patch introduces a new script templates.php that allows to search
for a previously shared form (template) and re-use it.
The patch also modifies the preview rendering of grading forms. Now
plugins are responsible for rendering the form itselft, without any
headers, descriptions etc (we need to embed the form preview into
various places so the caller looks after the frame).
David Mudrak [Thu, 27 Oct 2011 19:52:24 +0000 (21:52 +0200)]
Merge remote branch 'origin/master' into rubric
Conflicts:
lib/db/upgrade.php
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
David Mudrak [Thu, 27 Oct 2011 06:47:29 +0000 (23:47 -0700)]
Merge pull request #17 from marinaglancy/wip-rubricrenderer-rubric
Better rendering of the rubrics, rubric display options
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
Marina Glancy [Wed, 26 Oct 2011 03:36:29 +0000 (11:36 +0800)]
MDL-29482, MDL-29481: better rendering, options for rubric display
Aparup Banerjee [Wed, 26 Oct 2011 03:23:09 +0000 (11:23 +0800)]
Merge branch 'MDL-29854_b' of git://github.com/timhunt/moodle
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
Marina Glancy [Tue, 25 Oct 2011 01:49:10 +0000 (09:49 +0800)]
MDL-29794: fixed bug with description cloning
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
Marina Glancy [Tue, 25 Oct 2011 00:55:55 +0000 (08:55 +0800)]
MDL-29481: rubric renderer now uses tables for smoother layout
Marina Glancy [Mon, 24 Oct 2011 08:27:48 +0000 (16:27 +0800)]
MDL-29481: phpdocs in renderer, renamed the main CSS class for rubric
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
David Mudrak [Mon, 24 Oct 2011 20:13:01 +0000 (22:13 +0200)]
Merge remote branch 'origin/master' into rubric
Conflicts:
lib/db/upgrade.php
version.php
David Mudrak [Mon, 24 Oct 2011 19:02:56 +0000 (21:02 +0200)]
Merge remote branch 'github/rubric' into rubric
David Mudrak [Mon, 24 Oct 2011 19:02:05 +0000 (21:02 +0200)]
Simplified manage.php initialization
For now, we support activity modules only anyway.
David Mudrak [Mon, 24 Oct 2011 18:59:08 +0000 (11:59 -0700)]
Merge pull request #16 from marinaglancy/wip-MDL-29483-rubric
MDL-29483: advanced grading methods support on assignment module, grading
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
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
Aparup Banerjee [Mon, 24 Oct 2011 08:39:17 +0000 (16:39 +0800)]
Merge branch 'MDL-29828' of git://github.com/timhunt/moodle
Aparup Banerjee [Mon, 24 Oct 2011 07:50:58 +0000 (15:50 +0800)]
MDL-29527 RSS : improved language string.
Aparup Banerjee [Mon, 24 Oct 2011 07:37:14 +0000 (15:37 +0800)]
Merge branch 'MDL-29527' of git://git.luns.net.uk/moodle
Aparup Banerjee [Mon, 24 Oct 2011 06:21:39 +0000 (14:21 +0800)]
Merge branch 'MDL-29619-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 24 Oct 2011 05:32:50 +0000 (13:32 +0800)]
MDL-29483: allow the grading instance to exist without itemid until submitting (submission in assignment might not yet existed)
Marina Glancy [Mon, 24 Oct 2011 03:03:48 +0000 (11:03 +0800)]
MDL-29108: support for returnurl in rubriceditor
Marina Glancy [Mon, 24 Oct 2011 02:55:03 +0000 (10:55 +0800)]
MDL-29481: added support for remarks in rubric feedback
Aparup Banerjee [Mon, 24 Oct 2011 05:26:28 +0000 (13:26 +0800)]
Merge branch 'MDL-29646-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Mon, 24 Oct 2011 03:36:07 +0000 (11:36 +0800)]
Merge branch 'MDL-29818-master' of git://git.luns.net.uk/moodle
Jerome Mouneyrac [Tue, 18 Oct 2011 04:57:33 +0000 (12:57 +0800)]
MDL-29106 new web service naming convention
Petr Skoda [Sun, 23 Oct 2011 19:14:04 +0000 (21:14 +0200)]
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
Petr Skoda [Sun, 23 Oct 2011 18:52:10 +0000 (20:52 +0200)]
MDL-29688 add support for status sync in enrol meta plugin
Petr Skoda [Sun, 23 Oct 2011 18:51:39 +0000 (20:51 +0200)]
MDL-29688 properly reactivate ext db enrolment
Petr Skoda [Sun, 23 Oct 2011 18:02:31 +0000 (20:02 +0200)]
MDL-29688 fix user enrolment modification event
Fixed invalid event name and usage.
Petr Skoda [Sun, 23 Oct 2011 10:50:56 +0000 (12:50 +0200)]
MDL-29863 fix order of context and context_helper class definitions
The switched order may create problems in older PHP versions or opt caches. In any case it is more logical to define the classes in this order. Sorry for the trouble.
Petr Skoda [Sun, 23 Oct 2011 10:05:44 +0000 (12:05 +0200)]
MDL-29887 remove outdated swfobject
Contrib code can use YUI flash embedding, manual embedding or better switch to JS/HTML 5.
Petr Skoda [Sun, 23 Oct 2011 09:46:50 +0000 (11:46 +0200)]
MDL-29886 remove unused md5 js lib
Petr Skoda [Sun, 23 Oct 2011 09:41:36 +0000 (11:41 +0200)]
MDL-29885 remove unused csshover
Petr Skoda [Sun, 23 Oct 2011 09:35:46 +0000 (11:35 +0200)]
MDL-29884 remove unused base32 lib
Petr Skoda [Sun, 23 Oct 2011 08:51:51 +0000 (10:51 +0200)]
MDL-29882 finally removing overlib
Petr Skoda [Sun, 23 Oct 2011 08:45:35 +0000 (10:45 +0200)]
MDL-29881 remove old apd profiling
Profiling is now handled via xhprof extension and new profiling UI.
Petr Skoda [Sun, 23 Oct 2011 08:14:36 +0000 (10:14 +0200)]
MDL-29880 bump up geoip version
The RC was the same as the final 1.0.0 version.
Petr Skoda [Sat, 22 Oct 2011 19:10:20 +0000 (21:10 +0200)]
MDL-29878 reapply our typo3 fixes
Petr Skoda [Sat, 22 Oct 2011 19:07:24 +0000 (21:07 +0200)]
MDL-29878 import latest Typo3 4.5.0
Petr Skoda [Sat, 22 Oct 2011 18:48:39 +0000 (20:48 +0200)]
MDL-29671 remove unused odbc lib
Petr Skoda [Sat, 22 Oct 2011 18:18:11 +0000 (20:18 +0200)]
MDL-29867 fix invalid file author
