moodle.git
7 years agoMDL-49412 navigation: Remove redundant reports node
Ankit Agarwal [Tue, 31 Mar 2015 05:22:26 +0000 (10:52 +0530)]
MDL-49412 navigation: Remove redundant reports node

Part of MDL-45774.

7 years agoMDL-49412 report_usersessions: Fix behat failures
Ankit Agarwal [Tue, 31 Mar 2015 05:18:23 +0000 (10:48 +0530)]
MDL-49412 report_usersessions: Fix behat failures

Part of MDL-45774.

7 years agoMDL-49412 report_participation: Fix behat failures
Ankit Agarwal [Mon, 30 Mar 2015 08:34:05 +0000 (14:04 +0530)]
MDL-49412 report_participation: Fix behat failures

Part of MDL-45774.

7 years agoMDL-49412 report_log: Fix behat failures
Ankit Agarwal [Mon, 30 Mar 2015 08:04:49 +0000 (13:34 +0530)]
MDL-49412 report_log: Fix behat failures

Part of MDL-45774.

7 years agoMDL-49412 report_loglive: Fix behat failures
Ankit Agarwal [Mon, 30 Mar 2015 06:56:29 +0000 (12:26 +0530)]
MDL-49412 report_loglive: Fix behat failures

Part of MDL-45774.

7 years agoMDL-49412 behat: I am on site homepage behat step
Ankit Agarwal [Mon, 30 Mar 2015 06:55:50 +0000 (12:25 +0530)]
MDL-49412 behat: I am on site homepage behat step

Part of MDL-45774.

7 years agoMDL-49412 Behat: Add a 'I follow "x" in the user menu step'
Damyon Wiese [Thu, 2 Apr 2015 07:38:28 +0000 (15:38 +0800)]
MDL-49412 Behat: Add a 'I follow "x" in the user menu step'

Part of MDL-45774.

7 years agoMDL-49726 navigation: Update event monitor subscription.
Adrian Greeve [Wed, 1 Apr 2015 09:12:13 +0000 (17:12 +0800)]
MDL-49726 navigation: Update event monitor subscription.

It is now possible for users with the right permissions
to subscribe to events. The link is on the preferences page.

Part of MDL-45774.

7 years agoMDL-45774 Navigation: Add upgrade step to change defaulthomepage
Damyon Wiese [Wed, 8 Apr 2015 05:30:23 +0000 (13:30 +0800)]
MDL-45774 Navigation: Add upgrade step to change defaulthomepage

7 years agoMDL-45774 navigation: Deprecation of useredit_shared_definition_preferences.
Adrian Greeve [Wed, 8 Apr 2015 05:22:49 +0000 (13:22 +0800)]
MDL-45774 navigation: Deprecation of useredit_shared_definition_preferences.

7 years agoMDL-49688 navigation: First review fixes and version bump.
Adrian Greeve [Fri, 27 Mar 2015 08:17:30 +0000 (16:17 +0800)]
MDL-49688 navigation: First review fixes and version bump.

Part of MDL-45774.

7 years agoMDL-49688 navigation: Update to overview report and my index.
Adrian Greeve [Fri, 27 Mar 2015 08:16:58 +0000 (16:16 +0800)]
MDL-49688 navigation: Update to overview report and my index.

Part of MDL-45774.

7 years agoMDL-49688 navigation: CSS compilation update.
Adrian Greeve [Fri, 27 Mar 2015 08:15:37 +0000 (16:15 +0800)]
MDL-49688 navigation: CSS compilation update.

Part of MDL-45774.

7 years agoMDL-45898 myprofile: Redesign my profile page
Ankit Agarwal [Tue, 7 Apr 2015 02:07:20 +0000 (10:07 +0800)]
MDL-45898 myprofile: Redesign my profile page

Part of MDL-45774.

Contributions by John Okely, Jetha Chan and Damyon Wiese (squashed branch).

AMOS BEGIN
CPY [coursebadges,core_badges], [badges,core_badges]
AMOS END

7 years agoMDL-49632 User preferences: Move preferences out of edit profile form.
Damyon Wiese [Wed, 8 Apr 2015 05:07:46 +0000 (13:07 +0800)]
MDL-49632 User preferences: Move preferences out of edit profile form.
This is a super confusing place to change your default text editor. Lets
make these things easy to find.

Part of MDL-45774

7 years agoMDL-49634 navigation: My grades now relevant to teachers.
Adrian Greeve [Tue, 24 Mar 2015 06:40:31 +0000 (14:40 +0800)]
MDL-49634 navigation: My grades now relevant to teachers.

My grades was originally only showing grades to a student.
Now the report will also show teachers what courses they are
teachers in.

Part of MDL-45774.

7 years agoMDL-49605 navigation: Permissions updated for blog preferences.
Adrian Greeve [Thu, 26 Mar 2015 06:51:12 +0000 (14:51 +0800)]
MDL-49605 navigation: Permissions updated for blog preferences.

Permissions are now being checked before displaying a link to blog
preference pages.

Part of MDL-45774.

7 years agoMDL-49630 admin: defaulthomepage changed to dashboard.
Adrian Greeve [Thu, 26 Mar 2015 05:48:12 +0000 (13:48 +0800)]
MDL-49630 admin: defaulthomepage changed to dashboard.

Part of MDL-45774.

7 years agoMDL-49635 Navigation: Site pages consistent headers + navigation for preferences
Damyon Wiese [Tue, 24 Mar 2015 07:10:51 +0000 (15:10 +0800)]
MDL-49635 Navigation: Site pages consistent headers + navigation for preferences

Preferences pages cancel and continue buttons should lead back to preferences page.

Site pages should have consistent headers and breadcrumbs.

Hide the "Preferences" node in the navigation.

Part of MDL-45774

7 years agoMDL-48935 navigation: Update the user nav breadcrumbs.
Adrian Greeve [Thu, 19 Mar 2015 02:59:27 +0000 (10:59 +0800)]
MDL-48935 navigation: Update the user nav breadcrumbs.

Part of MDL-45774.

7 years agoMDL-48931 navigation: Update to context header renderer.
Adrian Greeve [Tue, 17 Mar 2015 05:50:38 +0000 (13:50 +0800)]
MDL-48931 navigation: Update to context header renderer.

Update to the context_header render to include the messaging
JavaScript. Also updates to profile pages to remove duplicated
code.

Part of MDL-45774

7 years agoMDL-48931 navigation: Update grade lib for the user context header.
Adrian Greeve [Thu, 5 Mar 2015 08:51:31 +0000 (16:51 +0800)]
MDL-48931 navigation: Update grade lib for the user context header.

Part of MDL-45774

7 years agoMDL-48931 navigation: Implement the user subheader.
Adrian Greeve [Thu, 5 Mar 2015 03:45:29 +0000 (11:45 +0800)]
MDL-48931 navigation: Implement the user subheader.

Part of MDL-45774

7 years agoMDL-48930 navigation: Update to forum page headers.
Adrian Greeve [Fri, 20 Mar 2015 02:55:03 +0000 (10:55 +0800)]
MDL-48930 navigation: Update to forum page headers.

The forum posts and discussion headers have been updated
to use the course full name instead of the short name to
match other pages.

Part of MDL-45774.

7 years agoMDL-48930 navigation: Using user headers in user pages.
Adrian Greeve [Mon, 16 Mar 2015 05:13:07 +0000 (13:13 +0800)]
MDL-48930 navigation: Using user headers in user pages.

Pages that are percieved to be in a user context are now
using a user context for the header.

Part of MDL-45774

7 years agoMDL-48934 navigation: Update the default entries in the user menu.
Damyon Wiese [Tue, 17 Mar 2015 05:18:19 +0000 (13:18 +0800)]
MDL-48934 navigation: Update the default entries in the user menu.

Add mypreferences and remove mybadges and myfiles (You should get to the
last 2 through your dashboard).

Part of MDL-45774

7 years agoMDL-45894 navigation: New setting had null default (shows on new install page)
Damyon Wiese [Tue, 17 Mar 2015 03:59:45 +0000 (11:59 +0800)]
MDL-45894 navigation: New setting had null default (shows on new install page)

Change default to ''

Part of MDL-45774

7 years agoMDL-45896 navigation: CSS and renderer improvements.
Adrian Greeve [Wed, 8 Apr 2015 04:45:46 +0000 (12:45 +0800)]
MDL-45896 navigation: CSS and renderer improvements.

Part of MDL-45774.

7 years agoMDL-45896 navigation: CSS for the context header.
Jetha Chan [Thu, 26 Feb 2015 02:13:27 +0000 (10:13 +0800)]
MDL-45896 navigation: CSS for the context header.

Part of MDL-45774

7 years agoMDL-45896 navigation: Created a user context header.
Adrian Greeve [Tue, 17 Feb 2015 05:35:02 +0000 (13:35 +0800)]
MDL-45896 navigation: Created a user context header.

Part of MDL-45774

7 years agoMDL-48932 myprofile: Add tests for the profile apis
Ankit Agarwal [Thu, 26 Feb 2015 04:08:08 +0000 (09:38 +0530)]
MDL-48932 myprofile: Add tests for the profile apis

7 years agoMDL-48932 myprofile: Add apis to make my profile pluggable
Ankit Agarwal [Wed, 25 Feb 2015 09:05:34 +0000 (14:35 +0530)]
MDL-48932 myprofile: Add apis to make my profile pluggable

7 years agoMDL-45902 repository: Improving breadcrumb and title of manage page
Frederic Massart [Wed, 25 Feb 2015 15:24:10 +0000 (16:24 +0100)]
MDL-45902 repository: Improving breadcrumb and title of manage page

Part of MDL-45774

7 years agoMDL-45902 navigation: Moving repositories to the preferences
Frederic Massart [Wed, 25 Feb 2015 15:23:21 +0000 (16:23 +0100)]
MDL-45902 navigation: Moving repositories to the preferences

Part of MDL-45774

7 years agoMDL-45895 user: Preferences page presence in the navigation
Frederic Massart [Fri, 6 Feb 2015 07:25:26 +0000 (15:25 +0800)]
MDL-45895 user: Preferences page presence in the navigation

Part of MDL-45774

7 years agoMDL-45895 user: Re-organise orphans nodes on the preferences page
Frederic Massart [Fri, 6 Feb 2015 06:24:30 +0000 (14:24 +0800)]
MDL-45895 user: Re-organise orphans nodes on the preferences page

Part of MDL-45774

7 years agoMDL-45895 user: Scaffold of the new preferences page
Frederic Massart [Fri, 30 Jan 2015 10:24:18 +0000 (18:24 +0800)]
MDL-45895 user: Scaffold of the new preferences page

Part of MDL-45774

7 years agoMDL-45894 navigation: Behat tests for user navigation.
Adrian Greeve [Tue, 10 Feb 2015 07:03:37 +0000 (15:03 +0800)]
MDL-45894 navigation: Behat tests for user navigation.

Part of MDL-45774

7 years agoMDL-45894 navigation: My grades update to overview report.
Adrian Greeve [Thu, 5 Feb 2015 06:22:34 +0000 (14:22 +0800)]
MDL-45894 navigation: My grades update to overview report.

Part of MDL-45774

7 years agoMDL-48936 lang: Changed "My Home" to "Dashboard".
Dave Cooper [Fri, 30 Jan 2015 08:34:21 +0000 (16:34 +0800)]
MDL-48936 lang: Changed "My Home" to "Dashboard".

Part of MDL-45774

7 years agoweekly release 2.9dev
Dan Poltawski [Thu, 9 Apr 2015 09:26:56 +0000 (10:26 +0100)]
weekly release 2.9dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 9 Apr 2015 09:26:54 +0000 (10:26 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMDL-49642 mod_lesson: fix restore of overrides
Jean-Michel Vedrine [Thu, 9 Apr 2015 06:49:53 +0000 (08:49 +0200)]
MDL-49642 mod_lesson: fix restore of overrides

7 years agoMDL-48159 mod_assign: Use proper step to navigate to homepage
Rajesh Taneja [Thu, 9 Apr 2015 03:13:33 +0000 (11:13 +0800)]
MDL-48159 mod_assign: Use proper step to navigate to homepage

7 years agoMDL-48159 mod_assign: Fixed behat to pass on chrome
Rajesh Taneja [Thu, 9 Apr 2015 03:07:22 +0000 (11:07 +0800)]
MDL-48159 mod_assign: Fixed behat to pass on chrome

Chrome driver doesn't support clicking on
link which wrap on multiple lines. In this
case link is wrapped in navigation block
and was failing on chrome.

7 years agoMerge branch 'MDL-49519_eloy_addenda' of https://github.com/stronk7/moodle
Dan Poltawski [Wed, 8 Apr 2015 19:22:53 +0000 (20:22 +0100)]
Merge branch 'MDL-49519_eloy_addenda' of https://github.com/stronk7/moodle

7 years agoMDL-49519 Google API: use autoload everywhere
Eloy Lafuente (stronk7) [Wed, 8 Apr 2015 17:28:50 +0000 (19:28 +0200)]
MDL-49519 Google API: use autoload everywhere

Update core (repository & portfolio) to use autoload facilities,
getting rid of not-needed-anymore requires.

Clarify a bit the readme_moodle information and expected use.

7 years agoMDL-49519 Google API: remove old stuff
Eloy Lafuente (stronk7) [Wed, 8 Apr 2015 17:23:26 +0000 (19:23 +0200)]
MDL-49519 Google API: remove old stuff

7 years agoMerge branch 'MDL-49684-fix' of https://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 8 Apr 2015 15:05:51 +0000 (17:05 +0200)]
Merge branch 'MDL-49684-fix' of https://github.com/danpoltawski/moodle

7 years agoMDL-40988 quiz: fix bug when editing default heading on blank quiz
M Kassaei [Wed, 8 Apr 2015 11:27:10 +0000 (12:27 +0100)]
MDL-40988 quiz: fix bug when editing default heading on blank quiz

7 years agoMDL-49684 calendar: fix timezone reseting.
Dan Poltawski [Wed, 8 Apr 2015 11:22:25 +0000 (12:22 +0100)]
MDL-49684 calendar: fix timezone reseting.

7 years agoMerge branch 'MDL-49642' of git://github.com/jmvedrine/moodle
Dan Poltawski [Wed, 8 Apr 2015 07:57:15 +0000 (08:57 +0100)]
Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle

7 years agoMDL-49642 mod_lesson: fix backup of user overrides
Jean-Michel Vedrine [Wed, 8 Apr 2015 07:21:44 +0000 (09:21 +0200)]
MDL-49642 mod_lesson: fix backup of user overrides

7 years agoMerge branch 'MDL-49604-master' of git://github.com/damyon/moodle
Andrew Nicols [Wed, 8 Apr 2015 04:44:07 +0000 (12:44 +0800)]
Merge branch 'MDL-49604-master' of git://github.com/damyon/moodle

7 years agoMDL-49604 Javascript: Add a localstorage cache for strings and templates
Damyon Wiese [Sun, 22 Mar 2015 13:53:21 +0000 (21:53 +0800)]
MDL-49604 Javascript: Add a localstorage cache for strings and templates

7 years agoMDL-37984 portfolio: fixed path to Drive.php
Rajesh Taneja [Wed, 8 Apr 2015 03:55:50 +0000 (11:55 +0800)]
MDL-37984 portfolio: fixed path to Drive.php

7 years agoMerge branch 'MDL-49687-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 8 Apr 2015 01:34:37 +0000 (09:34 +0800)]
Merge branch 'MDL-49687-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-49687 enrol: Add behat tests for adding multiple groups
Andrew Nicols [Wed, 8 Apr 2015 01:24:57 +0000 (09:24 +0800)]
MDL-49687 enrol: Add behat tests for adding multiple groups

7 years agoMerge branch 'wip-MDL-49694-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Wed, 8 Apr 2015 00:37:34 +0000 (08:37 +0800)]
Merge branch 'wip-MDL-49694-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-15187-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 8 Apr 2015 00:33:11 +0000 (08:33 +0800)]
Merge branch 'MDL-15187-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-15187 tool_uploaduser: assign system roles from CSV
Stephen Parry [Mon, 6 Apr 2015 11:36:35 +0000 (12:36 +0100)]
MDL-15187 tool_uploaduser: assign system roles from CSV

Added feature to assign/unassign system roles stored in the CSV fields
sysrole1, sysrole2... Roles to be unassigned are prefixed with minus.

7 years agoMDL-49519 libraries: Update references to new Google API library
Dave Cooper [Thu, 2 Apr 2015 08:07:13 +0000 (16:07 +0800)]
MDL-49519 libraries: Update references to new Google API library

7 years agoMDL-49519 libraries: Updated google-api-php-client to 1.1.2
Dave Cooper [Tue, 24 Mar 2015 05:09:48 +0000 (13:09 +0800)]
MDL-49519 libraries: Updated google-api-php-client to 1.1.2

7 years agoMDL-49499 wrong merge: bump version to avoid "old code" problems
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 23:03:43 +0000 (01:03 +0200)]
MDL-49499 wrong merge: bump version to avoid "old code" problems

Because of a wrong merge, main $version (in version.php) was
reverted from 20150407 back to 20150402, leading to messages
about running older code than version in DB. By bumping main
$versionto 20150408 all problems should be left behind.

7 years agoMerge branch 'MDL-49730-master-workshop-width' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 7 Apr 2015 19:26:15 +0000 (20:26 +0100)]
Merge branch 'MDL-49730-master-workshop-width' of git://github.com/mudrd8mz/moodle

7 years agoMerge branch 'MDL-49347-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 7 Apr 2015 19:25:28 +0000 (20:25 +0100)]
Merge branch 'MDL-49347-master' of git://github.com/jleyva/moodle

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

7 years agoMDL-49347 rating: Unit tests for core_rating_get_item_ratings
Juan Leyva [Thu, 2 Apr 2015 14:34:21 +0000 (16:34 +0200)]
MDL-49347 rating: Unit tests for core_rating_get_item_ratings

7 years agoMDL-49347 rating: Several fixes and code clean up
Juan Leyva [Wed, 1 Apr 2015 19:45:52 +0000 (21:45 +0200)]
MDL-49347 rating: Several fixes and code clean up

- Use correct return values types
- Fix the warnings declaration
- Fix the pluginfile URL

7 years agoMerge branch 'MDL-48159' of https://github.com/andrewhancox/moodle
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 17:13:56 +0000 (19:13 +0200)]
Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 7 Apr 2015 16:04:12 +0000 (00:04 +0800)]
Automatically generated installer lang files

7 years agoMerge branch 'MDL-49500-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 7 Apr 2015 15:44:41 +0000 (16:44 +0100)]
Merge branch 'MDL-49500-master' of git://github.com/jleyva/moodle

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

7 years agoMerge branch 'MDL-49499-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 15:29:15 +0000 (17:29 +0200)]
Merge branch 'MDL-49499-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'master_MDL-49638' of git://github.com/icefresh89/moodle
Dan Poltawski [Tue, 7 Apr 2015 15:24:20 +0000 (16:24 +0100)]
Merge branch 'master_MDL-49638' of git://github.com/icefresh89/moodle

7 years agoMerge branch 'MDL-49747-task-error-improvement' of https://github.com/brendanheywood...
Dan Poltawski [Tue, 7 Apr 2015 15:13:46 +0000 (16:13 +0100)]
Merge branch 'MDL-49747-task-error-improvement' of https://github.com/brendanheywood/moodle

7 years agoMerge branch 'MDL-41608-master' of git://github.com/jethac/moodle
Dan Poltawski [Tue, 7 Apr 2015 14:40:06 +0000 (15:40 +0100)]
Merge branch 'MDL-41608-master' of git://github.com/jethac/moodle

7 years agoMDL-40988 quiz: behat fix from Raj
Dan Poltawski [Tue, 7 Apr 2015 14:38:34 +0000 (15:38 +0100)]
MDL-40988 quiz: behat fix from Raj

7 years agoMerge branch 'MDL-49736_master' of git://github.com/markn86/moodle
Damyon Wiese [Tue, 7 Apr 2015 13:42:39 +0000 (21:42 +0800)]
Merge branch 'MDL-49736_master' of git://github.com/markn86/moodle

7 years agoMDL-48159 mod_assign: Added setting preventsubmissionnotingroup
Andrew Hancox [Fri, 13 Mar 2015 11:23:35 +0000 (11:23 +0000)]
MDL-48159 mod_assign: Added setting preventsubmissionnotingroup

If enabled a user will be unable to make a submission unless they are a
member of a group.

7 years agoMDL-49638 login: Wrong location of reCAPTCHA on signup page
Michael Elbert [Wed, 25 Mar 2015 13:38:30 +0000 (09:38 -0400)]
MDL-49638 login: Wrong location of reCAPTCHA on signup page

7 years agoMerge branch 'MDL-49503-master' of git://github.com/jleyva/moodle
Damyon Wiese [Tue, 7 Apr 2015 12:28:23 +0000 (20:28 +0800)]
Merge branch 'MDL-49503-master' of git://github.com/jleyva/moodle

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

7 years agoMerge branch 'MDL-48205_master' of https://github.com/totara/openbadges
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 12:20:48 +0000 (14:20 +0200)]
Merge branch 'MDL-48205_master' of https://github.com/totara/openbadges

7 years agoMerge branch 'MDL-49065_m29v6' of https://github.com/sbourget/moodle
Eloy Lafuente (stronk7) [Tue, 7 Apr 2015 12:15:33 +0000 (14:15 +0200)]
Merge branch 'MDL-49065_m29v6' of https://github.com/sbourget/moodle

7 years agoMerge branch 'MDL-49740-locking-bugs' of https://github.com/brendanheywood/moodle
Dan Poltawski [Tue, 7 Apr 2015 12:08:41 +0000 (13:08 +0100)]
Merge branch 'MDL-49740-locking-bugs' of https://github.com/brendanheywood/moodle

7 years agoMerge branch 'MDL-49677' of https://github.com/sleperf/moodle
Dan Poltawski [Tue, 7 Apr 2015 10:28:35 +0000 (11:28 +0100)]
Merge branch 'MDL-49677' of https://github.com/sleperf/moodle

7 years agoMDL-49504 notes: fix trailing whitespace
Dan Poltawski [Tue, 7 Apr 2015 10:17:44 +0000 (11:17 +0100)]
MDL-49504 notes: fix trailing whitespace

7 years agoMerge branch 'MDL-49504-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 7 Apr 2015 10:17:04 +0000 (11:17 +0100)]
Merge branch 'MDL-49504-master' of git://github.com/jleyva/moodle

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

7 years agoMerge branch 'MDL-49101' of https://github.com/andrewhancox/moodle
Damyon Wiese [Tue, 7 Apr 2015 09:26:24 +0000 (17:26 +0800)]
Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle

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

7 years agoMDL-49101 core: Add a global admin setting config->requiremodintro
Andrew Hancox [Tue, 17 Mar 2015 09:28:16 +0000 (09:28 +0000)]
MDL-49101 core: Add a global admin setting config->requiremodintro

Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements

7 years agoMerge branch 'MDL-49501-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 7 Apr 2015 09:03:28 +0000 (10:03 +0100)]
Merge branch 'MDL-49501-master' of git://github.com/jleyva/moodle

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

7 years agoMerge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle
David Monllao [Tue, 7 Apr 2015 08:25:07 +0000 (16:25 +0800)]
Merge branch 'MDL-43558_master' of git://github.com/dmonllao/moodle

7 years agoMDL-49395 core: add more unit tests for get_enrolled_sql
Andrew Nicols [Tue, 7 Apr 2015 07:17:38 +0000 (15:17 +0800)]
MDL-49395 core: add more unit tests for get_enrolled_sql

7 years agoMerge branch 'suspended_userids_memory' of git://github.com/tlevi/moodle
Andrew Nicols [Tue, 7 Apr 2015 07:30:04 +0000 (15:30 +0800)]
Merge branch 'suspended_userids_memory' of git://github.com/tlevi/moodle

7 years agoMerge branch 'MDL-49498-master' of git://github.com/jleyva/moodle
Damyon Wiese [Tue, 7 Apr 2015 06:27:20 +0000 (14:27 +0800)]
Merge branch 'MDL-49498-master' of git://github.com/jleyva/moodle

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

7 years agoMDL-49694 gradebook: display proper course name in overview
Marina Glancy [Thu, 2 Apr 2015 08:40:38 +0000 (16:40 +0800)]
MDL-49694 gradebook: display proper course name in overview

7 years agoMerge branch 'MDL-49642' of git://github.com/jmvedrine/moodle
David Monllao [Tue, 7 Apr 2015 04:06:22 +0000 (12:06 +0800)]
Merge branch 'MDL-49642' of git://github.com/jmvedrine/moodle

7 years agoMerge branch 'MDL-47773-master-commentui' of git://github.com/mudrd8mz/moodle
David Monllao [Tue, 7 Apr 2015 03:34:23 +0000 (11:34 +0800)]
Merge branch 'MDL-47773-master-commentui' of git://github.com/mudrd8mz/moodle

7 years agoMDL-43558 theme_base: We don't need edit toggle if modeditingmenu is disabled
David Monllao [Tue, 7 Apr 2015 02:57:23 +0000 (10:57 +0800)]
MDL-43558 theme_base: We don't need edit toggle if modeditingmenu is disabled

7 years agoMerge branch 'MDL-37984-master' of git://github.com/mastnym/moodle
David Monllao [Tue, 7 Apr 2015 01:38:48 +0000 (09:38 +0800)]
Merge branch 'MDL-37984-master' of git://github.com/mastnym/moodle

7 years agoMDL-40988 quiz: correct install.xml inconsistency
Dan Poltawski [Mon, 6 Apr 2015 13:34:31 +0000 (14:34 +0100)]
MDL-40988 quiz: correct install.xml inconsistency

quizid should not have a default set

7 years agoMerge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle
Dan Poltawski [Mon, 6 Apr 2015 12:59:30 +0000 (13:59 +0100)]
Merge branch 'MDL-28592-master' of https://github.com/ninelanterns/moodle