Petr Skoda [Mon, 21 Mar 2011 13:49:18 +0000 (14:49 +0100)]
Merge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle
Petr Skoda [Mon, 21 Mar 2011 13:46:59 +0000 (14:46 +0100)]
Merge branch 's8_MDL-26919_search_dialog_event' of git://github.com/dongsheng/moodle
Petr Skoda [Mon, 21 Mar 2011 13:03:33 +0000 (14:03 +0100)]
Merge branch 'wip-MDL-26822'
Petr Skoda [Mon, 21 Mar 2011 13:02:50 +0000 (14:02 +0100)]
MDL-26822 fix whitespace
Dongsheng Cai [Mon, 21 Mar 2011 12:56:36 +0000 (20:56 +0800)]
Fix three minor filepicker bugs: 1. use language string in search dialog instead of hard code filepicker MDL-26915 2. search dialog now response to enter key MDL-26919 3. search dialog should be modal mode MDL-26918
Sam Hemelryk [Mon, 21 Mar 2011 09:32:06 +0000 (17:32 +0800)]
Merge branch 'MDL-26557' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 21 Mar 2011 09:23:13 +0000 (17:23 +0800)]
Merge branch 'MDL-26827' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 21 Mar 2011 09:19:06 +0000 (17:19 +0800)]
Merge branch 'w12_MDL-26904_20_PHPLOL' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 09:13:20 +0000 (17:13 +0800)]
Merged PULL-496/MDL-26859 and fixed incorrect defines
Sam Hemelryk [Mon, 21 Mar 2011 08:50:07 +0000 (16:50 +0800)]
Merge branch 'w12_MDL-26876_20_blogformat' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 07:58:19 +0000 (15:58 +0800)]
Merged PULL-480/MDL-24877 and bumped version number to fix conflict
Sam Hemelryk [Mon, 21 Mar 2011 07:47:36 +0000 (15:47 +0800)]
Merge branch 'w12_MDL-26808_20_enrolpageurl' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 06:27:45 +0000 (14:27 +0800)]
Merge branch 'w12_MDL-26826_20_youtubedim' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 06:16:51 +0000 (14:16 +0800)]
Merge branch 'w12_MDL-26726_20_typocat' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 06:10:44 +0000 (14:10 +0800)]
Merge branch 'w12_MDL-26825_20_cancelform' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 05:37:36 +0000 (13:37 +0800)]
Merge branch 'w12_MDL-26837_20_algebra' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 05:30:59 +0000 (13:30 +0800)]
Merge branch 'w12_MDL-26834_20_inactiveparticipants' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 04:36:47 +0000 (12:36 +0800)]
Merge branch 'w12_MDL-26833_20_inactiveforum' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 04:28:45 +0000 (12:28 +0800)]
Merge branch 'w12_MDL-26803_20_userupload' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 04:22:23 +0000 (12:22 +0800)]
Merge branch 'w12_MDL-26842_20_ociparams' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 21 Mar 2011 03:54:20 +0000 (11:54 +0800)]
Merge branch 'MDL-26607_search_error' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 21 Mar 2011 03:16:50 +0000 (11:16 +0800)]
Merged MDL-25565 PULL-451 and fixed conflicts
Petr Skoda [Sun, 20 Mar 2011 18:25:47 +0000 (19:25 +0100)]
MDL-26904 fix funny constant typo
Petr Skoda [Sun, 20 Mar 2011 12:34:51 +0000 (13:34 +0100)]
MDL-26859 improve blog access control and prevent unnecessary blog includes
Petr Skoda [Sun, 20 Mar 2011 11:34:41 +0000 (12:34 +0100)]
MDL-26859 do not show "my blog" link to guests and not-logged-in users
Petr Skoda [Sun, 20 Mar 2011 11:29:22 +0000 (12:29 +0100)]
MDL-26859 improve coding style in blog related blocks
Petr Skoda [Sun, 20 Mar 2011 11:28:34 +0000 (12:28 +0100)]
MDL-26859 automatically enable and disable blog related blocks when bloglevel changed
Petr Skoda [Sun, 20 Mar 2011 10:03:16 +0000 (11:03 +0100)]
MDL-26808 solve chicken-egg problem with moodle url on the user enrolments page
Petr Skoda [Sun, 20 Mar 2011 07:28:46 +0000 (08:28 +0100)]
MDL-26876 use correct blog post format when migrating to forum posts
Eloy Lafuente (stronk7) [Fri, 18 Mar 2011 13:40:20 +0000 (14:40 +0100)]
MDL-26883 ddl - fix some function declarations
Petr Skoda [Thu, 17 Mar 2011 21:13:07 +0000 (22:13 +0100)]
MDL-26826 add resizing of youtube and vimeo and remove non-functional % embedding sizes, only pixel sizes work in object tags
Petr Skoda [Thu, 17 Mar 2011 20:34:34 +0000 (21:34 +0100)]
MDL-26726 fix whitespace and a few debug and comment typos
Petr Skoda [Thu, 17 Mar 2011 19:43:35 +0000 (20:43 +0100)]
MDL-26825 do not return any form data if form cancelled
Petr Skoda [Thu, 17 Mar 2011 14:36:21 +0000 (15:36 +0100)]
MDL-26837 remove blacklisted markup from algebra conversion
Petr Skoda [Wed, 16 Mar 2011 22:03:55 +0000 (23:03 +0100)]
MDL-26833 send forum notifications to active enrolled users only
Petr Skoda [Wed, 16 Mar 2011 21:10:12 +0000 (22:10 +0100)]
MDL-26834 remove suspended users from the participants list
Petr Skoda [Wed, 16 Mar 2011 19:00:06 +0000 (20:00 +0100)]
MDL-26803 fix switched values of autosubscribe defaults in user upload
Petr Skoda [Wed, 16 Mar 2011 18:59:33 +0000 (19:59 +0100)]
MDL-26803 add missing forcing of password reset when new password created in cron
Petr Skoda [Wed, 16 Mar 2011 13:58:41 +0000 (14:58 +0100)]
MDL-26842 make sure query parameter names are not reserved words in oracle driver
Andrew Robert Nicols [Wed, 16 Mar 2011 10:33:16 +0000 (10:33 +0000)]
formslib: MDL-26557 Use correct variable name and specify defaults in function declaration
Signed-off-by: Andrew Robert Nicols <andrew.nicols@luns.net.uk>
Dan Poltawski [Tue, 15 Mar 2011 12:25:58 +0000 (12:25 +0000)]
blocks admin MDL-26827- allow blocks settings to be an admin externalpage
This borrows from Tim's technique for qtypes in
1650a33cb
Petr Skoda [Wed, 16 Mar 2011 08:35:33 +0000 (09:35 +0100)]
weekly release
Andrew Davis (andyjdavis) [Wed, 16 Mar 2011 02:58:07 +0000 (10:58 +0800)]
message MDL-26607 fixed sql error when searching for users and limiting search to your courses
Andrew Davis (andyjdavis) [Mon, 14 Mar 2011 09:01:54 +0000 (17:01 +0800)]
lesson MDL-26768 lesson was inserting a grade of 0 when a user id and a null raw grade were supplied
Eloy Lafuente (stronk7) [Tue, 15 Mar 2011 14:33:36 +0000 (15:33 +0100)]
MDL-26697 take out unused vars from formal white
Eloy Lafuente (stronk7) [Tue, 15 Mar 2011 14:21:02 +0000 (15:21 +0100)]
Merge branch 'w11_MDL-26697_20_media' of git://github.com/skodak/moodle
Conflicts:
theme/formal_white/config.php
Jerome Mouneyrac [Tue, 15 Mar 2011 09:27:27 +0000 (17:27 +0800)]
MDL-26822 enrol_user now save the status + trivial typo change in a (bit) related file
Mary Evans [Tue, 15 Mar 2011 01:34:40 +0000 (01:34 +0000)]
Fix for MDL-25565
Petr Skoda [Mon, 14 Mar 2011 19:55:04 +0000 (20:55 +0100)]
Merge branch 'MDL-26464_m20_v2' of github.com:skodak/moodle
Petr Skoda [Mon, 14 Mar 2011 19:47:45 +0000 (20:47 +0100)]
MDL-26464 improve coding style and fix phpdocs
Petr Skoda [Mon, 14 Mar 2011 17:21:33 +0000 (18:21 +0100)]
Merge branch 'MDL-26228_grade_full_view2' of git://github.com/andyjdavis/moodle
Petr Skoda [Mon, 14 Mar 2011 17:18:24 +0000 (18:18 +0100)]
Merge branch 'MDL-24724_course_profile' of git://github.com/andyjdavis/moodle
Petr Skoda [Mon, 14 Mar 2011 17:11:09 +0000 (18:11 +0100)]
PULL-400 fix incorrect format_white theme file permissions from recent commits
Petr Skoda [Mon, 14 Mar 2011 17:01:19 +0000 (18:01 +0100)]
Merge branch 'MDL-4633_m20' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 11:07:41 +0000 (12:07 +0100)]
Merge branch 'MDL-26767' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 11:03:36 +0000 (12:03 +0100)]
Merge branch 'MDL-22478-alternative-langcacheroot' of git://github.com/mudrd8mz/moodle
Dan Marsden [Mon, 14 Mar 2011 10:44:14 +0000 (11:44 +0100)]
MDL-21432 backup - add plagiarism plugin hooks for course and module
Sam Hemelryk [Mon, 14 Mar 2011 10:02:18 +0000 (18:02 +0800)]
Merge rebased branch 'formal_white_2011030507' of git://github.com/kordan/moodle.git
Sam Hemelryk [Mon, 14 Mar 2011 09:59:57 +0000 (17:59 +0800)]
theme-formal_white MDL-26300, MDL-25628 , MDL-25520 Fixed whitespace and nesting issues
kordan [Sat, 12 Mar 2011 19:46:05 +0000 (20:46 +0100)]
theme-formal_white MDL-26789 Fixed up vertical centering in navbar
kordan [Thu, 10 Mar 2011 13:34:02 +0000 (14:34 +0100)]
theme-formal_white MDL-26300, MDL-25628 , MDL-25520 fixed problems in admin report section pages
kordan [Mon, 7 Mar 2011 14:29:08 +0000 (15:29 +0100)]
theme-formal_white MDL-26300, MDL-25628 , MDL-25520 one more setting and logos with transparent background to allow custom header background color
kordan [Sun, 6 Mar 2011 16:31:32 +0000 (17:31 +0100)]
formal white from scratch fixing MDL-26300, MDL-25628 , MDL-25520
Kordan [Mon, 24 Jan 2011 17:52:56 +0000 (18:52 +0100)]
theme-formal_white MDL-26300, MDL-25628 , MDL-25520 FW last version
Dongsheng Cai [Mon, 14 Mar 2011 09:04:06 +0000 (17:04 +0800)]
MDL-24877, do not display all courses in course category tree if there are too many courses in moodle
Sam Hemelryk [Mon, 14 Mar 2011 08:05:37 +0000 (16:05 +0800)]
Merge branch 's7_MDL-26583_filepicker_lang' of git://github.com/dongsheng/moodle
Sam Hemelryk [Mon, 14 Mar 2011 07:41:51 +0000 (15:41 +0800)]
Merge branch 'w11_MDL-26480_20_redirect' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 14 Mar 2011 07:33:49 +0000 (15:33 +0800)]
Merge branch 'MDL-13983' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 14 Mar 2011 03:22:05 +0000 (11:22 +0800)]
Merge branch 'MDL-26785' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 14 Mar 2011 02:59:58 +0000 (10:59 +0800)]
Fixed merge conflicts in nonzero theme
Sam Hemelryk [Mon, 14 Mar 2011 02:54:24 +0000 (10:54 +0800)]
Merge branch 'MDL-25304' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 14 Mar 2011 02:43:42 +0000 (10:43 +0800)]
Merge branch 'MDL-25786-2' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 14 Mar 2011 02:36:17 +0000 (10:36 +0800)]
Merge branch 'MDL-25212' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 14 Mar 2011 02:33:17 +0000 (10:33 +0800)]
Merge branch 'MDL-25939-3' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 14 Mar 2011 02:19:52 +0000 (10:19 +0800)]
Merge branch 'MDL-26084' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 14 Mar 2011 01:57:55 +0000 (09:57 +0800)]
Merge branch 'MDL-24743' of git://github.com/epsd/moodle
Sam Hemelryk [Mon, 14 Mar 2011 01:51:27 +0000 (09:51 +0800)]
Merge branch 'MDL-26711' of git://github.com/epsd/moodle
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 01:12:46 +0000 (02:12 +0100)]
Merge branch 'w11_MDL-26698_20_helphttps' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 00:57:08 +0000 (01:57 +0100)]
Merge branch 'MDL-26643' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 00:53:29 +0000 (01:53 +0100)]
Merge branch 'w11_MDL-24071_20_tex' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 00:26:22 +0000 (01:26 +0100)]
Merge branch 'w11_MDL-26634_20_ldapsep' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 00:22:10 +0000 (01:22 +0100)]
Merge branch 's7_MDL-9376_qaforum' of git://github.com/dongsheng/moodle
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 00:12:38 +0000 (01:12 +0100)]
MDL-25352 fix tiny typo
Eloy Lafuente (stronk7) [Mon, 14 Mar 2011 00:10:35 +0000 (01:10 +0100)]
Merge branch 'w11_MDL-25352_20_replace' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 23:54:36 +0000 (00:54 +0100)]
Merge branch 'MDL-26594' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 23:53:28 +0000 (00:53 +0100)]
Merge branch 'MDL-26748' of git://github.com/timhunt/moodle
Petr Skoda [Sun, 13 Mar 2011 23:51:42 +0000 (00:51 +0100)]
MDL-25352 fix multiple issues in admin/replace.php
Make sure admins know things can go wrong, MSSQL and Oracle were never working, fix block_html config saving issue, skip a lot more tables because the data there is serialised() or can not be changed in case of config tables, more warnings and checkbox confirmation.
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 23:49:11 +0000 (00:49 +0100)]
Merge branch 'MDL-26773' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 23:43:58 +0000 (00:43 +0100)]
Merge branch 'MDL-26714' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 23:35:03 +0000 (00:35 +0100)]
Merge branch 'MDL-19555_m20' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 23:32:01 +0000 (00:32 +0100)]
Merge branch 'AMOS-install-strings' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 23:25:04 +0000 (00:25 +0100)]
Merge branch 'w11_MDL-26621_20_profilemail' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 22:50:20 +0000 (23:50 +0100)]
Merge branch 'MDL-26730' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 22:41:48 +0000 (23:41 +0100)]
Merge branch 'MDL-26735' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 22:33:09 +0000 (23:33 +0100)]
Merge branch 'MDL-26734' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 22:31:05 +0000 (23:31 +0100)]
Merge branch 'MDL-21446' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 22:28:07 +0000 (23:28 +0100)]
Merge branch 'MDL-26733' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 22:22:04 +0000 (23:22 +0100)]
Merge branch 'wip-MDL-26606' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Sun, 13 Mar 2011 21:57:06 +0000 (22:57 +0100)]
Merge branch 'MDL-26724' of git://github.com/timhunt/moodle
AMOS bot [Sun, 13 Mar 2011 18:36:56 +0000 (19:36 +0100)]
Automatic installer lang files (
20110313)
