moodle.git
9 years agoMDL-31000 Added comment about the importance of repository array keys and hardened...
Sam Hemelryk [Mon, 9 Jan 2012 23:21:24 +0000 (12:21 +1300)]
MDL-31000 Added comment about the importance of repository array keys and hardened new dnd repository lookup

9 years agoRevert "MDL-31000 Respect sortorder of repositories when displaying the filepicker"
Sam Hemelryk [Mon, 9 Jan 2012 23:18:34 +0000 (12:18 +1300)]
Revert "MDL-31000 Respect sortorder of repositories when displaying the filepicker"

This change was reverted because the array keys need to be the id, existing code relies on this.
This reverts commit ef72c7942e69b41296989bbbd51a0d84ee4f636b.

9 years agoMerge branch 'dragdrop-for-master' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 9 Jan 2012 22:52:09 +0000 (11:52 +1300)]
Merge branch 'dragdrop-for-master' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'wip-mdl-30608' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Mon, 9 Jan 2012 21:18:50 +0000 (22:18 +0100)]
Merge branch 'wip-mdl-30608' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-6102-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Mon, 9 Jan 2012 21:02:10 +0000 (22:02 +0100)]
Merge branch 'MDL-6102-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'MDL-30783_t2' of git://github.com/kiklop74/moodle
Eloy Lafuente (stronk7) [Mon, 9 Jan 2012 20:47:16 +0000 (21:47 +0100)]
Merge branch 'MDL-30783_t2' of git://github.com/kiklop74/moodle

9 years agoMDL-29766 Add drag and drop upload to filemanager / filepicker elements
Davo Smith [Tue, 8 Nov 2011 20:05:19 +0000 (20:05 +0000)]
MDL-29766 Add drag and drop upload to filemanager / filepicker elements

9 years agoMDL-6102 Default time format incorrectly has leading zeros on 12-hour times (e.g...
sam marshall [Tue, 3 Jan 2012 17:19:20 +0000 (17:19 +0000)]
MDL-6102 Default time format incorrectly has leading zeros on 12-hour times (e.g. 03:57 PM)

9 years agoMDL-30583 Navigation : fixed string.
Aparup Banerjee [Mon, 9 Jan 2012 06:35:38 +0000 (14:35 +0800)]
MDL-30583 Navigation : fixed string.

9 years agoMerge branch 'wip-MDL-30583-master' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Mon, 9 Jan 2012 05:44:36 +0000 (13:44 +0800)]
Merge branch 'wip-MDL-30583-master' of git://github.com/samhemelryk/moodle

9 years agoMerge branch 'w02_MDL-30718_m23_usertimedb' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 9 Jan 2012 04:18:36 +0000 (12:18 +0800)]
Merge branch 'w02_MDL-30718_m23_usertimedb' of git://github.com/skodak/moodle

9 years agoMerge branch 'w02_MDL-31005_m23_contextlevelname' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 9 Jan 2012 03:12:24 +0000 (16:12 +1300)]
Merge branch 'w02_MDL-31005_m23_contextlevelname' of git://github.com/skodak/moodle

9 years agoMDL-30608 Blocks: Fixed block disappering from search page
Sam Hemelryk [Wed, 4 Jan 2012 06:04:57 +0000 (14:04 +0800)]
MDL-30608 Blocks: Fixed block disappering from search page

9 years agoMerge branch 'w02_MDL-30944_m23_cohortenrol' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 9 Jan 2012 01:58:57 +0000 (14:58 +1300)]
Merge branch 'w02_MDL-30944_m23_cohortenrol' of git://github.com/skodak/moodle

9 years agoMerge branch 'w02_MDL-29046_m23_clidistrolib' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 9 Jan 2012 01:31:02 +0000 (02:31 +0100)]
Merge branch 'w02_MDL-29046_m23_clidistrolib' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-30031' of git://github.com/bostelm/moodle
Eloy Lafuente (stronk7) [Mon, 9 Jan 2012 01:14:20 +0000 (02:14 +0100)]
Merge branch 'MDL-30031' of git://github.com/bostelm/moodle

9 years agoMerge branch 'w02_MDL-30717_m23_usercreated' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 9 Jan 2012 01:03:10 +0000 (14:03 +1300)]
Merge branch 'w02_MDL-30717_m23_usercreated' of git://github.com/skodak/moodle

9 years agoMDL-30928 lib: Fixed whitespace
Sam Hemelryk [Mon, 9 Jan 2012 00:57:06 +0000 (13:57 +1300)]
MDL-30928 lib: Fixed whitespace

9 years agoMerge branch 'w02_MDL-30928_m23_deletetimes' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 9 Jan 2012 00:52:37 +0000 (13:52 +1300)]
Merge branch 'w02_MDL-30928_m23_deletetimes' of git://github.com/skodak/moodle

9 years agoMerge branch 'w02_MDL-30969_m23_suspendedcsv' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 9 Jan 2012 00:02:31 +0000 (13:02 +1300)]
Merge branch 'w02_MDL-30969_m23_suspendedcsv' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-30778_t2' of git://github.com/kiklop74/moodle
Eloy Lafuente (stronk7) [Sun, 8 Jan 2012 23:41:55 +0000 (00:41 +0100)]
Merge branch 'MDL-30778_t2' of git://github.com/kiklop74/moodle

9 years agoMerge branch 'MDL-30966-print-object' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Sun, 8 Jan 2012 23:33:02 +0000 (00:33 +0100)]
Merge branch 'MDL-30966-print-object' of git://github.com/mudrd8mz/moodle

9 years agoMerge branch 'master_MDL-31043' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 8 Jan 2012 23:23:11 +0000 (12:23 +1300)]
Merge branch 'master_MDL-31043' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'MDL-30635' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 8 Jan 2012 23:15:21 +0000 (00:15 +0100)]
Merge branch 'MDL-30635' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30652-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 8 Jan 2012 23:02:41 +0000 (12:02 +1300)]
Merge branch 'MDL-30652-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-31000-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Sun, 8 Jan 2012 22:52:29 +0000 (11:52 +1300)]
Merge branch 'MDL-31000-master-1' of git://git.luns.net.uk/moodle

9 years agoMDL-30583 navigation: Added setting to control display of front page activities on...
Sam Hemelryk [Tue, 6 Dec 2011 00:04:12 +0000 (13:04 +1300)]
MDL-30583 navigation: Added setting to control display of front page activities on the navigation

9 years agoMDL-31005 fix strict coding style warning in context_helper
Petr Skoda [Sun, 8 Jan 2012 14:39:03 +0000 (15:39 +0100)]
MDL-31005 fix strict coding style warning in context_helper

PHP54 compatibility

9 years agoMDL-29046 use of install/distrolib.php in the CLI installer
Aleksey Avdeev [Mon, 22 Aug 2011 15:45:58 +0000 (19:45 +0400)]
MDL-29046 use of install/distrolib.php in the CLI installer

Signed-off-by: Aleksey Avdeev <solo@altlinux.ru>
9 years agoMDL-30717 update user->timemodified in update_user_record()
Petr Skoda [Tue, 27 Dec 2011 14:54:01 +0000 (15:54 +0100)]
MDL-30717 update user->timemodified  in update_user_record()

9 years agoMDL-30717 add missing time created info in create_user_record()
Petr Skoda [Tue, 27 Dec 2011 14:34:32 +0000 (15:34 +0100)]
MDL-30717 add missing time created info in create_user_record()

Credit goes to Luis Gustavo Mueller de Alcantara.

9 years agoMDL-30718 add missing timecraeted and timeupdated, fix user undeleting
Petr Skoda [Tue, 27 Dec 2011 14:49:47 +0000 (15:49 +0100)]
MDL-30718 add missing timecraeted and timeupdated, fix user undeleting

9 years agoMDL-30928 include course and user deletion time in event
Petr Skoda [Tue, 27 Dec 2011 15:10:14 +0000 (16:10 +0100)]
MDL-30928 include course and user deletion time in event

Credit goes to Luis Gustavo Mueller de Alcantara.

9 years agoMDL-30944 improve enrol_cohort plugin
Petr Skoda [Wed, 28 Dec 2011 10:24:43 +0000 (11:24 +0100)]
MDL-30944 improve enrol_cohort plugin

List of changes:
* configurable unenrol action
* cron period increased to 1 hour in order to lower server load, courses should not get out of sync often
* CLI sync script for debugging or manual sync after configuration change
* phpdocs fixes
* when plugin is disabled all roles are removed, enrollments are kept
* uninstall script
* other bugfixing and performance improvements

9 years agoMDL-30969 add support for suspending in uploaduser admin tool
Petr Skoda [Tue, 3 Jan 2012 15:40:09 +0000 (16:40 +0100)]
MDL-30969 add support for suspending in uploaduser admin tool

9 years agoMDL-30966 print_object() output made CLI-friendly
David Mudrak [Tue, 3 Jan 2012 10:29:10 +0000 (11:29 +0100)]
MDL-30966 print_object() output made CLI-friendly

9 years agoMDL-30757 questions: kill legacy global $QUESTION_EDITTABCAPS
Tim Hunt [Thu, 15 Dec 2011 11:39:32 +0000 (11:39 +0000)]
MDL-30757 questions: kill legacy global $QUESTION_EDITTABCAPS

9 years agoMDL-30635 enable standard cron for all question and quiz plugin types.
Tim Hunt [Wed, 7 Dec 2011 16:29:49 +0000 (16:29 +0000)]
MDL-30635 enable standard cron for all question and quiz plugin types.

* Support for old non-standard cron for quiz reports dropped. (Standard
cron support was added in 2.2

* Cron support added for qbehaviour, qformat and quizacces plugins.

* qtypes were already supported in the standard way.

9 years agoMDL-31043 allow themes to set custommenu instead of using global settings
Dan Marsden [Thu, 5 Jan 2012 23:48:01 +0000 (12:48 +1300)]
MDL-31043 allow themes to set custommenu instead of using global settings

9 years agoweekly release 2.3dev (blame stronk7 for 0202 mistake)
Eloy Lafuente (stronk7) [Thu, 5 Jan 2012 14:02:23 +0000 (15:02 +0100)]
weekly release 2.3dev (blame stronk7 for 0202 mistake)

On 20120102 version was incorrectly bumped to 2012-02-02. So,
until then (< 1mo) we are going to be incrementing decimal digits
only and not date ones (first 8).

9 years agoMerge branch 'MDL-31017' of git://github.com/stronk7/moodle
Sam Hemelryk [Wed, 4 Jan 2012 22:17:31 +0000 (11:17 +1300)]
Merge branch 'MDL-31017' of git://github.com/stronk7/moodle

9 years agoMDL-31017 whitespace clean - take1
Eloy Lafuente (stronk7) [Wed, 4 Jan 2012 15:24:16 +0000 (16:24 +0100)]
MDL-31017 whitespace clean - take1

9 years agoMerge branch 'wip-MDL-26869-m23-after-MDL-26155' of git://github.com/samhemelryk...
Eloy Lafuente (stronk7) [Wed, 4 Jan 2012 02:08:24 +0000 (03:08 +0100)]
Merge branch 'wip-MDL-26869-m23-after-MDL-26155' of git://github.com/samhemelryk/moodle

9 years agoMDL-30865 Workshop method aggregate_grading_grades_process() accepts explicit aggrega...
David Mudrak [Wed, 21 Dec 2011 19:41:37 +0000 (20:41 +0100)]
MDL-30865 Workshop method aggregate_grading_grades_process() accepts explicit aggregation timestamp

9 years agoMerge branch 'MDL-30879-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 4 Jan 2012 01:14:18 +0000 (02:14 +0100)]
Merge branch 'MDL-30879-master' of git://github.com/sammarshallou/moodle

9 years agoMerge branch 'w52_MDL-30945_m23_unenrol' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 4 Jan 2012 00:51:10 +0000 (01:51 +0100)]
Merge branch 'w52_MDL-30945_m23_unenrol' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-30948_m23_messagesuspended' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jan 2012 23:47:48 +0000 (00:47 +0100)]
Merge branch 'w52_MDL-30948_m23_messagesuspended' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-30951_m23_catsync' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jan 2012 23:39:51 +0000 (00:39 +0100)]
Merge branch 'w52_MDL-30951_m23_catsync' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-29917_m23_autocomplete' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 3 Jan 2012 21:58:03 +0000 (10:58 +1300)]
Merge branch 'w52_MDL-29917_m23_autocomplete' of git://github.com/skodak/moodle

9 years agoMerged branch 'w52_MDL-30548_m23_suspenduser' of git://github.com/skodak/moodle.git...
Sam Hemelryk [Tue, 3 Jan 2012 21:50:20 +0000 (10:50 +1300)]
Merged branch 'w52_MDL-30548_m23_suspenduser' of git://github.com/skodak/moodle.git with conflict resolution

9 years agoMerge branch 'w52_MDL-30950_m23_adminblock' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jan 2012 21:33:11 +0000 (22:33 +0100)]
Merge branch 'w52_MDL-30950_m23_adminblock' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-26155-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 3 Jan 2012 16:26:31 +0000 (17:26 +0100)]
Merge branch 'wip-MDL-26155-m23' of git://github.com/samhemelryk/moodle

Conflicts:
admin/settings/security.php

9 years agoMDL-31000 Respect sortorder of repositories when displaying the filepicker
Andrew Robert Nicols [Tue, 3 Jan 2012 15:58:58 +0000 (15:58 +0000)]
MDL-31000 Respect sortorder of repositories when displaying the filepicker

9 years agoMDL-30948 do not generate new passwords for suspended accounts because they would...
Petr Skoda [Tue, 3 Jan 2012 15:47:32 +0000 (16:47 +0100)]
MDL-30948 do not generate new passwords for suspended accounts because they would not get any emails

9 years agoMDL-30548 support user suspended flag in admin UI
Petr Skoda [Tue, 3 Jan 2012 12:18:06 +0000 (13:18 +0100)]
MDL-30548 support user suspended flag in admin UI

This patch includes:
* user management suspend UI tweaks and other coding style improvements
* suspended info in user profiles
* suspend option in advanced edit form
* suspended user filtering
* hidden user fields option for suspended field

Thanks Sam Hemelryk for valuable feedback.

9 years agoMDL-30879 Course page: missing space after class for new 'description on course page...
sam marshall [Thu, 22 Dec 2011 18:12:11 +0000 (18:12 +0000)]
MDL-30879 Course page: missing space after class for new 'description on course page' feature

9 years agoMerge branch 'MDL-30600b' of git://github.com/rwijaya/moodle
Aparup Banerjee [Tue, 3 Jan 2012 09:54:14 +0000 (17:54 +0800)]
Merge branch 'MDL-30600b' of git://github.com/rwijaya/moodle

9 years agoMDL-30652 SCORM Fixing report prefrences display for interactions report
Ankit Kumar Agarwal [Tue, 3 Jan 2012 05:06:40 +0000 (10:36 +0530)]
MDL-30652 SCORM Fixing report prefrences display for interactions report

9 years agoMDL-30652 SCORM Fixing report prefrences display issue for basic report
Ankit Kumar Agarwal [Fri, 16 Dec 2011 07:56:00 +0000 (13:26 +0530)]
MDL-30652 SCORM Fixing report prefrences display issue for basic report

9 years agoMDL-30652 Scorm adding proper comments
Ankit Kumar Agarwal [Thu, 15 Dec 2011 06:03:18 +0000 (11:33 +0530)]
MDL-30652 Scorm adding proper comments

9 years agoMDL-30600 Fix mymobile theme choice renderer
Rossiani Wijaya [Tue, 3 Jan 2012 05:05:55 +0000 (13:05 +0800)]
MDL-30600 Fix mymobile theme choice renderer

9 years agoMerge branch 'wip-mdl-29844' of git://github.com/rajeshtaneja/moodle.git - resolved...
Aparup Banerjee [Tue, 3 Jan 2012 04:29:12 +0000 (12:29 +0800)]
Merge branch 'wip-mdl-29844' of git://github.com/rajeshtaneja/moodle.git - resolved conflict

9 years agoMDL-29844 Administration: Added new config for users to login for viewing profile...
Eloy Lafuente [Mon, 12 Dec 2011 04:33:54 +0000 (12:33 +0800)]
MDL-29844 Administration: Added new config for users to login for viewing profile image

9 years agoMerge branch 'w52_MDL-30786_m23_todelete' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 3 Jan 2012 03:35:36 +0000 (16:35 +1300)]
Merge branch 'w52_MDL-30786_m23_todelete' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-30673_m23_loginautocomplete' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 3 Jan 2012 01:08:50 +0000 (14:08 +1300)]
Merge branch 'w52_MDL-30673_m23_loginautocomplete' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-30809_m23_guestinstance' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 3 Jan 2012 00:05:22 +0000 (13:05 +1300)]
Merge branch 'w52_MDL-30809_m23_guestinstance' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-30924_m23_pspell' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 2 Jan 2012 23:49:06 +0000 (12:49 +1300)]
Merge branch 'w52_MDL-30924_m23_pspell' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-30926_m23_blogassoc' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 2 Jan 2012 23:38:51 +0000 (12:38 +1300)]
Merge branch 'w52_MDL-30926_m23_blogassoc' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-30934_m23_modules' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 2 Jan 2012 23:26:14 +0000 (12:26 +1300)]
Merge branch 'w52_MDL-30934_m23_modules' of git://github.com/skodak/moodle

9 years agoMerge branch 'w52_MDL-30943_m23_adminreport' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 2 Jan 2012 23:22:44 +0000 (12:22 +1300)]
Merge branch 'w52_MDL-30943_m23_adminreport' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-30802' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 2 Jan 2012 22:26:02 +0000 (11:26 +1300)]
Merge branch 'MDL-30802' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30766' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 2 Jan 2012 22:23:13 +0000 (11:23 +1300)]
Merge branch 'MDL-30766' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-30168_tim2' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 2 Jan 2012 22:15:04 +0000 (11:15 +1300)]
Merge branch 'MDL-30168_tim2' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-27200' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 2 Jan 2012 22:12:14 +0000 (11:12 +1300)]
Merge branch 'MDL-27200' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-29266' of git://github.com/bostelm/moodle
Sam Hemelryk [Mon, 2 Jan 2012 22:09:19 +0000 (11:09 +1300)]
Merge branch 'MDL-29266' of git://github.com/bostelm/moodle

9 years agoMerge branch 'w52_MDL-13572_m23_messaging' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 2 Jan 2012 22:00:42 +0000 (11:00 +1300)]
Merge branch 'w52_MDL-13572_m23_messaging' of git://github.com/skodak/moodle

9 years agoMDL-13572 fix incorrect value printing
Petr Skoda [Mon, 2 Jan 2012 21:52:04 +0000 (22:52 +0100)]
MDL-13572 fix incorrect value printing

9 years agoMDL-13572 fix incorrect value printing
Petr Skoda [Mon, 2 Jan 2012 21:51:38 +0000 (22:51 +0100)]
MDL-13572 fix incorrect value printing

9 years agoMerge branch 'MDL-30868' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 2 Jan 2012 21:38:04 +0000 (10:38 +1300)]
Merge branch 'MDL-30868' of git://github.com/lazydaisy/moodle

9 years agoMDL-13572 do not send emails to invalid addresses
Petr Skoda [Mon, 2 Jan 2012 21:36:37 +0000 (22:36 +0100)]
MDL-13572 do not send emails to invalid addresses

9 years agoMerge branch 'MDL-30601' of git://github.com/rwijaya/moodle
Sam Hemelryk [Mon, 2 Jan 2012 21:30:41 +0000 (10:30 +1300)]
Merge branch 'MDL-30601' of git://github.com/rwijaya/moodle

9 years agoMerge branch 'MDL-29821' of git://github.com/bostelm/moodle
Sam Hemelryk [Mon, 2 Jan 2012 21:11:58 +0000 (10:11 +1300)]
Merge branch 'MDL-29821' of git://github.com/bostelm/moodle

9 years agoMerge branch 'MDL-30706' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 2 Jan 2012 21:09:11 +0000 (10:09 +1300)]
Merge branch 'MDL-30706' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-30804-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 2 Jan 2012 21:06:20 +0000 (10:06 +1300)]
Merge branch 'MDL-30804-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-30805-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 2 Jan 2012 21:02:18 +0000 (10:02 +1300)]
Merge branch 'MDL-30805-master-1' of git://git.luns.net.uk/moodle

9 years agoMerge branch 'MDL-13572_validate_email' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 2 Jan 2012 20:57:00 +0000 (09:57 +1300)]
Merge branch 'MDL-13572_validate_email' of git://github.com/andyjdavis/moodle

9 years agoMDL-26869 admin: Added page to view admin categories and included in navigation with...
Sam Hemelryk [Wed, 5 Oct 2011 22:58:22 +0000 (11:58 +1300)]
MDL-26869 admin: Added page to view admin categories and included in navigation with a new setting

9 years agoMDL-26155 admin: Rebased, fixed conflicts, and fixed final admin string
Sam Hemelryk [Mon, 2 Jan 2012 20:12:33 +0000 (09:12 +1300)]
MDL-26155 admin: Rebased, fixed conflicts, and fixed final admin string

9 years agoMDL-26155 string: Improved validation when constructing lang_strings if debugging...
Sam Hemelryk [Mon, 5 Dec 2011 22:30:12 +0000 (11:30 +1300)]
MDL-26155 string: Improved validation when constructing lang_strings if debugging is enabled

9 years agoMDL-26155 admin: Converted admin settings to use new lang_string
Sam Hemelryk [Mon, 5 Dec 2011 22:07:55 +0000 (11:07 +1300)]
MDL-26155 admin: Converted admin settings to use new lang_string

9 years agoMDL-26155 string: Implemented moodle_string class
Sam Hemelryk [Sun, 4 Dec 2011 23:07:54 +0000 (12:07 +1300)]
MDL-26155 string: Implemented moodle_string class

9 years agoMerge branch 'MDL-30851_master_wip' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2012 19:23:11 +0000 (20:23 +0100)]
Merge branch 'MDL-30851_master_wip' of git://github.com/grabs/moodle

9 years agoMerge branch 'w52_MDL-30953_m23_pspell' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2012 19:19:43 +0000 (20:19 +0100)]
Merge branch 'w52_MDL-30953_m23_pspell' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-30873' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 2 Jan 2012 19:16:02 +0000 (20:16 +0100)]
Merge branch 'MDL-30873' of git://github.com/timhunt/moodle

9 years agoMDL-30610 add missing savepoint to get the upgrade checks passing.
Eloy Lafuente (stronk7) [Mon, 2 Jan 2012 18:48:33 +0000 (19:48 +0100)]
MDL-30610 add missing savepoint to get the upgrade checks passing.

Note the savepoint is 100% unreachable, because of the exit() call.
But it's needed to have all the upgrade checks (CI) balanced and
passing.

9 years agoMDL-30610 Version bump. Time to diverge!
Eloy Lafuente (stronk7) [Mon, 2 Jan 2012 18:29:46 +0000 (19:29 +0100)]
MDL-30610 Version bump. Time to diverge!

Once all the pre 2.2 upgrade code has been deleted, we bump
main version.php to start diverging in master after the
initial 3-4 weeks of on-sync with 22_STABLE.

9 years agoMDL-30953 fix utf-8 support in PSpell class
Petr Skoda [Mon, 2 Jan 2012 11:49:09 +0000 (12:49 +0100)]
MDL-30953 fix utf-8 support in PSpell class

Credit for discover and proposed fix goes to David Hai Gootvilig, this patch is part of https://github.com/moodle/custom-tinymce_spellchecker_php/tree/MOODLE_22_2.0.6b which will be used in the next tinymce import. It was reported upstream as https://github.com/tinymce/tinymce_spellchecker_php/pull/5

9 years agoMDL-30951 prevent fatal error when category sync enrolment not configured
Petr Skoda [Sun, 1 Jan 2012 12:41:32 +0000 (13:41 +0100)]
MDL-30951 prevent fatal error when category sync enrolment not configured

9 years agoMDL-30783: Implemented fix
Darko Miletic [Fri, 30 Dec 2011 15:33:57 +0000 (12:33 -0300)]
MDL-30783: Implemented fix

9 years agoMDL-30778: Implemented intendeduserrole support
Darko Miletic [Fri, 30 Dec 2011 15:16:59 +0000 (12:16 -0300)]
MDL-30778: Implemented intendeduserrole support