Sam Hemelryk [Mon, 14 Jan 2013 21:48:53 +0000 (10:48 +1300)]
Merge branch 'wip-MDL-37206-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 14 Jan 2013 21:43:08 +0000 (10:43 +1300)]
Merge branch 'MDL-37378' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 14 Jan 2013 21:37:54 +0000 (10:37 +1300)]
Merge branch 'MDL-37030-master' of git://github.com/damyon/moodle
Conflicts:
mod/assign/locallib.php
mod/assign/submission/onlinetext/locallib.php
Sam Hemelryk [Mon, 14 Jan 2013 21:27:40 +0000 (10:27 +1300)]
MDL-31682 mod_assign: fixed since version on new service.
Sam Hemelryk [Mon, 14 Jan 2013 21:21:20 +0000 (10:21 +1300)]
Merge branch 'MDL-31682' of git://github.com/Lightwork-Marking/moodle
Conflicts:
mod/assign/version.php
Sam Hemelryk [Mon, 14 Jan 2013 21:12:44 +0000 (10:12 +1300)]
Merge branch 'w02_MDL-36514_m25_enableself' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 Jan 2013 07:34:29 +0000 (15:34 +0800)]
Merge branch 'MDL-37143-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Mon, 14 Jan 2013 07:26:09 +0000 (15:26 +0800)]
Merge branch 'wip-MDL-30797-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 14 Jan 2013 07:24:10 +0000 (15:24 +0800)]
Merge branch 'w02_MDL-37151_m25_mimetex' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 Jan 2013 07:11:42 +0000 (15:11 +0800)]
Merge branch 'w02_MDL-37286_m25_tracebuffer' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 Jan 2013 07:06:20 +0000 (15:06 +0800)]
MDL-36297 - increment version no
Dan Poltawski [Mon, 14 Jan 2013 07:05:15 +0000 (15:05 +0800)]
Merge branch 'wip-MDL-36297-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 14 Jan 2013 06:59:22 +0000 (14:59 +0800)]
Merge branch 'wip-mdl-29534' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Fri, 11 Jan 2013 06:08:15 +0000 (17:08 +1100)]
MDL-37206 preload course format renderer in course/view.php
Also fixed bug with hardcoded default 'weeks' format
Adrian Greeve [Tue, 8 Jan 2013 05:17:24 +0000 (13:17 +0800)]
MDL-30797 - backup groups: Added a parameter to the groups_assign_grouping function.
$timeadded has now been included so that the backup / restore functions can now use
this API rather than duplicating the code.
Adam Olley [Thu, 3 May 2012 07:08:37 +0000 (16:38 +0930)]
MDL-30797 backup: Use correct API call for mapping groups to groupings on import/restore
Sam Hemelryk [Mon, 14 Jan 2013 01:08:56 +0000 (14:08 +1300)]
Merge branch 'MDL-37048-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 14 Jan 2013 00:51:48 +0000 (13:51 +1300)]
Merge branch 'MDL-35568_dndupload_hidden' of git://github.com/davosmith/moodle
Sam Hemelryk [Mon, 14 Jan 2013 00:40:06 +0000 (13:40 +1300)]
Merge branch 'wip-MDL-35885-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 13 Jan 2013 23:24:06 +0000 (12:24 +1300)]
Merge branch 'MDL-36095-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Sun, 13 Jan 2013 23:13:00 +0000 (12:13 +1300)]
Merge branch 'MDL-36511' of git://github.com/srynot4sale/moodle
Sam Hemelryk [Sun, 13 Jan 2013 22:47:37 +0000 (11:47 +1300)]
Merge branch 'w02_MDL-32387_m25_paypalexpire' of git://github.com/skodak/moodle
Sam Hemelryk [Sun, 13 Jan 2013 22:46:13 +0000 (11:46 +1300)]
Merge branch 'master_MDL-37394' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 13 Jan 2013 22:04:52 +0000 (11:04 +1300)]
Merge branch 'MDL-37397-m' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Sun, 13 Jan 2013 22:00:00 +0000 (11:00 +1300)]
Merge branch 'wip-mdl-35780' of git://github.com/rajeshtaneja/moodle
Petr Škoda [Sat, 15 Dec 2012 15:55:43 +0000 (16:55 +0100)]
MDL-37151 upgrade mimetex to 1.74
Thanks Ralf Krause for help with OSX compilation flags.
Petr Škoda [Mon, 19 Nov 2012 14:30:26 +0000 (15:30 +0100)]
MDL-36514 add tests for showing of self enrolment link
Petr Škoda [Sun, 11 Nov 2012 15:49:16 +0000 (16:49 +0100)]
MDL-36514 add new option to prevent only new self enrolments
Hopefully this will resolve all confusion around the enrol->status flag in this plugin.
Petr Škoda [Sun, 23 Dec 2012 15:46:52 +0000 (16:46 +0100)]
MDL-32387 add paypal enrolment expiration action
Petr Škoda [Sat, 12 Jan 2013 14:28:57 +0000 (15:28 +0100)]
MDL-37286 improve coding style in unit tests
Petr Škoda [Sat, 29 Dec 2012 17:55:44 +0000 (18:55 +0100)]
MDL-37286 add new combined_progress_trace
This type of trace should be useful when multiple trace outputs requested.
Petr Škoda [Sat, 29 Dec 2012 17:02:08 +0000 (18:02 +0100)]
MDL-37286 add error_log progress trace
Petr Škoda [Sat, 22 Dec 2012 20:18:48 +0000 (21:18 +0100)]
MDL-37286 add progres_trace buffer and unit tests
Tim Hunt [Mon, 7 Jan 2013 15:56:20 +0000 (15:56 +0000)]
MDL-37378 quiz restore: timecheckstate not in old backups.
We need to avoid a notice. If the value is missing, setting it to 0 is
fine. It will get sorted out the next time cron is run.
Eloy Lafuente (stronk7) [Fri, 11 Jan 2013 12:42:08 +0000 (13:42 +0100)]
NOBUG: Bumping version to test auto-packaging
Andrew Robert Nicols [Wed, 9 Jan 2013 22:47:19 +0000 (22:47 +0000)]
MDL-37397 Test for a valid select in formautosubmit
Ideally we shouldn't get into this situation, but in cases where the
generated select element is incorrectly configured, we should try and
handle it gracefully with a warning.
Eloy Lafuente (stronk7) [Fri, 11 Jan 2013 11:36:05 +0000 (12:36 +0100)]
weekly release 2.5dev
Eloy Lafuente (stronk7) [Fri, 11 Jan 2013 11:23:22 +0000 (12:23 +0100)]
fix permissions
Eloy Lafuente (stronk7) [Fri, 11 Jan 2013 11:15:57 +0000 (12:15 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Dan Marsden [Fri, 11 Jan 2013 10:45:23 +0000 (23:45 +1300)]
MDL-37394 SCORM: Aicc direct url fails with new nav as it has a single sco with no children - allow these to be navigated correctly.
Jason Fowler [Thu, 10 Jan 2013 05:45:13 +0000 (13:45 +0800)]
MDL-35885 - Wiki - add a legend element to the search wikis form
Damyon Wiese [Fri, 11 Jan 2013 03:44:34 +0000 (11:44 +0800)]
MDL-32341 calendar: get_file_by_hash() expects a hash
Rajesh Taneja [Fri, 11 Jan 2013 01:33:28 +0000 (09:33 +0800)]
MDL-35780 Administration: email display on user profile view page will respect user capability
Petr Škoda [Thu, 10 Jan 2013 10:42:22 +0000 (11:42 +0100)]
MDL-37420 rework pg schema testing
David Mudrák [Thu, 10 Jan 2013 15:57:10 +0000 (16:57 +0100)]
MDL-37467 Do not provide blog posts via RSS when blogging is disabled
Eloy Lafuente (stronk7) [Thu, 10 Jan 2013 10:13:13 +0000 (11:13 +0100)]
Merge branch 'MDL-36741_master' of git://github.com/markn86/moodle
Mark Nelson [Thu, 10 Jan 2013 09:15:51 +0000 (17:15 +0800)]
MDL-36741 mod_forum: fixed the function forum_rss_newstuff that was using count_records_sql incorrectly as well as generating RSS content when no data exists
Mark Nelson [Thu, 10 Jan 2013 05:32:33 +0000 (13:32 +0800)]
MDL-37247 mod_forum: removing unnecessary variable in the get_forums web service
Mark Nelson [Thu, 10 Jan 2013 04:43:39 +0000 (12:43 +0800)]
MDL-37247 mod_forum: perform conditional checks before returning forums via web service
Dan Poltawski [Thu, 10 Jan 2013 03:17:05 +0000 (11:17 +0800)]
Andrew Robert Nicols [Wed, 9 Jan 2013 08:35:02 +0000 (08:35 +0000)]
MDL-36600 Add missing sesskey check when previewing the message
Rajesh Taneja [Tue, 8 Jan 2013 08:15:25 +0000 (16:15 +0800)]
MDL-29534 Forum: if forum_replytouser is not set then send forum email using noreplyaddress.
Frederic Massart [Wed, 9 Jan 2013 03:39:39 +0000 (11:39 +0800)]
MDL-32639 phpunit: Hack not to fail on debugging
Aaron Barnes [Sun, 11 Nov 2012 11:03:52 +0000 (00:03 +1300)]
MDL-36511 course: Save "completion starts on enrolment" disabled state
Sam Hemelryk [Wed, 9 Jan 2013 01:35:09 +0000 (14:35 +1300)]
Merge branch 'wip-MDL-37404-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 9 Jan 2013 00:32:09 +0000 (01:32 +0100)]
Merge branch 'w51_MDL-37420_m25_pgschema' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 9 Jan 2013 00:31:50 +0000 (01:31 +0100)]
Merge branch 'wip-MDL-31750-master' of git://github.com/abgreeve/moodle
Conflicts:
course/tests/courselib_test.php
Sam Hemelryk [Tue, 8 Jan 2013 23:33:29 +0000 (12:33 +1300)]
MDL-36904 mod_assign: Fixed whitespace issue
Sam Hemelryk [Tue, 8 Jan 2013 22:59:43 +0000 (11:59 +1300)]
Merge branch 'MDL-35413-master' of git://github.com/damyon/moodle
Conflicts:
mod/assign/locallib.php
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 22:30:19 +0000 (23:30 +0100)]
Merge branch 'w51_MDL-37183_m25_excelcleanup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 22:25:34 +0000 (23:25 +0100)]
Merge branch 'wip-MDL-37203-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 22:11:54 +0000 (23:11 +0100)]
Merge branch 'w51_MDL-35356_m25_excel' of git://github.com/skodak/moodle
Conflicts:
lib/odslib.class.php
Sam Hemelryk [Tue, 8 Jan 2013 21:20:46 +0000 (10:20 +1300)]
Merge branch 'MDL-35443-wip' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Tue, 8 Jan 2013 21:07:16 +0000 (10:07 +1300)]
Merge branch 'wip-MDL-35842-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 Jan 2013 20:41:00 +0000 (09:41 +1300)]
Merge branch 'wip-MDL-35891-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 Jan 2013 20:37:09 +0000 (09:37 +1300)]
MDL-36357 cache: removed double semicolon
Sam Hemelryk [Tue, 8 Jan 2013 20:34:22 +0000 (09:34 +1300)]
Merge branch 'MDL-36357' of git://github.com/danpoltawski/moodle
Conflicts:
user/view.php
Andrew Robert Nicols [Tue, 8 Jan 2013 20:21:35 +0000 (09:21 +1300)]
MDL-36600 user: improve course messaging checks
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 17:01:43 +0000 (18:01 +0100)]
Merge branch 'w51_MDL-37152_m25_smtp' of git://github.com/skodak/moodle
Petr Škoda [Tue, 8 Jan 2013 16:20:42 +0000 (17:20 +0100)]
MDL-37420 add support for db schemas in auth test
Petr Škoda [Tue, 8 Jan 2013 16:12:58 +0000 (17:12 +0100)]
MDL-37420 add support for db schemas in enrol test
Petr Škoda [Tue, 8 Jan 2013 16:12:31 +0000 (17:12 +0100)]
MDL-37420 add support for more PostgreSQL schemas
Jean-Michel Vedrine [Tue, 8 Jan 2013 09:26:55 +0000 (10:26 +0100)]
MDL-28183 fix for problem during integration
Conflicts:
question/type/multianswer/question.php
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 10:54:19 +0000 (11:54 +0100)]
Merge branch 'MDL-37220_dnd_icon' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 10:39:23 +0000 (11:39 +0100)]
Merge branch 'w51_MDL-37284_m25_mysqlutf8' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 09:51:49 +0000 (10:51 +0100)]
Merge branch 'w51_MDL-37291_m25_paypalrestore' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 09:34:04 +0000 (10:34 +0100)]
Merge branch 'w51_MDL-37186_m25_tinymceconfig' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 8 Jan 2013 09:21:50 +0000 (10:21 +0100)]
Merge branch 'w51_MDL-37323_m25_dlgstrings' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Jan 2013 08:49:47 +0000 (16:49 +0800)]
Merge branch 'w51_MDL-7537_m25_paypalcur' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Jan 2013 08:42:47 +0000 (16:42 +0800)]
MDL-3941 - version bump for TLS support in ldap
Dan Poltawski [Tue, 8 Jan 2013 08:40:50 +0000 (16:40 +0800)]
Merge branch 'wip_master_mdl-3941_add_support_for_LDAP_TLS' of git://github.com/iarenaza/moodle
Isaac Marco Blancas [Tue, 8 Jan 2013 08:10:57 +0000 (16:10 +0800)]
MDL-29534 Forum: If forum_replytouser is not set then don't display from user email"
Dan Poltawski [Tue, 8 Jan 2013 07:08:05 +0000 (15:08 +0800)]
Merge branch 'w51_MDL-37299_m25_manselfprogress' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Jan 2013 06:50:29 +0000 (14:50 +0800)]
Merge branch 'w51_MDL-35685_m25_capinit_b' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Jan 2013 06:46:14 +0000 (14:46 +0800)]
Merge branch 'MDL-32639-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 8 Jan 2013 06:40:15 +0000 (14:40 +0800)]
Merge branch 'wip_master_mdl-28585_ldap_auth_doesnt_handle_password_expiration' of https://github.com/iarenaza/moodle
Dan Poltawski [Tue, 8 Jan 2013 06:29:32 +0000 (14:29 +0800)]
Merge branch 'w51_MDL-37125_m25_yui380' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Jan 2013 06:26:52 +0000 (14:26 +0800)]
Merge branch 'w51_MDL-37282_m25_tinymce358' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Jan 2013 06:22:11 +0000 (14:22 +0800)]
Merge branch 'w51_MDL-37303_m25_enrolinstancestatus' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Jan 2013 06:15:22 +0000 (14:15 +0800)]
Merge branch 'w51_MDL-37304_m25_authdbcleanup' of git://github.com/skodak/moodle
Jason Fowler [Thu, 22 Nov 2012 07:44:27 +0000 (15:44 +0800)]
MDL-36620 - Blog, RSS - Preventing Guests from viewing the RSS of site level blogs
Ankit Agarwal [Wed, 2 Jan 2013 07:00:49 +0000 (15:00 +0800)]
MDL-37106 calendar: Proper capability checks should be done before processing an ical request
Dan Poltawski [Tue, 8 Jan 2013 05:57:47 +0000 (13:57 +0800)]
Merge branch 'MDL-36738-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Fri, 28 Dec 2012 07:07:44 +0000 (15:07 +0800)]
MDL-36738 calendar: Display events imported details
We should display a the status of events when a new subscription is added. Although this means we need to redirect through an itermediate page.
Ankit Agarwal [Fri, 28 Dec 2012 03:35:02 +0000 (11:35 +0800)]
MDL-36738 calendar: Ical subscription list should display type of event
Dan Poltawski [Tue, 8 Jan 2013 05:01:00 +0000 (13:01 +0800)]
Merge branch 'MDL-27901-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 8 Jan 2013 04:58:16 +0000 (12:58 +0800)]
Merge branch 'w51_MDL-21116_m52_reversedel' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 8 Jan 2013 04:50:44 +0000 (12:50 +0800)]
Merge branch 'MDL-37247_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 8 Jan 2013 04:20:54 +0000 (12:20 +0800)]
Merge branch 'MDL-36955' of git://github.com/jmvedrine/moodle
Mark Nelson [Wed, 12 Dec 2012 05:08:03 +0000 (13:08 +0800)]
MDL-37247 mod_forum: adding webservice function to allow for the retrieval of forum instances
