Sam Hemelryk [Mon, 31 Jan 2011 08:28:28 +0000 (16:28 +0800)]
Merge branch 'w05_MDL-26069_20_filecheck' of git://github.com/skodak/moodle
Petr Skoda [Mon, 31 Jan 2011 08:06:31 +0000 (09:06 +0100)]
Merge branch 'm20_MDL-25895_repository_ajax' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 31 Jan 2011 08:04:29 +0000 (09:04 +0100)]
Merge branch 'MDL-25573_m20' of git://github.com/rwijaya/moodle
Petr Skoda [Mon, 31 Jan 2011 07:56:25 +0000 (08:56 +0100)]
Merge branch 'MDL-25291_20_admintreeflag' of git://github.com/samhemelryk/moodle
Rossiani Wijaya [Mon, 31 Jan 2011 07:03:58 +0000 (15:03 +0800)]
create youtube playlist filter. Fixed regex, removed addslash_js, use variable param instead of url because the variable contains the value of the url parameter.
Sam Hemelryk [Mon, 31 Jan 2011 06:58:08 +0000 (14:58 +0800)]
Merge branch 'MDL-25913'
Sam Hemelryk [Mon, 31 Jan 2011 06:57:48 +0000 (14:57 +0800)]
MDL-25931 Fixed up whitespace during integration.
Sam Hemelryk [Mon, 31 Jan 2011 06:41:04 +0000 (14:41 +0800)]
Merge branch 'MDL-25914'
Sam Hemelryk [Mon, 31 Jan 2011 06:40:54 +0000 (14:40 +0800)]
MDL-25914 Fixed whitespace in binarius theme core.css
Sam Hemelryk [Mon, 31 Jan 2011 06:16:46 +0000 (14:16 +0800)]
Merge branch 'MDL-25892' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 31 Jan 2011 06:10:12 +0000 (14:10 +0800)]
Merge branch 'MDL-25834'
Sam Hemelryk [Mon, 31 Jan 2011 06:09:57 +0000 (14:09 +0800)]
MDL-25834 Fixed white space issues during integration
Sam Hemelryk [Mon, 31 Jan 2011 05:50:21 +0000 (13:50 +0800)]
Merge branch 'MDL-26168' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 31 Jan 2011 05:31:40 +0000 (13:31 +0800)]
Merge branch 'MDL-25786' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 31 Jan 2011 05:17:26 +0000 (13:17 +0800)]
Merge branch 'MDL-25723' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 31 Jan 2011 05:05:09 +0000 (13:05 +0800)]
Merge branch 'MDL-21250-capitalized_strings' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 31 Jan 2011 04:09:53 +0000 (12:09 +0800)]
Merge branch 'MDL-26158'
Sam Hemelryk [Mon, 31 Jan 2011 04:09:43 +0000 (12:09 +0800)]
MDL-26158 fixed xhtml problem
Sam Hemelryk [Mon, 31 Jan 2011 03:52:40 +0000 (11:52 +0800)]
Merge branch 'w05_MDL-25743_20_selfenrol' of git://github.com/skodak/moodle
Petr Skoda [Thu, 27 Jan 2011 10:46:37 +0000 (11:46 +0100)]
MDL-26158 fix form printing and processing
Petr Skoda [Sat, 29 Jan 2011 16:50:12 +0000 (17:50 +0100)]
MDL-26069 detect missing file postprocessing
Tim Hunt [Fri, 28 Jan 2011 12:20:01 +0000 (12:20 +0000)]
qtype_multianswer MDL-26168 fix invalid HTML from the editing form.
Fix by Tony Levi. Thanks.
Helen Foster [Thu, 27 Jan 2011 15:24:30 +0000 (16:24 +0100)]
MDL-21250 capital letters removal
Also some spotted leading and trailing whitespace was removed from some
strings.
Sam Hemelryk [Thu, 27 Jan 2011 07:54:11 +0000 (15:54 +0800)]
navigation MDL-25291 Added a session variable so that admin tree is skipped if it is found to be empty.
Petr Skoda [Tue, 25 Jan 2011 15:15:09 +0000 (16:15 +0100)]
MDL-25743 fix inverted timestart/end logic
Petr Skoda [Tue, 25 Jan 2011 11:08:54 +0000 (12:08 +0100)]
MDL-26117 skip invalid resource records during upgrade
Petr Skoda [Tue, 25 Jan 2011 18:30:03 +0000 (19:30 +0100)]
weekly release
Sam Hemelryk [Tue, 25 Jan 2011 04:18:05 +0000 (12:18 +0800)]
PULL-157, MDL-26116 Fixed merge conflicts
Dongsheng Cai [Tue, 25 Jan 2011 03:24:03 +0000 (11:24 +0800)]
MDL-26116, added default value to tag_instance.tiuserid field
Eloy Lafuente (stronk7) [Mon, 24 Jan 2011 10:55:57 +0000 (11:55 +0100)]
PULL-99, MDL-25929 progresstrackedroles out. Fixed conflicts and whitespace
Eloy Lafuente (stronk7) [Mon, 24 Jan 2011 10:43:59 +0000 (11:43 +0100)]
NOBUG: Fix whitespace
Eloy Lafuente (stronk7) [Mon, 24 Jan 2011 09:48:08 +0000 (10:48 +0100)]
Merge branch 'wip-MDL-26044' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 24 Jan 2011 08:20:51 +0000 (16:20 +0800)]
Merge branch 'MDL-25637'
Sam Hemelryk [Mon, 24 Jan 2011 08:20:30 +0000 (16:20 +0800)]
MDL-25637 Fixed whitespace
Aparup Banerjee [Mon, 24 Jan 2011 07:49:18 +0000 (15:49 +0800)]
performance MDL-25637 converted tabs to spaces
Sam Hemelryk [Mon, 24 Jan 2011 07:05:55 +0000 (15:05 +0800)]
Merge branch 'w04_MDL-26035_20_installtest' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 24 Jan 2011 05:38:12 +0000 (13:38 +0800)]
Performance MDL-25637 moved static count/sizeof functions out of for loop conditions
Aparup Banerjee [Fri, 10 Dec 2010 09:13:43 +0000 (17:13 +0800)]
performance MDL-25637 some of more similar performance tweaks to come
Sam Hemelryk [Mon, 24 Jan 2011 05:26:51 +0000 (13:26 +0800)]
Merge branch 'w04_MDL-26066_20_dbenrol' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jan 2011 03:57:06 +0000 (11:57 +0800)]
Merge branch 'w04_MDL-26096_20_catenrol' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jan 2011 03:51:38 +0000 (11:51 +0800)]
Merge branch 'w04_MDL-25855_20_filerequire' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jan 2011 03:38:29 +0000 (11:38 +0800)]
Merge branch 'MDL-26061-no_remote_users' of git://github.com/mudrd8mz/moodle.git with changes
Sam Hemelryk [Mon, 24 Jan 2011 03:37:29 +0000 (11:37 +0800)]
MDL-26061 Revised new string before integration.
Sam Hemelryk [Mon, 24 Jan 2011 03:10:40 +0000 (11:10 +0800)]
Merge branch 'w04_MDL-26008_20_creator' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jan 2011 03:07:29 +0000 (11:07 +0800)]
Merge branch 'w04_MDL-26106_20_lebletypo' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jan 2011 03:02:07 +0000 (11:02 +0800)]
Merge branch 'm20_MDL-26063_SCORM_grouping' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 24 Jan 2011 03:00:27 +0000 (11:00 +0800)]
Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jan 2011 02:45:46 +0000 (10:45 +0800)]
Merge branch 'w04_MDL-26045_20_onlineblock' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 24 Jan 2011 02:31:34 +0000 (10:31 +0800)]
Merge branch 'MDL-25841' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 24 Jan 2011 02:20:22 +0000 (10:20 +0800)]
Merge branch 'MDL-25884' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 24 Jan 2011 02:08:32 +0000 (10:08 +0800)]
Merge branch 'MDL-26059' of git://github.com/timhunt/moodle
Petr Skoda [Sun, 23 Jan 2011 19:10:10 +0000 (20:10 +0100)]
MDL-26096 added missing return
Petr Skoda [Sun, 23 Jan 2011 17:34:41 +0000 (18:34 +0100)]
MDL-25855 some more missing filelib includes
Petr Skoda [Sun, 23 Jan 2011 14:36:06 +0000 (15:36 +0100)]
MDL-26106 fix lable typo
credit goes to fautrero
Petr Skoda [Sun, 23 Jan 2011 13:56:28 +0000 (14:56 +0100)]
MDL-26066 fix invalid type comparison when course id used and typo fix
Petr Skoda [Sun, 23 Jan 2011 13:27:51 +0000 (14:27 +0100)]
MDL-26035 more detection of invalid plugin dir names
Petr Skoda [Sun, 23 Jan 2011 11:53:12 +0000 (12:53 +0100)]
MDL-26008 improved creator role description
Petr Skoda [Sun, 23 Jan 2011 11:32:08 +0000 (12:32 +0100)]
MDL-26041 do not include lables in the list of resources
Dan Marsden [Wed, 19 Jan 2011 21:40:22 +0000 (10:40 +1300)]
SCORM MDL-26063 incorrect context used - thanks to Matteo Scaramuccia for fix
David Mudrak [Wed, 19 Jan 2011 18:14:00 +0000 (19:14 +0100)]
MDL-26061 Prevent fatal error in remote enrolment client when there are no roaming users
Petr Skoda [Tue, 18 Jan 2011 21:42:49 +0000 (22:42 +0100)]
MDL-26045 fix invalid sql join when separate group mode enabled
Petr Skoda [Wed, 19 Jan 2011 13:13:54 +0000 (14:13 +0100)]
weekly release
Tim Hunt [Tue, 18 Jan 2011 23:30:40 +0000 (23:30 +0000)]
qtype_multianswer MDL-25841 feedback pop-up was appearing in the wrong place.
It seems that overlib was getting confused by its div being inside another positioned div. The simplest solution is to not create the div at all. Then the overlib JS creates it when needed, and that works.
Tim Hunt [Tue, 18 Jan 2011 23:13:37 +0000 (23:13 +0000)]
quiz MDL-25884 mod/quiz/index.php broken when logged in as a student.
Tim Hunt [Tue, 18 Jan 2011 21:38:34 +0000 (21:38 +0000)]
qformat_gift MDL-26059 fails to import truefalse questions with answer true.
sam marshall [Tue, 18 Jan 2011 12:55:58 +0000 (12:55 +0000)]
completion MDL-25929 Added upgrade change to remove unused setting
sam marshall [Tue, 18 Jan 2011 12:39:51 +0000 (12:39 +0000)]
lib MDL-26044 Optimise moodle_url based on profiler data
Sam Hemelryk [Tue, 18 Jan 2011 09:41:23 +0000 (17:41 +0800)]
Merge branch 'MDL-25988_20_wip_enrolroles' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 18 Jan 2011 09:17:14 +0000 (17:17 +0800)]
gradebook MDL-20617 Fixed SQL formatting
andyjdavis [Tue, 18 Jan 2011 08:24:41 +0000 (16:24 +0800)]
gradebook MDL-20617 added more control over what columns are displayed on the user report
Sam Hemelryk [Tue, 18 Jan 2011 07:40:50 +0000 (15:40 +0800)]
Merge branch 'MDL-26031_20_wip_guestsession' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 18 Jan 2011 07:34:43 +0000 (15:34 +0800)]
Merge branch 'MDL-26007_20_wip_enverror' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 18 Jan 2011 06:18:24 +0000 (14:18 +0800)]
Merge branch 'MDL-25910_20_wip_mysqlsocket' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 18 Jan 2011 05:47:31 +0000 (13:47 +0800)]
Merge branch 'MDL-25754_20_wip' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 18 Jan 2011 04:03:11 +0000 (12:03 +0800)]
Merge rebased branch 'MDL-25769' of git://github.com/andyjdavis/moodle.git
Sam Hemelryk [Tue, 18 Jan 2011 03:39:05 +0000 (11:39 +0800)]
gradebook MDL-25769 Fixed SQL syntax formatting
andyjdavis [Mon, 10 Jan 2011 04:04:51 +0000 (12:04 +0800)]
gradebook MDL-25769 switched a query over to use named params
andyjdavis [Fri, 7 Jan 2011 02:02:31 +0000 (10:02 +0800)]
gradebook MDL-25769 fixed some problems identified by peer review
andyjdavis [Thu, 6 Jan 2011 07:04:37 +0000 (15:04 +0800)]
gradebook MDL-25769 fixed up the grader report
andyjdavis [Thu, 6 Jan 2011 03:55:22 +0000 (11:55 +0800)]
gradebook MDL-25769 fixed grade/import/lib.php get_unenrolled_users_in_import()
andyjdavis [Wed, 5 Jan 2011 06:12:27 +0000 (14:12 +0800)]
gradebook MDL-25769 fixed the loading of users in the grader report
Sam Hemelryk [Tue, 18 Jan 2011 02:56:51 +0000 (10:56 +0800)]
Merge branch 'MDL-25887' of git://github.com/andyjdavis/moodle.git
Sam Hemelryk [Tue, 18 Jan 2011 02:55:36 +0000 (10:55 +0800)]
gradebook MDL-25887 Fixed whitespace
Petr Skoda [Mon, 17 Jan 2011 20:22:43 +0000 (21:22 +0100)]
Merge branch 'MDL-25789' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 17 Jan 2011 20:13:07 +0000 (21:13 +0100)]
Merge branch 'MDL-25790' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 17 Jan 2011 20:08:05 +0000 (21:08 +0100)]
MDL-25791 PULL-125 reverting commits that create null problems during upgrade
Petr Skoda [Mon, 17 Jan 2011 19:52:31 +0000 (20:52 +0100)]
Merge branch 'MDL-25791' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 17 Jan 2011 19:49:53 +0000 (20:49 +0100)]
Merge branch 'MDL-25792' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 17 Jan 2011 19:45:53 +0000 (20:45 +0100)]
Merge branch 'MDL-25672' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 17 Jan 2011 19:42:17 +0000 (20:42 +0100)]
Merge branch 'MDL-25750' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 17 Jan 2011 19:25:56 +0000 (20:25 +0100)]
Merge branch 'MDL-25987' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 17 Jan 2011 19:22:26 +0000 (20:22 +0100)]
Merge branch 'MDL-25722' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 17 Jan 2011 19:20:43 +0000 (20:20 +0100)]
Merge branch 'MDL-26029' of git://github.com/timhunt/moodle
Petr Skoda [Mon, 17 Jan 2011 18:12:33 +0000 (19:12 +0100)]
Merge branch 'MDL-25881' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 17 Jan 2011 18:02:55 +0000 (19:02 +0100)]
Merge branch 'workshop_random_allocator' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 17 Jan 2011 18:01:02 +0000 (19:01 +0100)]
Merge branch 'MDL-25980-mnet_remote_enrolment' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 17 Jan 2011 17:57:22 +0000 (18:57 +0100)]
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
John Stabinger [Mon, 17 Jan 2011 17:33:00 +0000 (12:33 -0500)]
MDL-25913 fix for Arialist custom menu
Petr Skoda [Mon, 17 Jan 2011 17:25:00 +0000 (18:25 +0100)]
MDL-26031 purge timed-out sessions of guest user
Tim Hunt [Mon, 17 Jan 2011 16:19:26 +0000 (16:19 +0000)]
unit tests MDL-26029 fix notices from CheckSpecifiedFieldsExpectation.
