moodle.git
9 years agoAutomatically generated installer lang files
AMOS bot [Sun, 18 Dec 2011 00:31:14 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoAutomatically generated installer lang files
AMOS bot [Fri, 16 Dec 2011 00:31:14 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoAutomatically generated installer lang files
AMOS bot [Sat, 10 Dec 2011 00:31:20 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoweekly release 2.3dev (on-sync version 22_STABLE)
Eloy Lafuente (stronk7) [Fri, 9 Dec 2011 15:25:08 +0000 (16:25 +0100)]
weekly release 2.3dev (on-sync version 22_STABLE)

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 9 Dec 2011 15:09:10 +0000 (16:09 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-30660 javascript-static: another yui3/ticket/2531561 work-around.
Tim Hunt [Fri, 9 Dec 2011 11:31:47 +0000 (11:31 +0000)]
MDL-30660 javascript-static: another yui3/ticket/2531561 work-around.

9 years agoMerge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
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

9 years agoMDL-30542 simple string improvement.
Aparup Banerjee [Fri, 9 Dec 2011 07:48:54 +0000 (15:48 +0800)]
MDL-30542 simple string improvement.

9 years agoMDL-30625 fail gracefully when admins not defined
Petr Skoda [Fri, 9 Dec 2011 08:04:43 +0000 (09:04 +0100)]
MDL-30625 fail gracefully when admins not defined

9 years agoMerge branch 'w50_MDL-27364_m23_recaptchahttps' of git://github.com/skodak/moodle
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

9 years agoMerge branch 'MDL-30558' of git://github.com/timhunt/moodle
Aparup Banerjee [Fri, 9 Dec 2011 02:46:23 +0000 (10:46 +0800)]
Merge branch 'MDL-30558' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-26974' of git://github.com/danmarsden/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

9 years agoMerge branch 'master_MDL-30579' of git://github.com/mayankgupta/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

9 years agoMDL-27314 quiz reports: fix JS confirmation before deleting attempts.
Tim Hunt [Thu, 8 Dec 2011 18:08:17 +0000 (18:08 +0000)]
MDL-27314 quiz reports: fix JS confirmation before deleting attempts.

9 years agoMDL-30604 Added 2 missing messages andd deleting an incorrect one
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

9 years agoMDL-30604 Added upgrade lines to upgrade.php(s)
Aparup Banerjee [Thu, 8 Dec 2011 03:59:01 +0000 (11:59 +0800)]
MDL-30604 Added upgrade lines to upgrade.php(s)

9 years agoMerge branch 'w50_MDL-30625_m23_adminorder' of git://github.com/skodak/moodle
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

9 years agoMerge branch 'MDL-30660' of git://github.com/timhunt/moodle
Sam Hemelryk [Thu, 8 Dec 2011 22:43:41 +0000 (11:43 +1300)]
Merge branch 'MDL-30660' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-29579' 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

9 years agoMDL-30660 javascript-static: M.util.show_confirm_dialog fixes
Tim Hunt [Thu, 8 Dec 2011 17:50:11 +0000 (17:50 +0000)]
MDL-30660 javascript-static: M.util.show_confirm_dialog fixes

9 years agoMerge branch 'master_MDL-30028' of git://github.com/danmarsden/moodle
Aparup Banerjee [Thu, 8 Dec 2011 09:00:37 +0000 (17:00 +0800)]
Merge branch 'master_MDL-30028' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'wip-MDL-30336-master' of git://github.com/abgreeve/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

9 years agoMerge branch 'wip-mdl-30560' of git://github.com/rajeshtaneja/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

9 years agoMerge branch 'MDL-30350-master-1' of git://git.luns.net.uk/moodle
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

9 years agoMerge branch 'MDL-27432_gd_error' of git://github.com/andyjdavis/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

9 years agoMerge branch 'MDL-28710_rating_classes' 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

9 years agoMerge branch 'MDL-30607_override_email' 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

9 years agoMerge branch 'MDL-30518' of git://github.com/mackensen/moodle
Sam Hemelryk [Thu, 8 Dec 2011 03:05:26 +0000 (16:05 +1300)]
Merge branch 'MDL-30518' of git://github.com/mackensen/moodle

9 years agoMerge branch 'w50_MDL-30528_m23_enrolroleid' of git://github.com/skodak/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

9 years agoMerge branch 'w50_MDL-30623_m23_guest' 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

9 years agoMerge branch 'wip-MDL-30582-master' of git://github.com/samhemelryk/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

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 8 Dec 2011 00:31:13 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMerge branch 'MDL-26522_user_report_menu' of git://github.com/andyjdavis/moodle
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

9 years agoMerge branch 'MDL-27314' of git://github.com/timhunt/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

9 years agoMerge branch 'MDL-29712' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Wed, 7 Dec 2011 23:41:21 +0000 (12:41 +1300)]
Merge branch 'MDL-29712' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'wip-MDL-30222-m23' of git://github.com/samhemelryk/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

9 years agoMerge branch 'master_MDL-30211' of git://github.com/danmarsden/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

9 years agoMerge branch 'master_MDL-30536' 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

9 years agoMerge branch 'MDL-28282-master' of git://github.com/ankitagarwal/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

9 years agoMerge branch 'MDL28588' 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

9 years agoMDL-30625 full support for main admin
Petr Skoda [Wed, 7 Dec 2011 10:18:10 +0000 (11:18 +0100)]
MDL-30625 full support for main admin

9 years agoMDL-30623 fix null guest passwords in existing 2.2 sites
Petr Skoda [Wed, 7 Dec 2011 08:13:34 +0000 (09:13 +0100)]
MDL-30623 fix null guest passwords in existing 2.2 sites

9 years agoMDL-30623 make sure guest password field is not null
Petr Skoda [Wed, 7 Dec 2011 07:58:18 +0000 (08:58 +0100)]
MDL-30623 make sure guest password field is not null

9 years agoMDL-30560 Forms Lib: 'type' key for repeat_elements is restored
Rajesh Taneja [Wed, 7 Dec 2011 03:56:34 +0000 (11:56 +0800)]
MDL-30560 Forms Lib: 'type' key for repeat_elements is restored

9 years agoMerge branch 'wip-MDL-19147-master' of git://github.com/abgreeve/moodle
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

9 years agoAutomatically generated installer lang files
AMOS bot [Wed, 7 Dec 2011 00:31:14 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-27364 use https for recaptcha when site runs via https
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.

9 years agoMDL-30336 - login - Added a setting in security that allows auto complete to be set...
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.

9 years agoMDL-30528 stop recreating role_assignments on every login attempt for each user
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.

9 years agoMDL-28588 Removing IN from SQL statments
Ankit Kumar Agarwal [Thu, 11 Aug 2011 09:36:38 +0000 (15:06 +0530)]
MDL-28588 Removing IN from SQL statments

9 years agoMDL-30607 message: removed an if condition that prevented you from clearing an overri...
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

9 years agoMDL-28282 Scorm Restorting Groups support in Scomr reports
Ankit Kumar Agarwal [Mon, 5 Dec 2011 06:00:52 +0000 (11:30 +0530)]
MDL-28282 Scorm Restorting Groups support in Scomr reports

9 years agoMDL-30582 navigation: Fixed regression in generation of front page modules
Sam Hemelryk [Tue, 6 Dec 2011 00:32:59 +0000 (13:32 +1300)]
MDL-30582 navigation: Fixed regression in generation of front page modules

9 years agoMDL-30222 Fixed home page redirection madness. Thank you Julien Boulen for providing...
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

9 years agoAutomatically generated installer lang files
AMOS bot [Mon, 5 Dec 2011 17:36:36 +0000 (18:36 +0100)]
Automatically generated installer lang files

9 years agoAutomatically generated installer lang files
AMOS bot [Mon, 5 Dec 2011 17:19:29 +0000 (18:19 +0100)]
Automatically generated installer lang files

9 years agoMDL-29579 quiz statistics, include qtext in full XHTML export.
Tim Hunt [Mon, 5 Dec 2011 15:39:55 +0000 (15:39 +0000)]
MDL-29579 quiz statistics, include qtext in full XHTML export.

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 11:16:32 +0000 (12:16 +0100)]
weekly release 2.3dev

9 years agoMoodle release 2.2 v2.2.0
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 11:09:08 +0000 (12:09 +0100)]
Moodle release 2.2

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Mon, 5 Dec 2011 10:55:06 +0000 (11:55 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMerge branch 'MDL-30340-sticky-blocks_simplify_frontpage_ui' of git://github.com...
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

9 years agoMerge branch 'MDL-30340.sticky_category_blocks' 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

9 years agoMDL-30340 blocks - fix/restrict frontpage dark magic application
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.

9 years agoMDL-26974 - add extra logging information all the time - not just when debugging...
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.

9 years agoMDL-28710 rating: added some more classes to the html for entering ratings
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

9 years agoAutomatically generated installer lang files
AMOS bot [Mon, 5 Dec 2011 00:30:55 +0000 (00:30 +0000)]
Automatically generated installer lang files

9 years agoMDL-30340 blocks - incorrect option in user profile template and missing lang string...
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

9 years agoMDL-30340 blocks - hide some redundant pagetypepattern options at front page
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.

9 years agoMDL-30579, fixing Data Model Elements are being initialized with an empty string
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

9 years agoMDL-30340 Block stickiness computation improvements
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.

9 years agoMDL-30340 Always generate pagetype patterns in the block settings form
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.

9 years agoMDL-30340 Trivial change in PHP doc block - the function does not accept any params
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

9 years agoMDL-30340 blocks - add back 'any page' support to course cats
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).

9 years agoMerge branch 'w49_MDL-30538_m22_versions' of git://github.com/skodak/moodle
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

9 years agoMDL-30340 blocks - avoid lockin'blocks in subcontexts.
Eloy Lafuente (stronk7) [Sat, 3 Dec 2011 10:21:48 +0000 (11:21 +0100)]
MDL-30340 blocks - avoid lockin'blocks in subcontexts.

Everytime that one block instance is edited @ any subcontext,
guarantee that the 'bring back' pattern (* = all pages) is
available, so the block can be reseted to its original context

9 years agoMDL-30538 add missing course format versions and fix email filter file name typo
Petr Skoda [Sat, 3 Dec 2011 07:40:53 +0000 (08:40 +0100)]
MDL-30538 add missing course format versions and fix email filter file name typo

9 years agoMDL-30558 question bank, missing string with obscure permissions.
Tim Hunt [Fri, 2 Dec 2011 14:49:39 +0000 (14:49 +0000)]
MDL-30558 question bank, missing string with obscure permissions.

AMOS BEGIN
 MOV [selectcategoryabove,mod_quiz],[selectcategoryabove,question]
AMOS END

9 years agoMDL-30211 imsenterprise enrolment - set up default enrolment methods in new courses
Dan Marsden [Fri, 2 Dec 2011 09:41:51 +0000 (22:41 +1300)]
MDL-30211 imsenterprise enrolment - set up default enrolment methods in new courses

9 years agoMDL-30536 Choice - remove setType so that validation works when JS is disabled
Dan Marsden [Fri, 2 Dec 2011 08:16:21 +0000 (21:16 +1300)]
MDL-30536 Choice - remove setType so that validation works when JS is disabled

9 years agoMDL-30028 - use page pref correctly when pagination or re-ordering
Dan Marsden [Fri, 2 Dec 2011 08:07:59 +0000 (21:07 +1300)]
MDL-30028 - use page pref correctly when pagination or re-ordering

9 years agoMDL-29712 REST-XML server was translating too many HTML characters. use htmlspecialch...
Jerome Mouneyrac [Fri, 2 Dec 2011 03:26:48 +0000 (11:26 +0800)]
MDL-29712 REST-XML server was translating too many HTML characters. use htmlspecialchars instead of htmlentities. Translated characters by htmlspecialchars are compatible with XML validation, and so XML parsers for javascript, java...

9 years agoMDL-26522 grade: made the user selection drop down on the user report behave more...
Andrew Davis [Fri, 2 Dec 2011 01:48:36 +0000 (09:48 +0800)]
MDL-26522 grade: made the user selection drop down on the user report behave more sensibly

9 years agoAutomatically generated installer lang files
AMOS bot [Fri, 2 Dec 2011 00:30:48 +0000 (00:30 +0000)]
Automatically generated installer lang files

9 years agoMDL-30543 navigation: Added missing course variable for user context
Sam Hemelryk [Thu, 1 Dec 2011 23:31:12 +0000 (12:31 +1300)]
MDL-30543 navigation: Added missing course variable for user context

9 years agoMDL-27314 quiz attempts cannot be deleted in separate groups mode.
Igor Sazonov [Thu, 1 Dec 2011 16:21:07 +0000 (16:21 +0000)]
MDL-27314 quiz attempts cannot be deleted in separate groups mode.

9 years agoMoodle release 2.2rc1 v2.2.0-rc1
Eloy Lafuente (stronk7) [Thu, 1 Dec 2011 11:12:21 +0000 (12:12 +0100)]
Moodle release 2.2rc1

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Thu, 1 Dec 2011 11:04:08 +0000 (12:04 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMerge branch 'MDL-30544_disable_notifications' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Thu, 1 Dec 2011 09:38:40 +0000 (10:38 +0100)]
Merge branch 'MDL-30544_disable_notifications' of git://github.com/andyjdavis/moodle

9 years agoMDL-30544 message: prevented the temporarily disable notifications checkbox from...
Andrew Davis [Thu, 1 Dec 2011 08:54:48 +0000 (16:54 +0800)]
MDL-30544 message: prevented the temporarily disable notifications checkbox from erasing your messaging preferences

9 years agoMDL-30496 fix upload max size issue when server limit is set + return some kind of...
Jerome Mouneyrac [Thu, 1 Dec 2011 06:19:36 +0000 (14:19 +0800)]
MDL-30496 fix upload max size issue when server limit is set + return some kind of json error object for filenameexists and oversizedfile errors

9 years agoMerge branch 'MDL-30007' of git://github.com/stronk7/moodle
Sam Hemelryk [Thu, 1 Dec 2011 04:14:52 +0000 (17:14 +1300)]
Merge branch 'MDL-30007' of git://github.com/stronk7/moodle

9 years agoMDL-30386 blog : saved a function call
Aparup Banerjee [Thu, 1 Dec 2011 04:03:31 +0000 (12:03 +0800)]
MDL-30386 blog : saved a function call

9 years agoMerge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle
Aparup Banerjee [Thu, 1 Dec 2011 03:54:25 +0000 (11:54 +0800)]
Merge branch 'wip-MDL-30386-master' of git://github.com/phalacee/moodle

9 years agoMerge branch 'MDL-30260_disable_messages' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Thu, 1 Dec 2011 03:24:47 +0000 (11:24 +0800)]
Merge branch 'MDL-30260_disable_messages' of git://github.com/andyjdavis/moodle

9 years agoMDL-30459 when one filename already exist we bypass the execution and continue. We...
Jerome Mouneyrac [Thu, 1 Dec 2011 02:33:37 +0000 (10:33 +0800)]
MDL-30459 when one filename already exist we bypass the execution and continue. We just return the error into the json string

9 years agoMerge branch 'wip-mdl-30421' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Thu, 1 Dec 2011 02:48:20 +0000 (15:48 +1300)]
Merge branch 'wip-mdl-30421' of git://github.com/rajeshtaneja/moodle

9 years agoMerged branch 'MDL-30459' of git://github.com/mouneyrac/moodle.git with whitespace...
Sam Hemelryk [Thu, 1 Dec 2011 01:43:39 +0000 (14:43 +1300)]
Merged branch 'MDL-30459' of git://github.com/mouneyrac/moodle.git with whitespace fixes

9 years agoMDL-30376 mod_glossary: Integration tidy up
Sam Hemelryk [Thu, 1 Dec 2011 01:17:10 +0000 (14:17 +1300)]
MDL-30376 mod_glossary: Integration tidy up

9 years agoMerge branch 'wip-MDL-30376-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Thu, 1 Dec 2011 01:16:19 +0000 (14:16 +1300)]
Merge branch 'wip-MDL-30376-master' of git://github.com/phalacee/moodle

9 years agoMDL-30386 - Blog - Adding RSS Feed link to the User blogs
Jason Fowler [Wed, 30 Nov 2011 03:22:13 +0000 (11:22 +0800)]
MDL-30386 - Blog - Adding RSS Feed link to the User blogs