moodle.git
8 years agoMDL-45961 user profile: track user on reset
Eloy Lafuente (stronk7) [Tue, 1 Jul 2014 17:19:59 +0000 (19:19 +0200)]
MDL-45961 user profile: track user on reset

It seems that redirect (after reset button) was also
missing the userid so the user track was lost.

8 years agoMerge branch 'MDL-45961' of https://github.com/NeillM/moodle
Eloy Lafuente (stronk7) [Tue, 1 Jul 2014 17:13:43 +0000 (19:13 +0200)]
Merge branch 'MDL-45961' of https://github.com/NeillM/moodle

8 years agoMerge branch 'MDL-46063_master' of git://github.com/schach/moodle
Dan Poltawski [Tue, 1 Jul 2014 16:29:14 +0000 (17:29 +0100)]
Merge branch 'MDL-46063_master' of git://github.com/schach/moodle

8 years agoMerge branch 'MDL-46036_survey' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 1 Jul 2014 14:58:11 +0000 (15:58 +0100)]
Merge branch 'MDL-46036_survey' of https://github.com/andyjdavis/moodle

8 years agoMerge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 1 Jul 2014 14:41:04 +0000 (15:41 +0100)]
Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle

8 years agoMDL-42071 caching Skip memcache(d) tests if no servers defined
Eric Merrill [Tue, 1 Jul 2014 14:25:10 +0000 (10:25 -0400)]
MDL-42071 caching Skip memcache(d) tests if no servers defined

8 years agoMerge branch 'MDL-46107_master' of https://github.com/totara/openbadges
Dan Poltawski [Tue, 1 Jul 2014 13:20:44 +0000 (14:20 +0100)]
Merge branch 'MDL-46107_master' of https://github.com/totara/openbadges

8 years agoMerge branch 'MDL-46163_category_selector_renders_as_nested_form' of https://github...
Dan Poltawski [Tue, 1 Jul 2014 13:16:04 +0000 (14:16 +0100)]
Merge branch 'MDL-46163_category_selector_renders_as_nested_form' of https://github.com/MorrisR2/moodle

8 years agoMerge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle
Dan Poltawski [Tue, 1 Jul 2014 12:37:56 +0000 (13:37 +0100)]
Merge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle

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

8 years agoMerge branch 'MDL-46093' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 1 Jul 2014 09:53:59 +0000 (10:53 +0100)]
Merge branch 'MDL-46093' of git://github.com/timhunt/moodle

8 years agoMerge branch 'wip_MDL-46099_m28_userglobal' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 1 Jul 2014 09:39:14 +0000 (10:39 +0100)]
Merge branch 'wip_MDL-46099_m28_userglobal' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-32450_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 1 Jul 2014 09:37:50 +0000 (10:37 +0100)]
Merge branch 'MDL-32450_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-40457-question_bank_plugins_columns' of git://github.com/MorrisR2...
Dan Poltawski [Tue, 1 Jul 2014 09:12:52 +0000 (10:12 +0100)]
Merge branch 'MDL-40457-question_bank_plugins_columns' of git://github.com/MorrisR2/moodle

8 years agoMerge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Mon, 30 Jun 2014 23:27:53 +0000 (11:27 +1200)]
Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle

8 years agoMerge branch 'MDL-40805-master' of git://github.com/lameze/moodle
Sam Hemelryk [Mon, 30 Jun 2014 21:06:12 +0000 (09:06 +1200)]
Merge branch 'MDL-40805-master' of git://github.com/lameze/moodle

8 years agoMDL-46099 session: fix use of references for session globals
Petr Skoda [Mon, 23 Jun 2014 22:48:28 +0000 (10:48 +1200)]
MDL-46099 session: fix use of references for session globals

This reverses the references used for global $USER and $SESSION,
the reason is that PHP does not allow references to references.
$USER is a reference to $GLOBALS['USER'] which means we cannot
put any references to it. Solution is to store the current user and session
objects in $GLOBALS['USER'] and $GLOBALS['SESSIOn'] are reference
them in $_SESSION.

This patch makes the session code behave the same way in CLI,
phpunit and normal web requests - this allows use to finally
unit test most aspects of the session code in Moodle.

8 years agoMerge branch 'MDL-46118_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 30 Jun 2014 20:33:13 +0000 (08:33 +1200)]
Merge branch 'MDL-46118_master' of git://github.com/dmonllao/moodle

8 years agoMDL-32450 editor_tinymce: documented removal of DragMath
Mark Nelson [Mon, 23 Jun 2014 20:28:19 +0000 (13:28 -0700)]
MDL-32450 editor_tinymce: documented removal of DragMath

8 years agoMDL-32450 editor_tinymce: removed DragMath from the 'customtoolbar' setting
Mark Nelson [Mon, 23 Jun 2014 20:34:48 +0000 (13:34 -0700)]
MDL-32450 editor_tinymce: removed DragMath from the 'customtoolbar' setting

8 years agoMerge branch 'wip-mdl-45641' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 30 Jun 2014 14:12:30 +0000 (15:12 +0100)]
Merge branch 'wip-mdl-45641' of https://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-42467_database' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 30 Jun 2014 14:08:59 +0000 (15:08 +0100)]
Merge branch 'MDL-42467_database' of https://github.com/andyjdavis/moodle

8 years agoMerge branch 'MDL-45833_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Jun 2014 12:27:14 +0000 (13:27 +0100)]
Merge branch 'MDL-45833_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'MDL-46044-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 30 Jun 2014 10:45:29 +0000 (11:45 +0100)]
Merge branch 'MDL-46044-master' of git://github.com/damyon/moodle

8 years agoMDL-46063 feedback: Fix user pictures
Heiko Schach [Tue, 24 Jun 2014 12:45:24 +0000 (15:45 +0300)]
MDL-46063 feedback: Fix user pictures

8 years agoMerge branch 'MDL-41663-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 30 Jun 2014 08:24:39 +0000 (09:24 +0100)]
Merge branch 'MDL-41663-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-40228-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 30 Jun 2014 07:55:35 +0000 (08:55 +0100)]
Merge branch 'MDL-40228-master' of git://github.com/FMCorz/moodle

8 years agoMDL-42071 caching Support for clustered memcache caching
Eric Merrill [Mon, 30 Jun 2014 02:28:14 +0000 (22:28 -0400)]
MDL-42071 caching Support for clustered memcache caching

For stores where there is a very high rate of sets compared to gets, it
is beneficial to retrieve from the local server, skipping the network
overhead, at the expense of having to set many severs when a key is set.

This patch adds a memcache option to enable clustering. When on, only
one "server" is allowed, which will be where fetches are from, while
sets/updates/deletes/purges will occur to the all the servers in the
"set server" list.

To run unit tests, define TEST_CACHESTORE_MEMCACHE_TESTSERVERS with
multiple (return delimited) servers.

8 years agoMDL-42071 caching Support for clustered memcached caching
Eric Merrill [Thu, 1 May 2014 21:00:26 +0000 (17:00 -0400)]
MDL-42071 caching Support for clustered memcached caching

For stores where there is a very high rate of sets compared to gets, it
is beneficial to retrieve from the local server, skipping the network
overhead, at the expense of having to set many severs when a key is set.

This patch adds a memcached option to enable clustering. When on, only
one "server" is allowed, which will be where fetches are from, while
sets/updates/deletes/purges will occur to the all the servers in the
"set server" list.

To run unit tests, define TEST_CACHESTORE_MEMCACHED_TESTSERVERS with
multiple (return delimited) servers.

8 years agoMDL-40457 Question Bank: Allow plugins to add columns to question bank view
Ray Morris [Tue, 11 Mar 2014 14:16:33 +0000 (09:16 -0500)]
MDL-40457 Question Bank: Allow plugins to add columns to question bank view

Allows plugins to add columns to the question bank view by extending core_question\bank\column_base
Columns to display are set in $CFG->questionbankcolumns. Columns are namespaced and autoloaded to support this.

8 years agoMDL-32450 upgrade: do not remove DragMath settings if the files still exist
Mark Nelson [Thu, 19 Jun 2014 01:54:44 +0000 (18:54 -0700)]
MDL-32450 upgrade: do not remove DragMath settings if the files still exist

8 years agoMDL-32450 delete Dragmath plugin and library because it is not compatible with GPL
Petr Skoda [Thu, 1 May 2014 06:00:15 +0000 (14:00 +0800)]
MDL-32450 delete Dragmath plugin and library because it is not compatible with GPL

8 years agoMDL-46093 quiz review should default to showing everything on one page
Tim Hunt [Sun, 22 Jun 2014 10:03:03 +0000 (11:03 +0100)]
MDL-46093 quiz review should default to showing everything on one page

... as long as the quiz is not too big. At the moment, that limit is
set to 50 questions.

8 years agoMDL-46161 switch the field order of the index on mdl_files_reference to improve perfo...
Davo Smith [Fri, 27 Jun 2014 08:38:38 +0000 (09:38 +0100)]
MDL-46161 switch the field order of the index on mdl_files_reference to improve performance of file_storage::search_references

8 years agoMDL-45961 Customise this page button on user profile page only works correctly for...
NeillM [Tue, 24 Jun 2014 09:02:56 +0000 (10:02 +0100)]
MDL-45961 Customise this page button on user profile page only works correctly for users own profile

8 years agoMDL-45641 event: Ldap user_signup unit test added
Rajesh Taneja [Mon, 23 Jun 2014 06:31:58 +0000 (14:31 +0800)]
MDL-45641 event: Ldap user_signup unit test added

8 years agoMDL-45641 event: Manually trigger event where needed.
Rajesh Taneja [Tue, 10 Jun 2014 02:38:11 +0000 (10:38 +0800)]
MDL-45641 event: Manually trigger event where needed.

Some places, user_created_user and user_updated_user
events should be triggred after profile data is saved.

8 years agoMDL-45641 event: Removed multiple user_updated event trigger
Rajesh Taneja [Thu, 5 Jun 2014 05:41:20 +0000 (13:41 +0800)]
MDL-45641 event: Removed multiple user_updated event trigger

user_updated event was being triggred while
setting password, which is not correct. It now
trigger user_password_updated event. Few more
modifications done:
1. Correct event is being triggred.
2. Event is only triggred when password is chnaged.
3. Password is updated via single api.
4. Updated unit test

8 years agoMDL-45641 event: Option to trigger user event manually
Rajesh Taneja [Fri, 23 May 2014 03:40:31 +0000 (11:40 +0800)]
MDL-45641 event: Option to trigger user event manually

On some pages full user data is not stored before user_created/
user_updated event is triggred. So giving option to trigger that
manually, so it can be triggred after all data is saved

8 years agoMDL-46044 Assign: Add conditions to the inner query for performance
Damyon Wiese [Fri, 27 Jun 2014 06:58:58 +0000 (14:58 +0800)]
MDL-46044 Assign: Add conditions to the inner query for performance

8 years agoMDL-46044 Assign: Modify myhome query to only use the maxattempt from the submission
Damyon Wiese [Fri, 27 Jun 2014 06:14:14 +0000 (14:14 +0800)]
MDL-46044 Assign: Modify myhome query to only use the maxattempt from the submission

Using mismatches from the submissions/grades tables does not make much sense, we
should always only consider only the maxattempt from the submissions table.

8 years agoMDL-46044 Assign: Move common setup to setUp method (share it for all of lib_test...
Damyon Wiese [Thu, 19 Jun 2014 04:39:08 +0000 (12:39 +0800)]
MDL-46044 Assign: Move common setup to setUp method (share it for all of lib_test.php)

8 years agoMDL-46044 Assign: Fix print_overview function when there are multiple attempts
Damyon Wiese [Wed, 18 Jun 2014 08:57:48 +0000 (16:57 +0800)]
MDL-46044 Assign: Fix print_overview function when there are multiple attempts

8 years agoMDL-46044 Assign: Update unit test to test multiple attempts on overview page
Damyon Wiese [Thu, 19 Jun 2014 03:01:03 +0000 (11:01 +0800)]
MDL-46044 Assign: Update unit test to test multiple attempts on overview page

8 years agoMDL-46118 report_log: No results limit when downloading
David Monllao [Wed, 25 Jun 2014 07:07:29 +0000 (15:07 +0800)]
MDL-46118 report_log: No results limit when downloading

8 years agoMDL-45833 event: Removing courseid as the context is higher than course context
David Monllao [Tue, 24 Jun 2014 04:50:53 +0000 (12:50 +0800)]
MDL-45833 event: Removing courseid as the context is higher than course context

8 years agoMDL-46107 badges: Fix badges navigation and remove empty breadcrumbs on pages using...
Yuliya Bozhko [Wed, 25 Jun 2014 03:19:58 +0000 (15:19 +1200)]
MDL-46107 badges: Fix badges navigation and remove empty breadcrumbs on pages using Clean

Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
8 years agoMDL-46163 Question bank: Category selector renders as nested form
Ray Morris [Thu, 26 Jun 2014 17:09:38 +0000 (12:09 -0500)]
MDL-46163 Question bank: Category selector renders as nested form

8 years agoweekly release 2.8dev
Eloy Lafuente (stronk7) [Thu, 26 Jun 2014 08:35:37 +0000 (10:35 +0200)]
weekly release 2.8dev

8 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Eloy Lafuente (stronk7) [Thu, 26 Jun 2014 08:35:27 +0000 (10:35 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

8 years agoRevert " MDL-45044 filter_tex: properly escape excutable pathnames for Windows"
Eloy Lafuente (stronk7) [Thu, 26 Jun 2014 08:06:20 +0000 (10:06 +0200)]
Revert " MDL-45044 filter_tex: properly escape excutable pathnames for Windows"

This reverts commit f0da509835e3b8740c1693216a430dc3195cdb92.

8 years agoMDL-46036 mod_survey: added logic to prevent user trying to download when there are...
Andrew Davis [Tue, 24 Jun 2014 03:53:34 +0000 (11:53 +0800)]
MDL-46036 mod_survey: added logic to prevent user trying to download when there are no results

8 years agoMerge branch 'wip-mdl-46061' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Thu, 26 Jun 2014 02:26:59 +0000 (10:26 +0800)]
Merge branch 'wip-mdl-46061' of git://github.com/rajeshtaneja/moodle

8 years agoMDL-46061 behat: Fixed blur event problem for atto_image
Rajesh Taneja [Thu, 26 Jun 2014 01:59:49 +0000 (09:59 +0800)]
MDL-46061 behat: Fixed blur event problem for atto_image

atto_image look for blur event after changing width/height
Added a new step to get focus off the element, so this can
work.

8 years agoMDL-45983 Atto equation editor: Exclude phantomjs from this behat test because it...
Damyon Wiese [Wed, 25 Jun 2014 07:04:20 +0000 (15:04 +0800)]
MDL-45983 Atto equation editor: Exclude phantomjs from this behat test because it's buggy

8 years agoMerge branch 'wip-mdl-43835' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Wed, 25 Jun 2014 05:55:19 +0000 (13:55 +0800)]
Merge branch 'wip-mdl-43835' of https://github.com/rajeshtaneja/moodle

8 years agoMDL-42716 mod_assign: Lang str for the viewblinddetails capability
David Monllao [Wed, 25 Jun 2014 05:15:41 +0000 (13:15 +0800)]
MDL-42716 mod_assign: Lang str for the viewblinddetails capability

8 years agoMDL-43835 behat: Use proper step for navigation expansion
Rajesh Taneja [Tue, 24 Jun 2014 07:12:48 +0000 (15:12 +0800)]
MDL-43835 behat: Use proper step for navigation expansion

8 years agoMDL-43835 behat: Added new step to set field with xpath defined
Rajesh Taneja [Wed, 25 Jun 2014 03:30:44 +0000 (11:30 +0800)]
MDL-43835 behat: Added new step to set field with xpath defined

8 years agoMDL-43835 behat: Fixed backup behat test
Rajesh Taneja [Wed, 25 Jun 2014 03:29:40 +0000 (11:29 +0800)]
MDL-43835 behat: Fixed backup behat test

Disabling section, disables all checkboxes in section,
So we don't have to unset them manually

8 years agoMDL-43835 behat: Fixed matches for select form field
Rajesh Taneja [Tue, 24 Jun 2014 08:53:11 +0000 (16:53 +0800)]
MDL-43835 behat: Fixed matches for select form field

8 years agoMDL-41663 Output: Allow subtype as a namespace level on it's own
Damyon Wiese [Wed, 25 Jun 2014 03:50:25 +0000 (11:50 +0800)]
MDL-41663 Output: Allow subtype as a namespace level on it's own

8 years agoMDL-41663 Output: Unit tests for output factories search paths
Damyon Wiese [Thu, 22 May 2014 04:47:40 +0000 (12:47 +0800)]
MDL-41663 Output: Unit tests for output factories search paths

8 years agoMDL-41663 Renderers - allow autoloaded renderers
Damyon Wiese [Mon, 12 May 2014 04:16:26 +0000 (12:16 +0800)]
MDL-41663 Renderers - allow autoloaded renderers

8 years agoMDL-46031 output: remove leftover line
Eloy Lafuente (stronk7) [Wed, 25 Jun 2014 01:05:24 +0000 (03:05 +0200)]
MDL-46031 output: remove leftover line

8 years agoMDL-42467 mod_data: added code to delete cached RSS feeds when database or glossary...
Andrew Davis [Fri, 20 Jun 2014 04:58:48 +0000 (12:58 +0800)]
MDL-42467 mod_data: added code to delete cached RSS feeds when database or glossary entries are deleted

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Jun 2014 00:45:19 +0000 (00:45 +0000)]
Automatically generated installer lang files

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Jun 2014 00:45:19 +0000 (00:45 +0000)]
Automatically generated installer lang files

8 years agoMerge branch 'MDL-28420_master' of https://github.com/jrchamp/moodle
Eloy Lafuente (stronk7) [Wed, 25 Jun 2014 00:07:34 +0000 (02:07 +0200)]
Merge branch 'MDL-28420_master' of https://github.com/jrchamp/moodle

8 years agoMerge branch '43365-28' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jun 2014 23:35:17 +0000 (01:35 +0200)]
Merge branch '43365-28' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-46079-master' of https://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jun 2014 23:32:11 +0000 (01:32 +0200)]
Merge branch 'MDL-46079-master' of https://github.com/sammarshallou/moodle

8 years agoMerge branch 'MDL-45645_LTIUsernameParam' of https://github.com/moodlerooms/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jun 2014 23:28:35 +0000 (01:28 +0200)]
Merge branch 'MDL-45645_LTIUsernameParam' of https://github.com/moodlerooms/moodle

8 years agoMDL-43365 lib: converted text and plugin deprecated classes to new scheme
Sam Hemelryk [Tue, 24 Jun 2014 21:30:35 +0000 (09:30 +1200)]
MDL-43365 lib: converted text and plugin deprecated classes to new scheme

Four core library classes renamed for autoloading with deprecated stubs
have been converted to the new scheme for autoloading.
They are:

 * textlib
 * collatorlib
 * plugin_manager
 * plugininfo_base

These will be removed in 2.9 by MDL-46124

8 years agoMDL-43365 lib: added better means of renaming classes for autoloading
Sam Hemelryk [Tue, 24 Jun 2014 21:28:27 +0000 (09:28 +1200)]
MDL-43365 lib: added better means of renaming classes for autoloading

I've added a better means of renaming classes for autoloading and
handling the deprecation of the original class name.
This system records renamed classes in db/renamedclasses.php and
when a renamed class is requested a debugging notice is printed
and a class alias is created so that the calling code both works
and is informed of the deprecation.

8 years agoMerge branch 'MDL-45445_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jun 2014 19:54:58 +0000 (21:54 +0200)]
Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle

8 years agoMDL-46045 whitespace fix
Eloy Lafuente (stronk7) [Tue, 24 Jun 2014 19:50:05 +0000 (21:50 +0200)]
MDL-46045 whitespace fix

8 years agoMerge branch 'MDL-46045-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jun 2014 19:48:30 +0000 (21:48 +0200)]
Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-41258-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jun 2014 18:25:58 +0000 (20:25 +0200)]
Merge branch 'MDL-41258-master' of git://github.com/andrewnicols/moodle

Conflicts:
mod/forum/tests/maildigest_test.php

8 years agoMerge branch 'MDL-45652_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 24 Jun 2014 08:58:04 +0000 (16:58 +0800)]
Merge branch 'MDL-45652_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-1626-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Tue, 24 Jun 2014 08:14:31 +0000 (16:14 +0800)]
Merge branch 'MDL-1626-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'MDL-10115-master' of git://github.com/xow/moodle
Damyon Wiese [Tue, 24 Jun 2014 08:03:21 +0000 (16:03 +0800)]
Merge branch 'MDL-10115-master' of git://github.com/xow/moodle

8 years agoMDL-10115 User profile: Use title to aid in the ellipsis link being understood by...
John Okely [Tue, 24 Jun 2014 07:38:15 +0000 (15:38 +0800)]
MDL-10115 User profile: Use title to aid in the ellipsis link being understood by screen readers

8 years agoMDL-1626 mod_forum: Correct SQL syntax when fetching subscriptions
Andrew Nicols [Tue, 24 Jun 2014 06:48:23 +0000 (14:48 +0800)]
MDL-1626 mod_forum: Correct SQL syntax when fetching subscriptions

8 years agoMerge branch 'wip_MDL-45985_m28_dbschema' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 24 Jun 2014 06:19:20 +0000 (14:19 +0800)]
Merge branch 'wip_MDL-45985_m28_dbschema' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-46022-master' of git://github.com/jethac/moodle
Damyon Wiese [Tue, 24 Jun 2014 06:10:51 +0000 (14:10 +0800)]
Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle

Conflicts:
theme/bootstrapbase/less/moodle/modules.less
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'MDL-46031' of git://github.com/timhunt/moodle
Damyon Wiese [Tue, 24 Jun 2014 06:05:54 +0000 (14:05 +0800)]
Merge branch 'MDL-46031' of git://github.com/timhunt/moodle

8 years agoMerge branch 'MDL-45933-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 24 Jun 2014 05:52:30 +0000 (13:52 +0800)]
Merge branch 'MDL-45933-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-45983-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 24 Jun 2014 05:51:30 +0000 (13:51 +0800)]
Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-41448-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 24 Jun 2014 05:51:20 +0000 (13:51 +0800)]
Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle

8 years agoMDL-41448 Assign: Add note to theme/upgrade.txt about CSS changes in mod_assign
Damyon Wiese [Mon, 23 Jun 2014 06:07:21 +0000 (14:07 +0800)]
MDL-41448 Assign: Add note to theme/upgrade.txt about CSS changes in mod_assign

8 years agoMDL-41448 assign: Fix all plugin styles - they should be restricted to mod assign...
Damyon Wiese [Tue, 17 Jun 2014 08:03:05 +0000 (16:03 +0800)]
MDL-41448 assign: Fix all plugin styles - they should be restricted to mod assign pages.

8 years agoMerge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 24 Jun 2014 05:32:13 +0000 (13:32 +0800)]
Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-45044-master' of git://github.com/dthies/moodle
Marina Glancy [Tue, 24 Jun 2014 05:28:51 +0000 (13:28 +0800)]
Merge branch 'MDL-45044-master' of git://github.com/dthies/moodle

8 years agoMerge branch 'wip-MDL-46038-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 24 Jun 2014 05:10:32 +0000 (13:10 +0800)]
Merge branch 'wip-MDL-46038-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-46035_survey' of https://github.com/andyjdavis/moodle
Damyon Wiese [Tue, 24 Jun 2014 05:07:57 +0000 (13:07 +0800)]
Merge branch 'MDL-46035_survey' of https://github.com/andyjdavis/moodle

8 years agoMDL-42716 assign: whitespace fix
Marina Glancy [Tue, 24 Jun 2014 05:04:49 +0000 (13:04 +0800)]
MDL-42716 assign: whitespace fix

8 years agoMDL-42716 Assign: Implemented capability based viewing of blind details (squashed)
Michael Hughes [Wed, 16 Apr 2014 13:18:33 +0000 (14:18 +0100)]
MDL-42716 Assign: Implemented capability based viewing of blind details (squashed)

8 years agoMDL-1626 mod_forum: Update discussion subscriptions when moving discussions
Andrew Nicols [Fri, 6 Jun 2014 17:05:52 +0000 (01:05 +0800)]
MDL-1626 mod_forum: Update discussion subscriptions when moving discussions

8 years agoMDL-1626 mod_forum: Update user interface to reflect per-discussion subscriptions
Andrew Nicols [Thu, 5 Jun 2014 14:27:52 +0000 (22:27 +0800)]
MDL-1626 mod_forum: Update user interface to reflect per-discussion subscriptions

AMOS BEGIN
  MOV [forcessubscribe,mod_forum],[forcesubscribed,mod_forum]
AMOS END

8 years agoMDL-1626 mod_forum: Add icons for subscription status
Barbara Ramiro [Thu, 19 Jun 2014 04:27:49 +0000 (12:27 +0800)]
MDL-1626 mod_forum: Add icons for subscription status

8 years agoMDL-1626 mod_forum: Make cron handle discussion subscriptions
Andrew Nicols [Thu, 5 Jun 2014 05:50:53 +0000 (13:50 +0800)]
MDL-1626 mod_forum: Make cron handle discussion subscriptions