Aparup Banerjee [Mon, 12 Dec 2011 06:36:59 +0000 (14:36 +0800)]
Merge branch 'w51_MDL-30613_m23_FULLME' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 04:57:00 +0000 (17:57 +1300)]
Merge branch 'w51_MDL-29117_m23_enrolnewcourse' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 04:40:47 +0000 (17:40 +1300)]
Merge branch 'w51_MDL-30292_m23_health' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 04:37:27 +0000 (17:37 +1300)]
Merge branch 'w51_MDL-30364_m23_report' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 04:29:11 +0000 (17:29 +1300)]
Merge branch 'w51_MDL-30415_m23_yui2rollups' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 04:24:14 +0000 (17:24 +1300)]
Merge branch 'w51_MDL-30502_m23_ldapenrol' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 04:10:58 +0000 (17:10 +1300)]
Merge branch 'w51_MDL-30588_m23_switchrole' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 03:36:51 +0000 (16:36 +1300)]
Merge branch 'w51_MDL-30659_m23_yuidebug' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 03:10:05 +0000 (16:10 +1300)]
Merge branch 'w51_MDL-30687_m23_ldapnewcourse' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 12 Dec 2011 02:12:42 +0000 (15:12 +1300)]
Merge branch 'MDL-29942' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 12 Dec 2011 01:54:35 +0000 (14:54 +1300)]
Merge branch 'MDL-28180' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 12 Dec 2011 00:54:48 +0000 (13:54 +1300)]
Merge branch 'MDL-30198-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 12 Dec 2011 00:50:42 +0000 (13:50 +1300)]
Merge branch 'MDL-29195-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Sun, 11 Dec 2011 22:03:51 +0000 (23:03 +0100)]
MDL-28180 backup - on restore always prevent completion_aggr_methd dupes
This covers the last case where dupes could be happening in the
completion_aggr_methd table: Restoring one complete course into
an existing one, adding information. Now we always check if the
aggr_method exists before inserting it.
Eloy Lafuente (stronk7) [Sun, 11 Dec 2011 21:14:02 +0000 (22:14 +0100)]
MDL-28180 backup - take rid of dupes in course_completion_aggr_methd
Conflicts:
version.php
Eloy Lafuente (stronk7) [Sun, 11 Dec 2011 20:37:33 +0000 (21:37 +0100)]
MDL-28180 backup - set excluded activities for any non-course operation
Petr Skoda [Sun, 11 Dec 2011 10:06:29 +0000 (11:06 +0100)]
MDL-30687 use course defaults when template not set in ldap enrol
Petr Skoda [Sun, 11 Dec 2011 09:57:44 +0000 (10:57 +0100)]
MDL-29117 use default course settings when template not set in db enrol
Petr Skoda [Sat, 10 Dec 2011 19:33:51 +0000 (20:33 +0100)]
MDL-30292 rework trailing whitespace test
Now compatible with zlib compression.
Petr Skoda [Sat, 10 Dec 2011 19:18:44 +0000 (20:18 +0100)]
MDL-30364 fix user report regressions
Petr Skoda [Sat, 10 Dec 2011 18:11:58 +0000 (19:11 +0100)]
MDL-30415 prevent yui2 rollups in debug mode
Petr Skoda [Sat, 10 Dec 2011 17:34:08 +0000 (18:34 +0100)]
MDL-30502 remove bogus role name param
Credit goes to Michael J Litzkow.
Petr Skoda [Sat, 10 Dec 2011 12:46:15 +0000 (13:46 +0100)]
MDL-30659 fix use of yui filters
Petr Skoda [Sat, 10 Dec 2011 12:16:18 +0000 (13:16 +0100)]
MDL-30659 fix phpdocs problems
Petr Skoda [Sat, 10 Dec 2011 11:44:32 +0000 (12:44 +0100)]
DML-30588 do not require enrollment after switching of roles
Petr Skoda [Fri, 9 Dec 2011 20:26:36 +0000 (21:26 +0100)]
MDL-30613 use standard https checks
Eloy Lafuente (stronk7) [Fri, 9 Dec 2011 15:25:08 +0000 (16:25 +0100)]
weekly release 2.3dev (on-sync version 22_STABLE)
Eloy Lafuente (stronk7) [Fri, 9 Dec 2011 15:09:10 +0000 (16:09 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Tim Hunt [Fri, 9 Dec 2011 11:31:47 +0000 (11:31 +0000)]
MDL-30660 javascript-static: another yui3/ticket/
2531561 work-around.
Eloy Lafuente (stronk7) [Fri, 9 Dec 2011 09:57:18 +0000 (10:57 +0100)]
Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
Aparup Banerjee [Fri, 9 Dec 2011 07:48:54 +0000 (15:48 +0800)]
MDL-30542 simple string improvement.
Petr Skoda [Fri, 9 Dec 2011 08:04:43 +0000 (09:04 +0100)]
MDL-30625 fail gracefully when admins not defined
Mitsuhiro [Fri, 9 Dec 2011 04:31:33 +0000 (10:01 +0530)]
MDL-30198 Glossary Changing string during imports
Aparup Banerjee [Fri, 9 Dec 2011 03:07:20 +0000 (11:07 +0800)]
Merge branch 'w50_MDL-27364_m23_recaptchahttps' of git://github.com/skodak/moodle
Aparup Banerjee [Fri, 9 Dec 2011 02:46:23 +0000 (10:46 +0800)]
Merge branch 'MDL-30558' of git://github.com/timhunt/moodle
Aparup Banerjee [Fri, 9 Dec 2011 02:19:22 +0000 (10:19 +0800)]
Merge branch 'master_MDL-26974' of git://github.com/danmarsden/moodle
Aparup Banerjee [Fri, 9 Dec 2011 02:13:22 +0000 (10:13 +0800)]
Merge branch 'master_MDL-30579' of git://github.com/mayankgupta/moodle
Tim Hunt [Thu, 8 Dec 2011 18:08:17 +0000 (18:08 +0000)]
MDL-27314 quiz reports: fix JS confirmation before deleting attempts.
Eloy Lafuente (stronk7) [Fri, 9 Dec 2011 01:01:02 +0000 (02:01 +0100)]
MDL-30604 Added 2 missing messages andd deleting an incorrect one
Aparup Banerjee [Thu, 8 Dec 2011 03:59:01 +0000 (11:59 +0800)]
MDL-30604 Added upgrade lines to upgrade.php(s)
Eloy Lafuente (stronk7) [Thu, 8 Dec 2011 23:11:01 +0000 (00:11 +0100)]
Merge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
Sam Hemelryk [Thu, 8 Dec 2011 22:43:41 +0000 (11:43 +1300)]
Merge branch 'MDL-30660' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Thu, 8 Dec 2011 22:36:49 +0000 (23:36 +0100)]
Merge branch 'MDL-29579' of git://github.com/timhunt/moodle
Tim Hunt [Thu, 8 Dec 2011 17:50:11 +0000 (17:50 +0000)]
MDL-30660 javascript-static: M.util.show_confirm_dialog fixes
Andrew Robert Nicols [Thu, 8 Dec 2011 12:07:50 +0000 (12:07 +0000)]
MDL-29195 Remove duplicate Participants -> Notes from navbar
Aparup Banerjee [Thu, 8 Dec 2011 09:00:37 +0000 (17:00 +0800)]
Merge branch 'master_MDL-30028' of git://github.com/danmarsden/moodle
Aparup Banerjee [Thu, 8 Dec 2011 08:04:30 +0000 (16:04 +0800)]
Merge branch 'wip-MDL-30336-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Thu, 8 Dec 2011 07:51:27 +0000 (15:51 +0800)]
Merge branch 'wip-mdl-30560' of git://github.com/rajeshtaneja/moodle
Jerome Mouneyrac [Thu, 8 Dec 2011 06:40:57 +0000 (14:40 +0800)]
MDL-29942 trigger user events in web service calls
Aparup Banerjee [Thu, 8 Dec 2011 06:19:46 +0000 (14:19 +0800)]
Merge branch 'MDL-30350-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Thu, 8 Dec 2011 05:56:51 +0000 (13:56 +0800)]
Merge branch 'MDL-27432_gd_error' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Thu, 8 Dec 2011 05:43:55 +0000 (13:43 +0800)]
Merge branch 'MDL-28710_rating_classes' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Thu, 8 Dec 2011 05:38:54 +0000 (13:38 +0800)]
Merge branch 'MDL-30607_override_email' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Thu, 8 Dec 2011 03:05:26 +0000 (16:05 +1300)]
Merge branch 'MDL-30518' of git://github.com/mackensen/moodle
Sam Hemelryk [Thu, 8 Dec 2011 02:50:42 +0000 (15:50 +1300)]
Merge branch 'w50_MDL-30528_m23_enrolroleid' of git://github.com/skodak/moodle
Sam Hemelryk [Thu, 8 Dec 2011 00:49:39 +0000 (13:49 +1300)]
Merge branch 'w50_MDL-30623_m23_guest' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 8 Dec 2011 00:36:44 +0000 (01:36 +0100)]
Merge branch 'wip-MDL-30582-master' of git://github.com/samhemelryk/moodle
AMOS bot [Thu, 8 Dec 2011 00:31:13 +0000 (00:31 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 7 Dec 2011 23:58:42 +0000 (00:58 +0100)]
Merge branch 'MDL-26522_user_report_menu' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Wed, 7 Dec 2011 23:45:15 +0000 (00:45 +0100)]
Merge branch 'MDL-27314' of git://github.com/timhunt/moodle
Sam Hemelryk [Wed, 7 Dec 2011 23:41:21 +0000 (12:41 +1300)]
Merge branch 'MDL-29712' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Wed, 7 Dec 2011 23:39:25 +0000 (00:39 +0100)]
Merge branch 'wip-MDL-30222-m23' of git://github.com/samhemelryk/moodle
Sam Hemelryk [Wed, 7 Dec 2011 21:44:47 +0000 (10:44 +1300)]
Merge branch 'master_MDL-30211' of git://github.com/danmarsden/moodle
Sam Hemelryk [Wed, 7 Dec 2011 21:39:02 +0000 (10:39 +1300)]
Merge branch 'master_MDL-30536' of git://github.com/danmarsden/moodle
Sam Hemelryk [Wed, 7 Dec 2011 21:22:34 +0000 (10:22 +1300)]
Merge branch 'MDL-28282-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Wed, 7 Dec 2011 21:19:53 +0000 (10:19 +1300)]
Merge branch 'MDL28588' of git://github.com/ankitagarwal/moodle
Petr Skoda [Wed, 7 Dec 2011 10:18:10 +0000 (11:18 +0100)]
MDL-30625 full support for main admin
Petr Skoda [Wed, 7 Dec 2011 08:13:34 +0000 (09:13 +0100)]
MDL-30623 fix null guest passwords in existing 2.2 sites
Petr Skoda [Wed, 7 Dec 2011 07:58:18 +0000 (08:58 +0100)]
MDL-30623 make sure guest password field is not null
Rajesh Taneja [Wed, 7 Dec 2011 03:56:34 +0000 (11:56 +0800)]
MDL-30560 Forms Lib: 'type' key for repeat_elements is restored
Sam Hemelryk [Wed, 7 Dec 2011 01:20:48 +0000 (14:20 +1300)]
Merge branch 'wip-MDL-19147-master' of git://github.com/abgreeve/moodle
AMOS bot [Wed, 7 Dec 2011 00:31:14 +0000 (00:31 +0000)]
Automatically generated installer lang files
Petr Skoda [Tue, 6 Dec 2011 10:44:13 +0000 (11:44 +0100)]
MDL-27364 use https for recaptcha when site runs via https
Based on solution by Rajesh Taneja.
adrian@moodle.com [Mon, 5 Dec 2011 06:59:31 +0000 (14:59 +0800)]
MDL-30336 - login - Added a setting in security that allows auto complete to be set to off in password fields.
Petr Skoda [Sat, 3 Dec 2011 07:48:09 +0000 (08:48 +0100)]
MDL-30528 stop recreating role_assignments on every login attempt for each user
Credit goes to Luis Gustavo Mueller de Alcantara.
Ankit Kumar Agarwal [Thu, 11 Aug 2011 09:36:38 +0000 (15:06 +0530)]
MDL-28588 Removing IN from SQL statments
Andrew Davis [Tue, 6 Dec 2011 03:09:14 +0000 (11:09 +0800)]
MDL-30607 message: removed an if condition that prevented you from clearing an overrident email address
Ankit Kumar Agarwal [Mon, 5 Dec 2011 06:00:52 +0000 (11:30 +0530)]
MDL-28282 Scorm Restorting Groups support in Scomr reports
Sam Hemelryk [Tue, 6 Dec 2011 00:32:59 +0000 (13:32 +1300)]
MDL-30582 navigation: Fixed regression in generation of front page modules
Sam Hemelryk [Thu, 1 Dec 2011 23:14:33 +0000 (12:14 +1300)]
MDL-30222 Fixed home page redirection madness. Thank you Julien Boulen for providing the solution
AMOS bot [Mon, 5 Dec 2011 17:36:36 +0000 (18:36 +0100)]
Automatically generated installer lang files
AMOS bot [Mon, 5 Dec 2011 17:19:29 +0000 (18:19 +0100)]
Automatically generated installer lang files
Tim Hunt [Mon, 5 Dec 2011 15:39:55 +0000 (15:39 +0000)]
MDL-29579 quiz statistics, include qtext in full XHTML export.
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 11:16:32 +0000 (12:16 +0100)]
weekly release 2.3dev
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 11:09:08 +0000 (12:09 +0100)]
Moodle release 2.2
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 10:55:06 +0000 (11:55 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 09:57:53 +0000 (10:57 +0100)]
Merge branch 'MDL-30340-sticky-blocks_simplify_frontpage_ui' of git://github.com/stronk7/moodle
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 09:55:06 +0000 (10:55 +0100)]
Merge branch 'MDL-30340.sticky_category_blocks' of git://github.com/stronk7/moodle
Martin Dougiamas [Mon, 5 Dec 2011 09:28:54 +0000 (10:28 +0100)]
MDL-30340 blocks - fix/restrict frontpage dark magic application
It seems that there are some overlapping constants in the blocks
subsystem that were causing some code, initially planned only
to frontpage, to be executed in other contexts. This commit moves
the bui_editingatfrontpage condition as root condition.
Dan Marsden [Mon, 5 Dec 2011 08:38:27 +0000 (21:38 +1300)]
MDL-26974 - add extra logging information all the time - not just when debugging is on.
Andrew Davis [Mon, 5 Dec 2011 06:57:36 +0000 (14:57 +0800)]
MDL-28710 rating: added some more classes to the html for entering ratings
AMOS bot [Mon, 5 Dec 2011 00:30:55 +0000 (00:30 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 00:14:19 +0000 (01:14 +0100)]
MDL-30340 blocks - incorrect option in user profile template and missing lang string in my template
Eloy Lafuente (stronk7) [Sun, 4 Dec 2011 23:48:08 +0000 (00:48 +0100)]
MDL-30340 blocks - hide some redundant pagetypepattern options at front page
The dual front-page/system-wide form to edit blocks can
be reduced asuming that, always:
A) system sets the context to system,
recursively and with page-type set to "*"
B) frontpage only sets the context to site-course,
non-recursively and with page-type set to "site-index"
C) frontpage all added sets the context to site-course,
recursively and with paget-type set to "*"
And that is the change that this patch provides, by:
1) detecting properly if we are editing blocks @ protpage
2) passing that information to the form data processor
3) setting parentcontextid, showinsubcontexts and
pagetypepattern following the A, B, C immutables above.
Finally, and affecting some other system-wide pages, there
are cases (my, user templates...) having only one possible
pagetypepattern, and it looks badly if the page has subpages, so
for those system-wide cases we are showing exceptionaly the
pagetypepattern statically. This will be revisited once MDL-30574
is decided and implemented, although perhaps it's ok to leave it
as default to places with only one pagetypepattern available.
Mayank Gupa [Sun, 4 Dec 2011 23:47:40 +0000 (05:17 +0530)]
MDL-30579, fixing Data Model Elements are being initialized with an empty string
David Mudrak [Sat, 3 Dec 2011 13:11:26 +0000 (14:11 +0100)]
MDL-30340 Block stickiness computation improvements
This is an attempt to clean up and fix the computation of the block
stickiness. At first, the page pattern can't be ignored because the user
may want to currently try to limit the page pattern. Second, the
site-index pattern can be forced only if the user selected 'Front page
only' as the page context.
David Mudrak [Sat, 3 Dec 2011 13:08:52 +0000 (14:08 +0100)]
MDL-30340 Always generate pagetype patterns in the block settings form
This is an alternative solution to MDL-27812. If the current block
instance has page type set to site-index, we need to provide a way how
that page type pattern can be reset back to other value.
David Mudrak [Sat, 3 Dec 2011 13:07:44 +0000 (14:07 +0100)]
MDL-30340 Trivial change in PHP doc block - the function does not accept any params
Eloy Lafuente (stronk7) [Sat, 3 Dec 2011 14:36:00 +0000 (15:36 +0100)]
MDL-30340 blocks - add back 'any page' support to course cats
Added the * option that is not affected by the 'varying-pagetype'
problem that has been detected and issued @ MDL-30564. So now, it's
(back) possible to define coursecat blocks to be spread over children
coursecats/courses/modules (contexts).
Eloy Lafuente (stronk7) [Sat, 3 Dec 2011 11:30:49 +0000 (12:30 +0100)]
Merge branch 'w49_MDL-30538_m22_versions' of git://github.com/skodak/moodle