moodle.git
8 years agoMerge branch 'MDL-37065-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 9 Jul 2013 08:06:33 +0000 (18:06 +1000)]
Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-mdl-40400' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 9 Jul 2013 08:05:02 +0000 (16:05 +0800)]
Merge branch 'wip-mdl-40400' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'wip-mdl-40427' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 9 Jul 2013 08:00:12 +0000 (16:00 +0800)]
Merge branch 'wip-mdl-40427' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'wip-mdl-40407' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 9 Jul 2013 07:55:20 +0000 (15:55 +0800)]
Merge branch 'wip-mdl-40407' of git://github.com/rajeshtaneja/moodle

(moved a deprecation warning around to try and avoid more conflicts in
upgrade.txt)

Conflicts:
lib/upgrade.txt

8 years agoMDL-40427 Libraries: Deprecated context_moved in favor of context::update_moved()
Rajesh Taneja [Fri, 5 Jul 2013 03:27:23 +0000 (11:27 +0800)]
MDL-40427 Libraries: Deprecated context_moved in favor of context::update_moved()

8 years agoMerge branch 'MDL-40406-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 9 Jul 2013 07:49:45 +0000 (15:49 +0800)]
Merge branch 'MDL-40406-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/upgrade.txt

8 years agoMerge branch 'MDL-40405-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 9 Jul 2013 07:47:07 +0000 (15:47 +0800)]
Merge branch 'MDL-40405-master' of git://github.com/FMCorz/moodle

Conflicts:
lib/upgrade.txt

8 years agoMDL-40407 Libraries: deprecated preload_course_contexts
Rajesh Taneja [Fri, 5 Jul 2013 00:56:00 +0000 (08:56 +0800)]
MDL-40407 Libraries: deprecated preload_course_contexts

8 years agoMerge branch 'wip-mdl-40404' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 9 Jul 2013 07:43:43 +0000 (15:43 +0800)]
Merge branch 'wip-mdl-40404' of git://github.com/rajeshtaneja/moodle

Conflicts:
lib/upgrade.txt

8 years agoMDL-40406 libraries: Deprecate rebuild_contexts()
Frederic Massart [Thu, 4 Jul 2013 06:06:00 +0000 (14:06 +0800)]
MDL-40406 libraries: Deprecate rebuild_contexts()

8 years agoMDL-40406 libraries: Deprecate build_context_path()
Frederic Massart [Thu, 4 Jul 2013 05:55:27 +0000 (13:55 +0800)]
MDL-40406 libraries: Deprecate build_context_path()

8 years agoMDL-40406 libraries: Deprecate cleanup_contexts()
Frederic Massart [Thu, 4 Jul 2013 05:51:39 +0000 (13:51 +0800)]
MDL-40406 libraries: Deprecate cleanup_contexts()

8 years agoMDL-40406 libraries: Deprecate create_contexts()
Frederic Massart [Thu, 4 Jul 2013 05:42:54 +0000 (13:42 +0800)]
MDL-40406 libraries: Deprecate create_contexts()

8 years agoMDL-40405 libraries: Deprecate get_child_contexts()
Frederic Massart [Thu, 4 Jul 2013 03:52:03 +0000 (11:52 +0800)]
MDL-40405 libraries: Deprecate get_child_contexts()

8 years agoMerge branch 'MDL-40369-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 9 Jul 2013 07:28:31 +0000 (15:28 +0800)]
Merge branch 'MDL-40369-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-40455_M26' of git://github.com/lazydaisy/moodle
Damyon Wiese [Tue, 9 Jul 2013 07:20:07 +0000 (15:20 +0800)]
Merge branch 'MDL-40455_M26' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'MDL-40443' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 9 Jul 2013 07:15:47 +0000 (15:15 +0800)]
Merge branch 'MDL-40443' of git://github.com/timhunt/moodle

8 years agoMDL-40171 question saving test
Jamie Pratt [Mon, 24 Jun 2013 07:06:01 +0000 (14:06 +0700)]
MDL-40171 question saving test

8 years agoMDL-40176 mock_submit method for testing
Jamie Pratt [Thu, 20 Jun 2013 06:18:42 +0000 (13:18 +0700)]
MDL-40176 mock_submit method for testing

8 years agoMDL-40404 Libraries: Moved DEVELOPER_DEBUG outside loop
Rajesh Taneja [Fri, 5 Jul 2013 04:40:03 +0000 (12:40 +0800)]
MDL-40404 Libraries: Moved DEVELOPER_DEBUG outside loop

8 years agoMDL-40404 Libraries: Deprecated get_parent_contextid()
Rajesh Taneja [Thu, 4 Jul 2013 04:59:06 +0000 (12:59 +0800)]
MDL-40404 Libraries: Deprecated get_parent_contextid()

8 years agoMerge branch 'MDL-39020-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 9 Jul 2013 06:32:16 +0000 (16:32 +1000)]
Merge branch 'MDL-39020-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-34454 core_message: removed a deprecated function
Andrew Davis [Tue, 16 Apr 2013 08:56:22 +0000 (16:56 +0800)]
MDL-34454 core_message: removed a deprecated function

Conflicts:

lib/deprecatedlib.php

8 years agoMerge branch 'MDL-23646-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 9 Jul 2013 05:55:51 +0000 (15:55 +1000)]
Merge branch 'MDL-23646-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle
Marina Glancy [Tue, 9 Jul 2013 05:54:45 +0000 (15:54 +1000)]
Merge branch 'wip-MDL-37565-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'w28_MDL-40243_m26_ldapsuspend' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 9 Jul 2013 05:44:01 +0000 (13:44 +0800)]
Merge branch 'w28_MDL-40243_m26_ldapsuspend' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-40403-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 9 Jul 2013 05:38:10 +0000 (13:38 +0800)]
Merge branch 'MDL-40403-master' of git://github.com/FMCorz/moodle

8 years agoMDL-40403 tests: Fix pointless assertion
Frederic Massart [Thu, 4 Jul 2013 03:11:23 +0000 (11:11 +0800)]
MDL-40403 tests: Fix pointless assertion

8 years agoMDL-40403 libraries: Deprecate get_parent_contexts()
Frederic Massart [Thu, 4 Jul 2013 03:07:12 +0000 (11:07 +0800)]
MDL-40403 libraries: Deprecate get_parent_contexts()

8 years agoMerge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle
Damyon Wiese [Tue, 9 Jul 2013 05:33:42 +0000 (13:33 +0800)]
Merge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle

8 years agoMerge branch 'MDL-40499' of git://github.com/jmvedrine/moodle
Damyon Wiese [Tue, 9 Jul 2013 05:26:49 +0000 (13:26 +0800)]
Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle

8 years agoMDL-23646: Tinymce wrap plugin fixes.
Damyon Wiese [Tue, 9 Jul 2013 05:02:04 +0000 (13:02 +0800)]
MDL-23646: Tinymce wrap plugin fixes.

Added info to upgrade.txt
Removed wrap plugins from the tinymce plugin list.
Fix trailing comma in wrap plugin javascript.
Removed non functioning "!" handling.
Fixed icons for wrap plugin.

8 years agoMDL-23646 tinymce: Fix for pdw plugin
Damyon Wiese [Fri, 5 Jul 2013 05:54:38 +0000 (13:54 +0800)]
MDL-23646 tinymce: Fix for pdw plugin

This plugin was changing the display of the toolbar tables from "display: table"
to "display: block" when hiding/unhiding the toolbars.

This broke the wrapping plugin.

8 years agoMDL-23646 tinymce: Add upgrade algorithm for custom toolbars.
Damyon Wiese [Fri, 5 Jul 2013 05:52:59 +0000 (13:52 +0800)]
MDL-23646 tinymce: Add upgrade algorithm for custom toolbars.

8 years agoMDL-23646 tinymce: Add plugin to wrap toolbar on small screens
Damyon Wiese [Fri, 5 Jul 2013 04:04:42 +0000 (12:04 +0800)]
MDL-23646 tinymce: Add plugin to wrap toolbar on small screens

8 years agoMDL-37565 - HTMLEditor - Adding a toggle plugin to TinyMCE to improve the appearance...
Jason Fowler [Fri, 14 Jun 2013 05:52:51 +0000 (13:52 +0800)]
MDL-37565 - HTMLEditor - Adding a toggle plugin to TinyMCE to improve the appearance of the editor

8 years agoMerge branch 'MDL-40386' of https://github.com/prateeksachan/moodle
Damyon Wiese [Tue, 9 Jul 2013 04:34:31 +0000 (12:34 +0800)]
Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle

9 years agoMDL-40388 Reset globals after each unit test
Jamie Pratt [Tue, 2 Jul 2013 05:43:14 +0000 (12:43 +0700)]
MDL-40388 Reset globals after each unit test

9 years agoMDL-40035: Avoid rebuild_course_cache always for empty course
Tony Levi [Thu, 6 Jun 2013 04:41:19 +0000 (14:11 +0930)]
MDL-40035: Avoid rebuild_course_cache always for empty course

9 years agoMDL-31776 - lib: Alternate name fields
Adrian Greeve [Wed, 24 Apr 2013 02:12:42 +0000 (10:12 +0800)]
MDL-31776 - lib: Alternate name fields

Add support for additional name fields and flexible formating of
user names.

9 years agoMerge branch 'MDL-40318' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 9 Jul 2013 03:11:42 +0000 (11:11 +0800)]
Merge branch 'MDL-40318' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-40562_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Tue, 9 Jul 2013 03:04:58 +0000 (11:04 +0800)]
Merge branch 'MDL-40562_master' of git://github.com/dmonllao/moodle

9 years agoMerge branch 'wip-MDL-40368-m26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 9 Jul 2013 02:48:47 +0000 (10:48 +0800)]
Merge branch 'wip-MDL-40368-m26' of git://github.com/samhemelryk/moodle

Conflicts:
admin/tool/capability/index.php

9 years agoMerge branch 'MDL-40402-master2' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 9 Jul 2013 02:42:03 +0000 (14:42 +1200)]
Merge branch 'MDL-40402-master2' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'wip-MDL-40490-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 9 Jul 2013 02:03:22 +0000 (10:03 +0800)]
Merge branch 'wip-MDL-40490-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-40434' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 9 Jul 2013 01:30:42 +0000 (11:30 +1000)]
Merge branch 'MDL-40434' of git://github.com/timhunt/moodle

9 years agoMDL-40436: auth_ldap: Fixed warning when adding new LDAP users
Tim Lock [Thu, 27 Jun 2013 00:52:28 +0000 (10:22 +0930)]
MDL-40436: auth_ldap: Fixed warning when adding new LDAP users

9 years agoMerge branch 'MDL-40561-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 8 Jul 2013 14:28:21 +0000 (22:28 +0800)]
Merge branch 'MDL-40561-master' of git://github.com/FMCorz/moodle

9 years agoMDL-40562 behat: Catch NoSuchElement exception
David Monllao [Mon, 8 Jul 2013 08:58:30 +0000 (10:58 +0200)]
MDL-40562 behat: Catch NoSuchElement exception

9 years agoMDL-40561 phpunit: Return the right guessed class
Frederic Massart [Mon, 8 Jul 2013 09:58:38 +0000 (17:58 +0800)]
MDL-40561 phpunit: Return the right guessed class

9 years agoMerge branch 'MDL-38314-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 8 Jul 2013 07:10:58 +0000 (15:10 +0800)]
Merge branch 'MDL-38314-master' of git://github.com/FMCorz/moodle

Conflicts:
version.php

9 years agoMerge branch 'w28_MDL-40415_m26_opcache' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 8 Jul 2013 05:40:09 +0000 (13:40 +0800)]
Merge branch 'w28_MDL-40415_m26_opcache' of https://github.com/skodak/moodle

9 years agoMDL-40243 use suspended flag in auth_enrol instead of nologin auth
Petr Škoda [Sun, 7 Jul 2013 12:40:46 +0000 (14:40 +0200)]
MDL-40243 use suspended flag in auth_enrol instead of nologin auth

9 years agoMDL-40455: theme_formfactor: Move slash comments to be before code (not after) add...
Mary Evans [Sat, 6 Jul 2013 17:53:44 +0000 (18:53 +0100)]
MDL-40455: theme_formfactor: Move slash comments to be before code (not after) add missing layouts in formfactor/config,php

9 years agoMDL-37484 SCORM: disable toc in player when using direct AICC url
Dan Marsden [Fri, 5 Jul 2013 02:37:20 +0000 (14:37 +1200)]
MDL-37484 SCORM: disable toc in player when using direct AICC url

9 years agoMDL-40415 add explicit OPcache support
Petr Škoda [Mon, 1 Jul 2013 19:06:44 +0000 (21:06 +0200)]
MDL-40415 add explicit OPcache support

9 years agoMDL-40500 move MOODLE_INTERNAL define before core_component include
Petr Škoda [Thu, 4 Jul 2013 17:04:23 +0000 (19:04 +0200)]
MDL-40500 move MOODLE_INTERNAL define before core_component include

This resolves problems with MOODLE_INTERNAL in db/subplugins.php

9 years agoMDL-40499 Edit question from 1.9 backup breaks if images in subdirs
Jean-Michel Vedrine [Thu, 4 Jul 2013 12:09:13 +0000 (14:09 +0200)]
MDL-40499 Edit question from 1.9 backup breaks if images in subdirs

9 years agoMDL-40443 setType notice in quiz reports.
Tim Hunt [Tue, 2 Jul 2013 11:07:54 +0000 (12:07 +0100)]
MDL-40443 setType notice in quiz reports.

9 years agoMDL-40318 quiz intro comprising just an impage was not shown
Tim Hunt [Tue, 2 Jul 2013 09:43:41 +0000 (10:43 +0100)]
MDL-40318 quiz intro comprising just an impage was not shown

Also, ensure that we don't output an empty box if there are no access
messages.

9 years agoMDL-40402 libraries: update the mistake in comment
Ankit Agarwal [Wed, 3 Jul 2013 06:51:56 +0000 (14:51 +0800)]
MDL-40402 libraries: update the mistake in comment

9 years agoMDL-40402 libraries: Deprecate get_system_context()
Ankit Agarwal [Wed, 3 Jul 2013 06:35:44 +0000 (14:35 +0800)]
MDL-40402 libraries: Deprecate get_system_context()

9 years agoMDL-40402 unittests: Make sure get_system_context() throws a deprecated warning
Ankit Agarwal [Wed, 3 Jul 2013 06:32:22 +0000 (14:32 +0800)]
MDL-40402 unittests: Make sure get_system_context() throws a deprecated warning

9 years agoMDL-40402 libraries: Replace get_system_context() with context_system::instance(...
Ankit Agarwal [Wed, 3 Jul 2013 06:39:10 +0000 (14:39 +0800)]
MDL-40402 libraries: Replace get_system_context() with context_system::instance() in core

9 years agoweekly release 2.6dev
Damyon Wiese [Thu, 4 Jul 2013 07:28:10 +0000 (15:28 +0800)]
weekly release 2.6dev

9 years agoMDL-40401 Libraries: load_temp_role() and remove_temp_roles() can not be used any...
Rajesh Taneja [Wed, 3 Jul 2013 08:26:08 +0000 (16:26 +0800)]
MDL-40401 Libraries: load_temp_role() and remove_temp_roles() can not be used any more.

9 years agoMDL-40490 - database: Fixed a check on database port options.
Adrian Greeve [Thu, 4 Jul 2013 07:01:53 +0000 (15:01 +0800)]
MDL-40490 - database: Fixed a check on database port options.

The addition of a port for the database means that an array
would be set regardless of whether it had any information or not.
The isset() function sees an array as being set and follows through
with the rest of the if statement concatenating a colon to the end
of the database host name and throwing a connection problem if no port
number is supplied.

The if statement has now been changed to if not empty. The empty
function does see zero as an empty value, but a port shouldn't have
a value of zero anyway.

9 years agoMDL-40131 theme_bootstrapbase: added missing grader table css to less/moodle/grade...
Mary Evans [Fri, 28 Jun 2013 01:33:42 +0000 (02:33 +0100)]
MDL-40131 theme_bootstrapbase: added missing grader table css to less/moodle/grade.less

Conflicts:

theme/bootstrapbase/style/moodle.css

9 years agoMDL-40308: Fix javascript for lti mod_form
Damyon Wiese [Thu, 4 Jul 2013 05:20:01 +0000 (13:20 +0800)]
MDL-40308: Fix javascript for lti mod_form

It was toggling the state of the hidden input - not the checkbox.

9 years agoMDL-40039 phpunit: Test core_files_external::upload() without the new params
Ankit Agarwal [Thu, 4 Jul 2013 02:47:38 +0000 (10:47 +0800)]
MDL-40039 phpunit: Test core_files_external::upload() without the new params

9 years agoMDL-39813 behat: fixed up behat expectations
Sam Hemelryk [Wed, 3 Jul 2013 21:22:54 +0000 (09:22 +1200)]
MDL-39813 behat: fixed up behat expectations

9 years agoMDL-40376 Fix copy/paste typo
Eloy Lafuente (stronk7) [Wed, 3 Jul 2013 15:53:01 +0000 (17:53 +0200)]
MDL-40376 Fix copy/paste typo

9 years agoMerge branch 'moduleuninstallfix' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 3 Jul 2013 09:36:29 +0000 (11:36 +0200)]
Merge branch 'moduleuninstallfix' of https://github.com/skodak/moodle

9 years agoMerge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 3 Jul 2013 09:34:55 +0000 (11:34 +0200)]
Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle

9 years agoMDL-40400 Gradebook: get_toggles_html and print_toggle cannot be used anymore
Rajesh Taneja [Wed, 3 Jul 2013 09:06:59 +0000 (17:06 +0800)]
MDL-40400 Gradebook: get_toggles_html and print_toggle cannot be used anymore

9 years agoMDL-40369 theme: Removing old gif icons with PNG/SVG versions
Frederic Massart [Tue, 2 Jul 2013 10:13:52 +0000 (18:13 +0800)]
MDL-40369 theme: Removing old gif icons with PNG/SVG versions

9 years agoMDL-40369 theme: MyMobile does not override deprecated icons
Frederic Massart [Tue, 2 Jul 2013 09:38:41 +0000 (17:38 +0800)]
MDL-40369 theme: MyMobile does not override deprecated icons

9 years agoMDL-40369 theme: Afterburner does not override deprecated icons
Frederic Massart [Tue, 2 Jul 2013 09:31:40 +0000 (17:31 +0800)]
MDL-40369 theme: Afterburner does not override deprecated icons

9 years agoMDL-40369 theme: Remove deprecated icons
Frederic Massart [Tue, 2 Jul 2013 09:02:04 +0000 (17:02 +0800)]
MDL-40369 theme: Remove deprecated icons

9 years agoMDL-40369 theme: Fix core using deprecated icons
Frederic Massart [Wed, 3 Jul 2013 08:47:22 +0000 (16:47 +0800)]
MDL-40369 theme: Fix core using deprecated icons

9 years agoMDL-38314 repository: Improving performance of upgrade script
Frederic Massart [Wed, 3 Jul 2013 08:03:46 +0000 (16:03 +0800)]
MDL-38314 repository: Improving performance of upgrade script

9 years agoMDL-39088 fix incorrect module count SQL
Petr Škoda [Wed, 3 Jul 2013 07:40:07 +0000 (09:40 +0200)]
MDL-39088 fix incorrect module count SQL

9 years agoMDL-38314 repository: Unit Tests for delete_all_for_context()
Frederic Massart [Thu, 6 Jun 2013 07:36:42 +0000 (15:36 +0800)]
MDL-38314 repository: Unit Tests for delete_all_for_context()

9 years agoMDL-38314 repository: Delete repository instances on context deletion
Frederic Massart [Thu, 6 Jun 2013 03:50:58 +0000 (11:50 +0800)]
MDL-38314 repository: Delete repository instances on context deletion

9 years agoMDL-38314 repository: Remove orphan repository instances
Frederic Massart [Tue, 4 Jun 2013 07:56:25 +0000 (15:56 +0800)]
MDL-38314 repository: Remove orphan repository instances

9 years agoMDL-37065 - Change get_string('status') token in assignment submissions page to a...
Nadav Kavalerchik [Sat, 25 May 2013 09:43:34 +0000 (12:43 +0300)]
MDL-37065 - Change get_string('status') token in assignment submissions page to a different token (for translation flexibility)

AMOS BEGIN
 CPY [status,core],[status,mod_assign]
AMOS END

9 years agoMDL-39986 badges: Show badge navigation to users with awardbadge capability
Yuliya Bozhko [Wed, 12 Jun 2013 04:07:49 +0000 (16:07 +1200)]
MDL-39986 badges: Show badge navigation to users with awardbadge capability

Also fixes an arror when a user with this capability tries to award a badge,
but their role is not among the criteria set up for a badge

9 years agoMDL-39813 recompile less for bootstrapbase
Damyon Wiese [Wed, 3 Jul 2013 03:38:21 +0000 (11:38 +0800)]
MDL-39813 recompile less for bootstrapbase

9 years agoMerge branch 'MDL-39813_login' of git://github.com/andyjdavis/moodle
Damyon Wiese [Wed, 3 Jul 2013 03:35:53 +0000 (11:35 +0800)]
Merge branch 'MDL-39813_login' of git://github.com/andyjdavis/moodle

9 years agoMDL-39813 added some white space above the cookie message
Andrew Davis [Wed, 3 Jul 2013 03:07:35 +0000 (11:07 +0800)]
MDL-39813 added some white space above the cookie message

9 years agoMDL-39558 badges: Prevent backup of badges without user information
Damyon Wiese [Wed, 3 Jul 2013 02:52:50 +0000 (10:52 +0800)]
MDL-39558 badges: Prevent backup of badges without user information

9 years agoMDL-39558 badges: Add backup/restore of manually awarded badges
Yuliya Bozhko [Tue, 2 Jul 2013 05:19:27 +0000 (17:19 +1200)]
MDL-39558 badges: Add backup/restore of manually awarded badges

9 years agoMDL-39558 badges: Add backup/restore to course badges
Yuliya Bozhko [Fri, 14 Jun 2013 04:35:34 +0000 (16:35 +1200)]
MDL-39558 badges: Add backup/restore to course badges

9 years agoMerge branch 'MDL-40275-m' of git://github.com/micaherne/moodle
Eloy Lafuente (stronk7) [Tue, 2 Jul 2013 19:52:17 +0000 (21:52 +0200)]
Merge branch 'MDL-40275-m' of git://github.com/micaherne/moodle

9 years agoMDL-35009 Normalize deprecation (also MDL-34472)
Eloy Lafuente (stronk7) [Tue, 2 Jul 2013 19:40:16 +0000 (21:40 +0200)]
MDL-35009 Normalize deprecation (also MDL-34472)

- Use same deprecation phrases style.
- Use same upgrade.txt phrases style.
- Add unit test covering the deprecation.

See the issue for some more rationale / comments.

9 years agoMerge branch 'wip-mdl-35009' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 2 Jul 2013 19:22:30 +0000 (21:22 +0200)]
Merge branch 'wip-mdl-35009' of git://github.com/rajeshtaneja/moodle

Conflicts:
lib/accesslib.php
lib/deprecatedlib.php
lib/upgrade.txt

9 years agoMerge branch 'MDL-40376-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 2 Jul 2013 19:11:49 +0000 (21:11 +0200)]
Merge branch 'MDL-40376-m' of git://github.com/andrewnicols/moodle

9 years agoMDL-37516 Translate fieldnames on output only.
Eloy Lafuente (stronk7) [Tue, 2 Jul 2013 18:28:34 +0000 (20:28 +0200)]
MDL-37516 Translate fieldnames on output only.

This reverts a change performed by the previous commit where user
fieldnames were being translated (and cached) when fetched,
causing the information to remain static later, not responding
to language switches (and perhaps leading to other problems if those
structures are used lated for DB / $USER comparisons.

With the commit, the translation happens on output, so no
potential interferences will happen and, also, the information
changes dynamically on lang switching.

9 years agoMDL-37516 Conditional activities: user field condition display fixes
sam marshall [Wed, 15 May 2013 12:11:51 +0000 (13:11 +0100)]
MDL-37516 Conditional activities: user field condition display fixes

9 years agoMerge branch 'MDL-40314_M26' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 2 Jul 2013 17:41:44 +0000 (19:41 +0200)]
Merge branch 'MDL-40314_M26' of git://github.com/lazydaisy/moodle