moodle.git
8 years agoMerge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 15:25:00 +0000 (16:25 +0100)]
Merge branch 'MDL-38170-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-38243-master' of git://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 4 Mar 2013 03:25:50 +0000 (16:25 +1300)]
Merge branch 'MDL-38243-master' of git://github.com/lucisgit/moodle

8 years agoMerge branch 'MDL-35350' of git://github.com/rwijaya/moodle
Sam Hemelryk [Mon, 4 Mar 2013 03:13:09 +0000 (16:13 +1300)]
Merge branch 'MDL-35350' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-35127-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 4 Mar 2013 03:08:08 +0000 (16:08 +1300)]
Merge branch 'MDL-35127-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-MDL-38205-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 4 Mar 2013 02:01:11 +0000 (03:01 +0100)]
Merge branch 'wip-MDL-38205-m25' of git://github.com/samhemelryk/moodle

8 years agoMDL-36426 repository: Prevent login_as() users to access private repositories
Frederic Massart [Mon, 4 Feb 2013 06:58:46 +0000 (14:58 +0800)]
MDL-36426 repository: Prevent login_as() users to access private repositories

8 years agoMerge branch 'MDL-31557_master' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 4 Mar 2013 01:35:59 +0000 (14:35 +1300)]
Merge branch 'MDL-31557_master' of git://github.com/markn86/moodle

Conflicts:
lib/db/upgrade.php
version.php

8 years agoMerge branch 'MDL-37625-master' of https://github.com/jfilip/moodle
Sam Hemelryk [Mon, 4 Mar 2013 01:18:49 +0000 (14:18 +1300)]
Merge branch 'MDL-37625-master' of https://github.com/jfilip/moodle

8 years agoMerge branch 'MDL-36128-master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Mon, 4 Mar 2013 00:59:58 +0000 (13:59 +1300)]
Merge branch 'MDL-36128-master' of https://github.com/StudiUM/moodle

8 years agoMDL-37681 repository_webdav: improved form handling when configuring an instance
Frederic Massart [Mon, 4 Mar 2013 00:45:32 +0000 (13:45 +1300)]
MDL-37681 repository_webdav: improved form handling when configuring an instance

8 years agoMDL-37338 Calendar: User will not see calendar subscription, which he/she can't edit
Rajesh Taneja [Mon, 14 Jan 2013 06:29:08 +0000 (14:29 +0800)]
MDL-37338 Calendar: User will not see calendar subscription, which he/she can't edit

Signed-off-by: Rajesh Taneja <rajesh@moodle.com>
8 years agoMerge branch 'MDL-38168-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 4 Mar 2013 00:35:16 +0000 (13:35 +1300)]
Merge branch 'MDL-38168-master' of git://github.com/sammarshallou/moodle

8 years agoMDL-37507 repositories: improved formatting of external resources
Frederic Massart [Mon, 4 Mar 2013 00:25:17 +0000 (13:25 +1300)]
MDL-37507 repositories: improved formatting of external resources

8 years agoMDL-36901: Remove system paths from exceptions
Mark Nielsen [Sun, 3 Mar 2013 22:52:09 +0000 (23:52 +0100)]
MDL-36901: Remove system paths from exceptions

Replaces any server paths, like dataroot, with a token
in exception messages and debug info.

8 years agoMDL-37481 user: fixed bug when logged in as guest
Frederic Massart [Sun, 3 Mar 2013 22:17:14 +0000 (11:17 +1300)]
MDL-37481 user: fixed bug when logged in as guest

8 years agoMerge branch 'wip-MDL-38165-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Sun, 3 Mar 2013 22:07:05 +0000 (23:07 +0100)]
Merge branch 'wip-MDL-38165-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-32125-master' of git://github.com/StudiUM/moodle
Sam Hemelryk [Sun, 3 Mar 2013 21:37:51 +0000 (10:37 +1300)]
Merge branch 'MDL-32125-master' of git://github.com/StudiUM/moodle

8 years agoMDL-38149 core_grade: added a guard for when there are no old grades
Andrew Davis [Tue, 26 Feb 2013 03:07:19 +0000 (11:07 +0800)]
MDL-38149 core_grade: added a guard for when there are no old grades

8 years agoMDL-38170 SimplePie: Cannot read https feeds through proxy
sam marshall [Fri, 22 Feb 2013 17:23:01 +0000 (17:23 +0000)]
MDL-38170 SimplePie: Cannot read https feeds through proxy

8 years agoMDL-38165 cache: fixed issues purging peristent caches by event
Sam Hemelryk [Thu, 28 Feb 2013 22:37:27 +0000 (11:37 +1300)]
MDL-38165 cache: fixed issues purging peristent caches by event

8 years agoMDL-38165 cache: added unit tests for event purging of persistent caches
Sam Hemelryk [Thu, 28 Feb 2013 22:36:49 +0000 (11:36 +1300)]
MDL-38165 cache: added unit tests for event purging of persistent caches

8 years agoMDL-38205 cache: implemented key prefix in memcache plugin
Sam Hemelryk [Tue, 26 Feb 2013 03:35:45 +0000 (16:35 +1300)]
MDL-38205 cache: implemented key prefix in memcache plugin

8 years agoMDL-38165 cache: fixed up application event purging
Sam Hemelryk [Wed, 27 Feb 2013 05:22:28 +0000 (18:22 +1300)]
MDL-38165 cache: fixed up application event purging

8 years agoMDL-38165 cache: fixed up session event purging
Sam Hemelryk [Wed, 27 Feb 2013 05:20:48 +0000 (18:20 +1300)]
MDL-38165 cache: fixed up session event purging

8 years agoMDL-36128 grade: Import outcomes error
Jean-Philippe Gaudreau [Tue, 19 Feb 2013 16:34:03 +0000 (11:34 -0500)]
MDL-36128 grade: Import outcomes error

8 years agoMDL-32125 mod_forum: Updating subscription mode not reflecting subscribers
Gilles-Philippe Leblanc [Wed, 6 Feb 2013 13:28:55 +0000 (08:28 -0500)]
MDL-32125 mod_forum: Updating subscription mode not reflecting subscribers

8 years agoweekly release 2.5dev
Eloy Lafuente (stronk7) [Thu, 28 Feb 2013 14:47:07 +0000 (15:47 +0100)]
weekly release 2.5dev

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Thu, 28 Feb 2013 14:40:15 +0000 (15:40 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoMDL-38243 mod_assessment: make assessment forms non-collapsible
Ruslan Kabalin [Thu, 28 Feb 2013 10:28:18 +0000 (10:28 +0000)]
MDL-38243 mod_assessment: make assessment forms non-collapsible

8 years agoRevert "MDL-33934 theme_mymobile: Updates to CSS & Javascript - including MDL-38072...
Damyon Wiese [Thu, 28 Feb 2013 06:04:11 +0000 (14:04 +0800)]
Revert "MDL-33934 theme_mymobile: Updates to CSS & Javascript - including MDL-38072 removing css/js for collapsed topic."

This reverts commit 7e6c6743028ec5e6b5957eb3f7ab0750c308f440.
This reverts commit c443c95c016bff151e4c78692d9ba1d326dc2a11.

This issue needs more work and will be delayed.

8 years agoMDL-35350 Advanced uploading assignment: add submission timestamp on assignment index...
Michael de Raadt [Wed, 27 Feb 2013 06:44:21 +0000 (14:44 +0800)]
MDL-35350 Advanced uploading assignment: add submission timestamp on assignment index page

8 years agoRevert "MDL-35875 - Users - Fixing RTL support"
Damyon Wiese [Thu, 28 Feb 2013 02:51:06 +0000 (10:51 +0800)]
Revert "MDL-35875 - Users - Fixing RTL support"

This reverts commit fbb31b0f905c8859cc4f559f4f8148769367ece6.
This reverts commit c111b9f3aeea98542213ff530f59291fd45d1245.
This reverts commit 8afb9b7c4f2bfbb336b3e3af580cb14d32b0e917.

This issue has failed testing and integration will be delayed.

8 years agoMDL-35875 - Users - Fixing RTL support
Jason Fowler [Thu, 28 Feb 2013 02:18:03 +0000 (10:18 +0800)]
MDL-35875 - Users - Fixing RTL support

8 years agoMDL-35875 - User - Modify the profile page to use semantic HTML rather than tables...
Damyon Wiese [Thu, 28 Feb 2013 02:10:36 +0000 (10:10 +0800)]
MDL-35875 - User - Modify the profile page to use semantic HTML rather than tables for layout (RTL Support)

8 years agoMDL-38096 fix availability of bulk enrol actions
Petr Škoda [Wed, 27 Feb 2013 07:02:56 +0000 (08:02 +0100)]
MDL-38096 fix availability of bulk enrol actions

8 years agoMDL-38096 fix availability of enrol button
Petr Škoda [Wed, 27 Feb 2013 06:58:26 +0000 (07:58 +0100)]
MDL-38096 fix availability of enrol button

8 years agoMDL-36832 Assignment Use MUC for useridlist: Fix for quickgrading checkbox
Damyon Wiese [Wed, 27 Feb 2013 02:25:14 +0000 (10:25 +0800)]
MDL-36832 Assignment Use MUC for useridlist: Fix for quickgrading checkbox

8 years agoMDL-35127 Assignment - declare the variables in the outer scope (for readability)
Damyon Wiese [Wed, 27 Feb 2013 01:27:04 +0000 (09:27 +0800)]
MDL-35127 Assignment - declare the variables in the outer scope (for readability)

8 years agoMDL-35127 mod_assign More efficient use of expensive database queries
Eric Merrill [Tue, 26 Feb 2013 14:35:42 +0000 (09:35 -0500)]
MDL-35127 mod_assign More efficient use of expensive database queries

Moving two relatively expensive DB queries so they are only executed when needed
instead of on every function call. They will still only execute once, and not
repeatedly during execution of the loop.

8 years agoMerge branch 'wip-MDL-37356-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 17:12:15 +0000 (18:12 +0100)]
Merge branch 'wip-MDL-37356-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'wip-MDL-31885-smartcache' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 12:23:34 +0000 (13:23 +0100)]
Merge branch 'wip-MDL-31885-smartcache' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 09:14:28 +0000 (10:14 +0100)]
Merge branch 'MDL-38076-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-37835-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 09:06:14 +0000 (10:06 +0100)]
Merge branch 'MDL-37835-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 08:46:13 +0000 (09:46 +0100)]
Merge branch 'wip-MDL-30669-master' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-38115-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 26 Feb 2013 05:36:24 +0000 (13:36 +0800)]
Merge branch 'MDL-38115-master' of git://github.com/damyon/moodle

8 years agoMDL-31557 install: removing PREVIOUS and NEXT attributes from install.xml for newly...
Mark Nelson [Tue, 26 Feb 2013 03:54:11 +0000 (11:54 +0800)]
MDL-31557 install: removing PREVIOUS and NEXT attributes from install.xml for newly introduced index

8 years agoMDL-31557 Add index for timemodified in grade_grades_history table
Tim Gus [Fri, 4 Jan 2013 17:29:14 +0000 (12:29 -0500)]
MDL-31557 Add index for timemodified in grade_grades_history table

8 years agoMerge branch 'w08_MDL-38154_m25_delperf' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 26 Feb 2013 03:08:52 +0000 (11:08 +0800)]
Merge branch 'w08_MDL-38154_m25_delperf' of git://github.com/skodak/moodle

8 years agoMDL-37792 Course - Fix upgrade step and set version number for completion field fix.
Damyon Wiese [Tue, 26 Feb 2013 02:49:46 +0000 (10:49 +0800)]
MDL-37792 Course - Fix upgrade step and set version number for completion field fix.

8 years agoMerge branch 'MDL-37792-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Tue, 26 Feb 2013 02:45:21 +0000 (10:45 +0800)]
Merge branch 'MDL-37792-master' of git://github.com/sammarshallou/moodle

8 years agoMerge branch 'wip-MDL-38144-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 26 Feb 2013 02:43:26 +0000 (15:43 +1300)]
Merge branch 'wip-MDL-38144-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-38161' of git://github.com/stronk7/moodle
Dan Poltawski [Tue, 26 Feb 2013 02:40:51 +0000 (10:40 +0800)]
Merge branch 'MDL-38161' of git://github.com/stronk7/moodle

8 years agoMDL-31885 The activity name auto-linking filter should not create links to webpages...
Marina Glancy [Wed, 20 Feb 2013 00:00:41 +0000 (11:00 +1100)]
MDL-31885 The activity name auto-linking filter should not create links to webpages it was created on

8 years agoMDL-30669 - blocks: Unit tests for course_page_type_list()
Adrian Greeve [Wed, 13 Feb 2013 07:30:46 +0000 (15:30 +0800)]
MDL-30669 - blocks: Unit tests for course_page_type_list()

8 years agoMDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays...
Adrian Greeve [Thu, 3 Jan 2013 06:22:53 +0000 (14:22 +0800)]
MDL-30669 - blocks: Added a warning when deleting blocks that have multiple displays set.

Also added a fix to the function course_page_type_list(). It was making a call to
get_context_info_array() which will generate an error if $currentcontext is not set.

8 years agoMDL-37455 - redirect for mod_folder course breaking changes
Dan Poltawski [Tue, 26 Feb 2013 02:06:29 +0000 (10:06 +0800)]
MDL-37455 - redirect for mod_folder course breaking changes

8 years agoMDL-37835 Assignment unit tests - Do not fail if custom plugins are installed.
Damyon Wiese [Wed, 20 Feb 2013 06:34:44 +0000 (14:34 +0800)]
MDL-37835 Assignment unit tests - Do not fail if custom plugins are installed.

8 years agoMDL-38115 Assignment Unit tests : speedup (round 2)
Damyon Wiese [Wed, 20 Feb 2013 04:50:31 +0000 (12:50 +0800)]
MDL-38115 Assignment Unit tests : speedup (round 2)

8 years agoMerge branch 'wip-MDL-38162-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 00:28:56 +0000 (01:28 +0100)]
Merge branch 'wip-MDL-38162-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'w08_MDL-37963_m25_usergen' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 00:25:58 +0000 (01:25 +0100)]
Merge branch 'w08_MDL-37963_m25_usergen' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 26 Feb 2013 00:19:29 +0000 (01:19 +0100)]
Merge branch 'MDL-38141-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'wip-MDL-38110-m25' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 23:48:22 +0000 (00:48 +0100)]
Merge branch 'wip-MDL-38110-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-38090-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 23:33:32 +0000 (00:33 +0100)]
Merge branch 'MDL-38090-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 22:52:20 +0000 (23:52 +0100)]
Merge branch 'wip-MDL-38146-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 22:51:20 +0000 (23:51 +0100)]
Merge branch 'MDL-38001-master' of git://github.com/mouneyrac/moodle

8 years agoMerge branch 'MDL-30098_master' of git://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 25 Feb 2013 22:38:20 +0000 (23:38 +0100)]
Merge branch 'MDL-30098_master' of git://github.com/markn86/moodle

Conflicts:
course/tests/externallib_test.php

8 years agoMDL-37792 Conditions: Interests condition offered but not implemented
sam marshall [Wed, 13 Feb 2013 17:40:18 +0000 (17:40 +0000)]
MDL-37792 Conditions: Interests condition offered but not implemented

8 years agoMDL-38154 do not hardcode sha1 hash of empty string
Petr Škoda [Mon, 25 Feb 2013 09:10:57 +0000 (10:10 +0100)]
MDL-38154 do not hardcode sha1 hash of empty string

8 years agoMerge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 25 Feb 2013 07:49:13 +0000 (15:49 +0800)]
Merge branch 'wip-MDL-36287-m25' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'wip-MDL-38145-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 25 Feb 2013 07:42:13 +0000 (15:42 +0800)]
Merge branch 'wip-MDL-38145-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 25 Feb 2013 07:39:30 +0000 (15:39 +0800)]
Merge branch 'wip-MDL-38163-m25' of git://github.com/samhemelryk/moodle

8 years agoMDL-37641 Version number bump for js changes.
Damyon Wiese [Mon, 25 Feb 2013 07:25:01 +0000 (15:25 +0800)]
MDL-37641 Version number bump for js changes.

8 years agoMerge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 25 Feb 2013 07:23:19 +0000 (15:23 +0800)]
Merge branch 'MDL-37641-master' of git://github.com/FMCorz/moodle

8 years agoMDL-37356 - mod_data: Database activity now uses format_float and unformat_float.
Adrian Greeve [Fri, 8 Feb 2013 01:06:50 +0000 (09:06 +0800)]
MDL-37356 - mod_data: Database activity now uses format_float and unformat_float.

The longitude and latitude values were not using format_float and unformat_float.
Changes have been made to the manual entry of records, csv import of records, and the
display of these records.

8 years agoMerge branch 'w08_MDL-38121_m25_plugincheck' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 25 Feb 2013 06:34:07 +0000 (14:34 +0800)]
Merge branch 'w08_MDL-38121_m25_plugincheck' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-37770-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 25 Feb 2013 06:32:01 +0000 (14:32 +0800)]
Merge branch 'MDL-37770-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-36832-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 25 Feb 2013 06:19:36 +0000 (14:19 +0800)]
Merge branch 'MDL-36832-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle
Damyon Wiese [Mon, 25 Feb 2013 06:09:33 +0000 (14:09 +0800)]
Merge branch 'wip-MDL-35875-master' of git://github.com/phalacee/moodle

8 years agoMDL-28692 Base theme - Version bump for css change
Damyon Wiese [Mon, 25 Feb 2013 05:50:01 +0000 (13:50 +0800)]
MDL-28692 Base theme - Version bump for css change

8 years agoMerge branch 'MDL-28692_master' of git://github.com/lazydaisy/moodle
Damyon Wiese [Mon, 25 Feb 2013 05:32:25 +0000 (13:32 +0800)]
Merge branch 'MDL-28692_master' of git://github.com/lazydaisy/moodle

8 years agoMDL-30072 Notes webservices - Fix one parameter description and bump version.
Damyon Wiese [Mon, 25 Feb 2013 05:14:18 +0000 (13:14 +0800)]
MDL-30072 Notes webservices - Fix one parameter description and bump version.

8 years agoMerge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle
Damyon Wiese [Mon, 25 Feb 2013 04:37:56 +0000 (12:37 +0800)]
Merge branch 'wip-MDL-30072-master' of git://github.com/phalacee/moodle

8 years agoMDL-33934 MyMobile theme - Fix white space, indenting and file permissions
Damyon Wiese [Mon, 25 Feb 2013 04:24:55 +0000 (12:24 +0800)]
MDL-33934 MyMobile theme - Fix white space, indenting and file permissions

8 years agoMerge branch 'MDL-33934_master' of git://github.com/lazydaisy/moodle
Damyon Wiese [Mon, 25 Feb 2013 04:10:06 +0000 (12:10 +0800)]
Merge branch 'MDL-33934_master' of git://github.com/lazydaisy/moodle

8 years agoMDL-37455 lang - fix trailing whitespace
Dan Poltawski [Mon, 25 Feb 2013 04:05:16 +0000 (12:05 +0800)]
MDL-37455 lang - fix trailing whitespace

8 years agoMerge branch 'wip-MDL-37455-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Feb 2013 03:43:48 +0000 (11:43 +0800)]
Merge branch 'wip-MDL-37455-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-38052_master' of git://github.com/kordan/moodle
Damyon Wiese [Mon, 25 Feb 2013 03:38:13 +0000 (11:38 +0800)]
Merge branch 'MDL-38052_master' of git://github.com/kordan/moodle

8 years agoMDL-38113: Blind Marking grader email reveals submitters details
Tim Lock [Wed, 20 Feb 2013 02:48:11 +0000 (13:18 +1030)]
MDL-38113: Blind Marking grader email reveals submitters details

8 years agoMerge branch 'wip-MDL-38091-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 25 Feb 2013 03:00:03 +0000 (11:00 +0800)]
Merge branch 'wip-MDL-38091-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Feb 2013 02:50:38 +0000 (10:50 +0800)]
Merge branch 'w08_MDL-38042_m25_flatroles' of git://github.com/skodak/moodle

8 years agoMerge branch 'w08_MDL-38096_m25_manenrol' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 25 Feb 2013 02:44:54 +0000 (10:44 +0800)]
Merge branch 'w08_MDL-38096_m25_manenrol' of git://github.com/skodak/moodle

8 years agoMerge branch 'MDL-38164_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 25 Feb 2013 02:43:52 +0000 (10:43 +0800)]
Merge branch 'MDL-38164_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-38061-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 25 Feb 2013 02:16:29 +0000 (10:16 +0800)]
Merge branch 'MDL-38061-master' of git://github.com/damyon/moodle

8 years agoAutomatically generated installer lang files
AMOS bot [Mon, 25 Feb 2013 00:39:44 +0000 (00:39 +0000)]
Automatically generated installer lang files

8 years agoMDL-38096 use separate manual enrol and unenrol capabilities in UI
Petr Škoda [Sun, 24 Feb 2013 12:28:48 +0000 (13:28 +0100)]
MDL-38096 use separate manual enrol and unenrol capabilities in UI

8 years agoMDL-37963 do request flatfile role mapping when adding new roles
Petr Škoda [Sun, 24 Feb 2013 11:17:16 +0000 (12:17 +0100)]
MDL-37963 do request flatfile role mapping when adding new roles

8 years agoMDL-37963 hash only given passwords in user generator
Petr Škoda [Sun, 24 Feb 2013 09:40:55 +0000 (10:40 +0100)]
MDL-37963 hash only given passwords in user generator

8 years agoMDL-38121 tell admins when plugin installed into wrong dir
Petr Škoda [Sat, 23 Feb 2013 17:16:42 +0000 (18:16 +0100)]
MDL-38121 tell admins when plugin installed into wrong dir

8 years agoMDL-33934 theme_mymobile: Updates to CSS & Javascript - including MDL-38072 removing...
Mary Evans [Sat, 23 Feb 2013 15:46:05 +0000 (15:46 +0000)]
MDL-33934 theme_mymobile: Updates to CSS & Javascript - including MDL-38072 removing css/js for collapsed topic.

The following comments is a mash of commits for reference only:

Squashed commit of the following:

commit a6ab42de71e41c0760d6d99dec7a3ec6ef8b7e52
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:34:12 2013 +0000

    MDL-33934 theme_mymobile: fixing whitspace and undoing some previous confict changes fixing where broken.

commit a5abe86fad012f2face9dbd98826583499f46b88
Merge: 89c04c2 13c3ee1
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:18:17 2013 +0000

    Merge branch 'wip-MDL-33934_master' of github.com:lazydaisy/moodle into wip-MDL-33934_master

    Conflicts:
        theme/mymobile/javascript/custom.js
        theme/mymobile/style/core.css

commit 89c04c2bee75938ba5e6f6b54f43ff866c6119b6
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sat Feb 23 15:01:43 2013 +0000

    MDL-33934 theme_mymobile: Removed collapsed topic contributed plugin css/js from style/core.css & javascript/custom.js

commit ddee12ebd2083af0ebebd747e867957d46a10af7
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Feb 19 11:05:35 2013 +0000

    MDL-33934 theme-mymobile: un-commenting $(document).ready(function() in javascript/custom.js.

commit 365bb2d9772f9fd2cb55139f728fa9611dac7b4d
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun Feb 17 17:41:47 2013 +0000

    MDL-33934 theme_mymobile: updates to javascript and css

commit 13c3ee133945ce0e2a55dd54e0c8b8e2a35f76c5
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Tue Feb 19 11:05:35 2013 +0000

    MDL-33934 theme-mymobile: un-commenting $(document).ready(function() in javascript/custom.js.

commit c9e626adf810e3d8d3f776b99d648017033fdb39
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Sun Feb 17 17:41:47 2013 +0000

    MDL-33934 theme_mymobile: updates to javascript and css

8 years agoMDL-38154 improve dir delete performance
Petr Škoda [Sat, 23 Feb 2013 14:10:48 +0000 (15:10 +0100)]
MDL-38154 improve dir delete performance