moodle.git
10 years agoMDL-25907 purge sessions of not-logged-in users
Ashley Holman [Wed, 12 Jan 2011 19:14:00 +0000 (20:14 +0100)]
MDL-25907 purge sessions of not-logged-in users

10 years agoweekly version bump
Petr Skoda [Wed, 12 Jan 2011 09:50:18 +0000 (10:50 +0100)]
weekly version bump

10 years agoMerge branch 'MDL-25596-fixed' of git://github.com/samhemelryk/moodle
Petr Skoda [Wed, 12 Jan 2011 08:57:18 +0000 (09:57 +0100)]
Merge branch 'MDL-25596-fixed' of git://github.com/samhemelryk/moodle

10 years agoblocks-navigation MDL-25596 Fixed notice when block config doesn't already exist
Sam Hemelryk [Wed, 12 Jan 2011 01:52:30 +0000 (09:52 +0800)]
blocks-navigation MDL-25596 Fixed notice when block config doesn't already exist

10 years agoMDL-25501 reverting PULL-95
Petr Skoda [Tue, 11 Jan 2011 21:36:38 +0000 (22:36 +0100)]
MDL-25501 reverting PULL-95

10 years agoMerge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
Petr Skoda [Tue, 11 Jan 2011 15:21:58 +0000 (16:21 +0100)]
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle

10 years agoAutomatic installer lang files (20110111)
AMOS bot [Tue, 11 Jan 2011 15:08:58 +0000 (16:08 +0100)]
Automatic installer lang files (20110111)

10 years agoMerge branch 'MDL-25793' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 10 Jan 2011 23:33:56 +0000 (00:33 +0100)]
Merge branch 'MDL-25793' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-24521' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 10 Jan 2011 22:20:30 +0000 (23:20 +0100)]
Merge branch 'MDL-24521' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-24561_forum_subscribe_sesskey' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Mon, 10 Jan 2011 20:38:13 +0000 (21:38 +0100)]
Merge branch 'MDL-24561_forum_subscribe_sesskey' of git://github.com/mudrd8mz/moodle

10 years agoMerge branch 'm20_MDL-25794_sections_typo' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 10 Jan 2011 20:22:02 +0000 (21:22 +0100)]
Merge branch 'm20_MDL-25794_sections_typo' of git://github.com/danmarsden/moodle

10 years agoMerge branch 'wip-MDL-25927' of git://github.com/sammarshallou/moodle
Petr Skoda [Mon, 10 Jan 2011 14:16:22 +0000 (15:16 +0100)]
Merge branch 'wip-MDL-25927' of git://github.com/sammarshallou/moodle

10 years agocompletion MDL-25927 Added old function back as deprecated, to preserve API compatibility
sam marshall [Mon, 10 Jan 2011 14:08:10 +0000 (14:08 +0000)]
completion MDL-25927 Added old function back as deprecated, to preserve API compatibility

10 years agoMerge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng...
Petr Skoda [Mon, 10 Jan 2011 13:54:53 +0000 (14:54 +0100)]
Merge branch 'm20_MDL-25501_wiki_upgrade_improvement' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'm20_MDL-25669_course_sortorder' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 10 Jan 2011 13:51:22 +0000 (14:51 +0100)]
Merge branch 'm20_MDL-25669_course_sortorder' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'm20_MDL-25219_question_text' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 10 Jan 2011 13:44:26 +0000 (14:44 +0100)]
Merge branch 'm20_MDL-25219_question_text' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'MDL-25596' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 10 Jan 2011 13:41:04 +0000 (14:41 +0100)]
Merge branch 'MDL-25596' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-24984' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 10 Jan 2011 13:38:16 +0000 (14:38 +0100)]
Merge branch 'MDL-24984' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-24742' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 10 Jan 2011 13:37:21 +0000 (14:37 +0100)]
Merge branch 'MDL-24742' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25232' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 10 Jan 2011 13:35:38 +0000 (14:35 +0100)]
Merge branch 'MDL-25232' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25675' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 10 Jan 2011 13:34:18 +0000 (14:34 +0100)]
Merge branch 'MDL-25675' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25854' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 10 Jan 2011 13:31:21 +0000 (14:31 +0100)]
Merge branch 'MDL-25854' of git://github.com/samhemelryk/moodle

10 years agoMerge commit 'ed5c4cf44d0b38e129ad57747dfaf16d9677d465'
Petr Skoda [Mon, 10 Jan 2011 13:21:15 +0000 (14:21 +0100)]
Merge commit 'ed5c4cf44d0b38e129ad57747dfaf16d9677d465'

10 years agoMerge commit '246cc0e6b52f455dcb1ab23039202d7498d91d30'
Petr Skoda [Mon, 10 Jan 2011 13:12:34 +0000 (14:12 +0100)]
Merge commit '246cc0e6b52f455dcb1ab23039202d7498d91d30'

Conflicts:
course/request.php

10 years agocompletion MDL-25927 Change print_help_icon to display_help_icon (returns html instea...
sam marshall [Mon, 10 Jan 2011 13:04:54 +0000 (13:04 +0000)]
completion MDL-25927 Change print_help_icon to display_help_icon (returns html instead of printing)

10 years agoMerge branch 'MDL-25886-user_picture_fields' of git://github.com/mudrd8mz/moodle
Petr Skoda [Mon, 10 Jan 2011 12:43:00 +0000 (13:43 +0100)]
Merge branch 'MDL-25886-user_picture_fields' of git://github.com/mudrd8mz/moodle

10 years agomod-wiki MDL-25793 Bumped version number and adjusted version number in new upgrade...
Sam Hemelryk [Mon, 10 Jan 2011 09:31:40 +0000 (17:31 +0800)]
mod-wiki MDL-25793 Bumped version number and adjusted version number in new upgrade code.

10 years agoMerge branch 'MDL-24133' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 08:40:30 +0000 (16:40 +0800)]
Merge branch 'MDL-24133' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25909' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 08:36:49 +0000 (16:36 +0800)]
Merge branch 'MDL-25909' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-23393' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 08:26:17 +0000 (16:26 +0800)]
Merge branch 'MDL-23393' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-23425' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 08:12:50 +0000 (16:12 +0800)]
Merge branch 'MDL-23425' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25869' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 08:10:46 +0000 (16:10 +0800)]
Merge branch 'MDL-25869' of git://git.luns.net.uk/moodle

10 years agoMerge remote branch 'mouneyrac/MDL-25768'
Sam Hemelryk [Mon, 10 Jan 2011 08:01:08 +0000 (16:01 +0800)]
Merge remote branch 'mouneyrac/MDL-25768'

10 years agoMerge branch 'MDL-23657' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 05:39:44 +0000 (13:39 +0800)]
Merge branch 'MDL-23657' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-23224' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 10 Jan 2011 05:33:48 +0000 (13:33 +0800)]
Merge branch 'MDL-23224' of git://github.com/mouneyrac/moodle

10 years agoMerge branch 'MDL-24299' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 05:10:33 +0000 (13:10 +0800)]
Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25478' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 05:02:52 +0000 (13:02 +0800)]
Merge branch 'MDL-25478' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 10 Jan 2011 04:08:10 +0000 (12:08 +0800)]
Merge branch 'MDL-25709-2' of git://git.luns.net.uk/moodle

10 years agoWIKI MDL-25501 1. check if wiki entry exists before insert new entry 2. check wiki...
Dongsheng Cai [Mon, 10 Jan 2011 02:07:34 +0000 (10:07 +0800)]
WIKI MDL-25501 1. check if wiki entry exists before insert new entry 2. check wiki version record mimetype, if it is not empty, try to export the content to file pool

10 years agoMDL-25669, fix_course_sortorder should check MAX_COURSE_CATEGORIES limit, and print...
Dongsheng Cai [Fri, 7 Jan 2011 03:54:41 +0000 (11:54 +0800)]
MDL-25669, fix_course_sortorder should check MAX_COURSE_CATEGORIES limit, and print debugging message when the number of courses in a category reach the limit

10 years agoSCORM MDL-25794 fix db call to use select_menu to pass into single_select renderer...
Dan Marsden [Sun, 9 Jan 2011 22:22:50 +0000 (11:22 +1300)]
SCORM MDL-25794 fix db call to use select_menu to pass into single_select renderer - also fix small typo for label/lable

10 years agoforum MDL-25232 - fix unbalanced divs
Dan Poltawski [Sun, 9 Jan 2011 21:11:01 +0000 (21:11 +0000)]
forum MDL-25232 - fix unbalanced divs

10 years agocourse/lib MDL-24984 - fix lack of spacing on category list
Paul Vaughan [Sun, 9 Jan 2011 20:33:19 +0000 (20:33 +0000)]
course/lib MDL-24984 - fix lack of spacing on category list

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
10 years agoSCORM MDL-25891 typo causing general exception for some SCORM objects - thanks to...
Dan Marsden [Sun, 9 Jan 2011 20:24:16 +0000 (09:24 +1300)]
SCORM MDL-25891 typo causing general exception for some SCORM objects - thanks to Hais Deakin for report/fix

10 years agocourse-format-weeks MDL-24742 dont redefine maincontent
Dan Poltawski [Sun, 9 Jan 2011 20:02:21 +0000 (20:02 +0000)]
course-format-weeks MDL-24742 dont redefine maincontent

It was breaking XHTML validation due to duplicate id

10 years agomod/data MDL-24133 - footer called before header
Dan Poltawski [Sun, 9 Jan 2011 19:29:59 +0000 (19:29 +0000)]
mod/data MDL-24133 - footer called before header

10 years agocourse: MDL-23425 use correct config setting in check for displaying course request...
Myles Carrick [Sun, 9 Jan 2011 18:28:41 +0000 (18:28 +0000)]
course: MDL-23425 use correct config setting in check for displaying course request buttons

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
10 years agoblog MDL-23393 - Tidy up preferences form
Dan Poltawski [Sun, 9 Jan 2011 18:01:55 +0000 (18:01 +0000)]
blog MDL-23393 - Tidy up preferences form

Make form display set value and use mforms type checking

10 years agoforum MDL-25909 - Fix undefined variable
Dan Poltawski [Sat, 8 Jan 2011 15:16:18 +0000 (15:16 +0000)]
forum MDL-25909 - Fix undefined variable

10 years agoblocks/rss_client MDL-25869 Prevent sharing id
Dan Poltawski [Sat, 8 Jan 2011 00:13:33 +0000 (00:13 +0000)]
blocks/rss_client MDL-25869 Prevent sharing id

The form was generating an element id of "header", causing theme
breakage

10 years agoMDL-25886 method to convert aliased fields returned by user_picture::fields() back...
David Mudrak [Fri, 7 Jan 2011 13:05:25 +0000 (14:05 +0100)]
MDL-25886 method to convert aliased fields returned by user_picture::fields() back to unaliased form

The new public static method user_picture::unalias() picks the user
picture fields from the given record and maps the properties back to
unaliased form so that the result can be rendered.
Also fixes a forgotten bug in previous commit and adds a unit test for
both aliasing and unaliasing.

10 years agoMDL-25886 allow user_picture::fields() to be used multiple times within a single...
David Mudrak [Fri, 7 Jan 2011 01:12:43 +0000 (02:12 +0100)]
MDL-25886 allow user_picture::fields() to be used multiple times within a single query

When user table is joined twice or more within a single query, it is
important to be able to provide aliases to all returned files. This
patch adds optional parameter that, if provided, is used as a prefix
for columns aliases. Does not apply to the 'id' column, use $idalias for
that.

10 years agoQUESTION MDL-25219 fixed image links in description question type, credit to Sam...
Dongsheng Cai [Thu, 6 Jan 2011 07:29:07 +0000 (15:29 +0800)]
QUESTION MDL-25219 fixed image links in description question type, credit to Sam Hemelryk

10 years agoblocks-navigation MDL-25596 Fixed up redundant AJAX calls when navigation was limited...
Sam Hemelryk [Wed, 5 Jan 2011 05:27:59 +0000 (13:27 +0800)]
blocks-navigation MDL-25596 Fixed up redundant AJAX calls when navigation was limited by config

10 years agoenrol MDL-25522 Fixed up duplicate fields in search_other_users method that was causi...
Sam Hemelryk [Thu, 6 Jan 2011 02:20:28 +0000 (10:20 +0800)]
enrol MDL-25522 Fixed up duplicate fields in search_other_users method that was causing problems in Oracle

10 years agolib/ajax/ MDL-25675 Use className instead of classList.toString()
Andrew Robert Nicols [Tue, 14 Dec 2010 16:49:57 +0000 (16:49 +0000)]
lib/ajax/ MDL-25675 Use className instead of classList.toString()

Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
10 years agoMDL-24561 forum: require sesskey for the course-wide subscriptions
David Mudrak [Wed, 5 Jan 2011 11:58:25 +0000 (12:58 +0100)]
MDL-24561 forum: require sesskey for the course-wide subscriptions

mod/forum/index.php allows to subscribe to and unsubscribe from all
forums in the course. However, sesskey was not checked here.

10 years agoMDL-24561 forum subscription checks sesskey
David Mudrak [Wed, 5 Jan 2011 11:40:38 +0000 (12:40 +0100)]
MDL-24561 forum subscription checks sesskey

The only case when sesskey is not available is when we came to
subscribe.php from a link in email. In that case, we display a
confirmation page that redirects back providing the sesskey.
All other links to subscribe.php are fixed now so they provide sesskey
as a parameter.
I also polished $mode parameter handling a bit because the check
against empty string was not correct as the value is cast to PARAM_INT.

10 years agoweekly release
Petr Skoda [Wed, 5 Jan 2011 10:54:01 +0000 (11:54 +0100)]
weekly release

10 years agojavascript lib MDL-23224 dropdown onclick event is not trigger in Chrome
jeromemoodle [Wed, 5 Jan 2011 08:12:52 +0000 (16:12 +0800)]
javascript lib MDL-23224 dropdown onclick event is not trigger in Chrome

10 years agocourse MDL-25831 removed trailing whitespace
andyjdavis [Wed, 5 Jan 2011 07:08:18 +0000 (15:08 +0800)]
course MDL-25831 removed trailing whitespace

10 years agocommunity hub finder MDL-25768 private hubs weren't displayed in the hub list
jeromemoodle [Wed, 5 Jan 2011 06:27:54 +0000 (14:27 +0800)]
community hub finder MDL-25768 private hubs weren't displayed in the hub list

10 years agojavascript MDL-24521 Fixed confirm dialog bug. Kudos to John Anderson for his work...
Sam Hemelryk [Wed, 5 Jan 2011 06:02:42 +0000 (14:02 +0800)]
javascript MDL-24521 Fixed confirm dialog bug. Kudos to John Anderson for his work on the patch and James Brisland for help testing.

10 years agoMerge branch 'MDL-25525' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 4 Jan 2011 05:47:55 +0000 (13:47 +0800)]
Merge branch 'MDL-25525' of git://git.luns.net.uk/moodle

10 years agocourse MDL-25831 made course request notifications work
andyjdavis [Tue, 4 Jan 2011 05:35:08 +0000 (13:35 +0800)]
course MDL-25831 made course request notifications work

10 years agoMerge branch 'MDL-25657' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 4 Jan 2011 05:30:32 +0000 (13:30 +0800)]
Merge branch 'MDL-25657' of git://git.luns.net.uk/moodle

10 years agomod-wiki MDL-25793 Fixed database discrepancies between a fresh install and an upgrad...
Sam Hemelryk [Fri, 24 Dec 2010 03:55:35 +0000 (11:55 +0800)]
mod-wiki MDL-25793 Fixed database discrepancies between a fresh install and an upgraded site within the Wiki module

10 years agolib/accesslib.php MDL-25709 - fix docs
Dan Poltawski [Mon, 3 Jan 2011 23:41:10 +0000 (23:41 +0000)]
lib/accesslib.php MDL-25709 - fix docs

10 years agoblocks/calendar_month MDL-23657 - don't assume id param is courseid
Dan Poltawski [Mon, 3 Jan 2011 23:19:58 +0000 (23:19 +0000)]
blocks/calendar_month MDL-23657 - don't assume id param is courseid

This was casuing context creation on invalid courses..

There remains a problem with previous/next buttons on non course pages.

10 years agoroles/assign MDL-24299 Fix back link
Tomasz Muras [Mon, 3 Jan 2011 21:09:32 +0000 (21:09 +0000)]
roles/assign MDL-24299 Fix back link

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
10 years agoMDL-25478 - stop fatal errors adding blocks on the module edit page
Sergey Vidusov [Wed, 1 Dec 2010 00:26:15 +0000 (10:56 +1030)]
MDL-25478 - stop fatal errors adding blocks on the module edit page

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
10 years agocalendar/lib.php MDL-25525 - Tooltip icons broken
Adam Olley [Mon, 3 Jan 2011 18:26:50 +0000 (18:26 +0000)]
calendar/lib.php MDL-25525 - Tooltip icons broken

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
10 years agouser/filters MDL-25657 Obsolete reference to timestart
Dan Poltawski [Mon, 3 Jan 2011 18:06:23 +0000 (18:06 +0000)]
user/filters MDL-25657 Obsolete reference to timestart

10 years agoMerge branch 'MDL-25847' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 3 Jan 2011 17:16:04 +0000 (18:16 +0100)]
Merge branch 'MDL-25847' of git://git.luns.net.uk/moodle

10 years agoMDL-25589 removing extra align value
Petr Skoda [Mon, 3 Jan 2011 17:08:44 +0000 (18:08 +0100)]
MDL-25589 removing extra align value

10 years agoMerge branch 'MDL-25589' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 3 Jan 2011 17:02:44 +0000 (18:02 +0100)]
Merge branch 'MDL-25589' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25808' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 3 Jan 2011 16:59:53 +0000 (17:59 +0100)]
Merge branch 'MDL-25808' of git://git.luns.net.uk/moodle

10 years agoMerge branch 'MDL-25822' of git://git.luns.net.uk/moodle
Petr Skoda [Mon, 3 Jan 2011 16:53:51 +0000 (17:53 +0100)]
Merge branch 'MDL-25822' of git://git.luns.net.uk/moodle

10 years agouser/profile.php MDL-25847 - Missing library dependency
Dan Poltawski [Mon, 3 Jan 2011 16:46:16 +0000 (16:46 +0000)]
user/profile.php MDL-25847 - Missing library dependency

10 years agocoursereqest MDL-25589 set context
Dan Poltawski [Thu, 30 Dec 2010 15:48:50 +0000 (15:48 +0000)]
coursereqest MDL-25589 set context

10 years agocourse/approval.php MDL-25589 Table misaligned
Dan Poltawski [Thu, 30 Dec 2010 15:52:01 +0000 (15:52 +0000)]
course/approval.php MDL-25589 Table misaligned

10 years agoenrol/meta MDL-25808 - error when deleting metacourse
Dan Poltawski [Thu, 30 Dec 2010 15:10:32 +0000 (15:10 +0000)]
enrol/meta MDL-25808 - error when deleting metacourse

Using incorrect dmllib function & testing on non-existant courseid column

10 years agostatistics MDL-25822 Fix broken navigation
Dan Poltawski [Thu, 30 Dec 2010 12:00:36 +0000 (12:00 +0000)]
statistics MDL-25822 Fix broken navigation

10 years agostatistics MDL-25822 Fix get_records_sql returning non-unique first column
Dan Poltawski [Thu, 30 Dec 2010 11:27:46 +0000 (11:27 +0000)]
statistics MDL-25822 Fix get_records_sql returning non-unique first column

10 years agostatistics MDL-25822 multiple values in get_field_sql
Dan Poltawski [Thu, 30 Dec 2010 09:40:28 +0000 (09:40 +0000)]
statistics MDL-25822 multiple values in get_field_sql

A variety of get_field_sql calls returning multiple values, switched
to using MIN/MAX selects.

10 years agocourseoverview report MDL-25727 Graphs Broken
Tim Lock [Thu, 30 Dec 2010 09:41:55 +0000 (09:41 +0000)]
courseoverview report MDL-25727 Graphs Broken

Typo preventing graphs from displaying

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
10 years agoweekly version
Petr Skoda [Wed, 29 Dec 2010 16:48:42 +0000 (17:48 +0100)]
weekly version

10 years agoMDL-25813 fixed silly typo
Petr Skoda [Tue, 28 Dec 2010 18:35:09 +0000 (19:35 +0100)]
MDL-25813 fixed silly typo

10 years agoMerge branch 'wip-MDL-25370' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 27 Dec 2010 16:55:35 +0000 (17:55 +0100)]
Merge branch 'wip-MDL-25370' of git://github.com/sammarshallou/moodle

10 years agoMerge branch 'MDL-25720' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Dec 2010 15:36:17 +0000 (16:36 +0100)]
Merge branch 'MDL-25720' of git://github.com/timhunt/moodle

10 years agoMDL-25341 blogs import - unused vars and mktime() fix
Eloy Lafuente (stronk7) [Mon, 27 Dec 2010 15:20:39 +0000 (16:20 +0100)]
MDL-25341 blogs import - unused vars and mktime() fix

10 years agoMDL-25341 blogs import - minor whitespace clean
Eloy Lafuente (stronk7) [Mon, 27 Dec 2010 14:56:58 +0000 (15:56 +0100)]
MDL-25341 blogs import - minor whitespace clean

10 years agoMerge branch 'blog_MDL-25341_entry_sync' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 27 Dec 2010 14:55:14 +0000 (15:55 +0100)]
Merge branch 'blog_MDL-25341_entry_sync' of git://github.com/andyjdavis/moodle

10 years agoMerge branch 'MDL-25596' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 27 Dec 2010 12:51:25 +0000 (13:51 +0100)]
Merge branch 'MDL-25596' of git://github.com/samhemelryk/moodle

10 years agoMDL-22449 bumping major version to lang invalidate caches and fix phpdocs
Petr Skoda [Mon, 27 Dec 2010 12:46:37 +0000 (13:46 +0100)]
MDL-22449 bumping major version to lang invalidate caches and fix phpdocs

10 years agoMerge branch 'm20_MDL-22449_wiki_help_buttons' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 27 Dec 2010 12:44:54 +0000 (13:44 +0100)]
Merge branch 'm20_MDL-22449_wiki_help_buttons' of git://github.com/dongsheng/moodle

10 years agoMerge branch 'MDL-24860_messaging_providers' of git://github.com/andyjdavis/moodle
Petr Skoda [Mon, 27 Dec 2010 12:39:20 +0000 (13:39 +0100)]
Merge branch 'MDL-24860_messaging_providers' of git://github.com/andyjdavis/moodle

Conflicts:
mod/lesson/version.php

10 years agoMerge branch 'MDL-25321-R1' of git://github.com/samhemelryk/moodle
Petr Skoda [Mon, 27 Dec 2010 11:46:01 +0000 (12:46 +0100)]
Merge branch 'MDL-25321-R1' of git://github.com/samhemelryk/moodle

10 years agoMerge branch 'MDL-25749' of git://github.com/stronk7/moodle
Petr Skoda [Mon, 27 Dec 2010 11:41:29 +0000 (12:41 +0100)]
Merge branch 'MDL-25749' of git://github.com/stronk7/moodle

10 years agoMDL-25682 bumping major version to invalidate JS caches
Petr Skoda [Mon, 27 Dec 2010 11:39:40 +0000 (12:39 +0100)]
MDL-25682 bumping major version to invalidate JS caches