moodle.git
6 years agoMerge branch 'MDL-34248_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 22 Jul 2014 11:01:04 +0000 (12:01 +0100)]
Merge branch 'MDL-34248_master' of https://github.com/markn86/moodle

6 years agoMerge branch '45828-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 22 Jul 2014 08:33:01 +0000 (09:33 +0100)]
Merge branch '45828-28' of git://github.com/samhemelryk/moodle

6 years agoMerge branch '45724-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 22 Jul 2014 08:07:16 +0000 (09:07 +0100)]
Merge branch '45724-28' of git://github.com/samhemelryk/moodle

6 years agoMerge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 21 Jul 2014 23:12:09 +0000 (11:12 +1200)]
Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle

6 years agoMerge branch 'MDL-43063-master' of git://github.com/lameze/moodle
Sam Hemelryk [Mon, 21 Jul 2014 21:49:03 +0000 (09:49 +1200)]
Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle

6 years agoMerge branch 'MDL-46386-master' of https://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 21 Jul 2014 13:11:39 +0000 (14:11 +0100)]
Merge branch 'MDL-46386-master' of https://github.com/merrill-oakland/moodle

6 years agoMDL-46386 question Whitelist the Atto editor from return blocking
Eric Merrill [Wed, 16 Jul 2014 21:32:32 +0000 (17:32 -0400)]
MDL-46386 question Whitelist the Atto editor from return blocking

Prevent the question engine from blocking return/enter key presses
from being sent to the Atto editor.

6 years agoMDL-46285 coding style fix
Dan Poltawski [Mon, 21 Jul 2014 13:07:39 +0000 (14:07 +0100)]
MDL-46285 coding style fix

(no double newlines)

6 years agoMerge branch 'MDL-46285-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 21 Jul 2014 13:03:58 +0000 (14:03 +0100)]
Merge branch 'MDL-46285-master' of git://github.com/jethac/moodle

6 years agoMDL-46316 notes: coding style fixes
Dan Poltawski [Mon, 21 Jul 2014 11:39:18 +0000 (12:39 +0100)]
MDL-46316 notes: coding style fixes

Line length issues Andrew missed off.

6 years agoMerge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 21 Jul 2014 11:31:51 +0000 (12:31 +0100)]
Merge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'MDL-45847_master' of https://github.com/Syxton/moodle
Dan Poltawski [Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)]
Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle

6 years agoMerge branch 'MDL-43151-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 21 Jul 2014 09:20:55 +0000 (10:20 +0100)]
Merge branch 'MDL-43151-master' of git://github.com/damyon/moodle

6 years agoMerge branch '46335-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 21 Jul 2014 08:59:04 +0000 (09:59 +0100)]
Merge branch '46335-28' of git://github.com/samhemelryk/moodle

6 years agoMerge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle
Dan Poltawski [Mon, 21 Jul 2014 08:54:56 +0000 (09:54 +0100)]
Merge branch 'MDL-46370_master' of https://github.com/moodlerooms/moodle

6 years agoMDL-43151 Assign: More validation in mod_form.
Damyon Wiese [Mon, 21 Jul 2014 05:41:51 +0000 (13:41 +0800)]
MDL-43151 Assign: More validation in mod_form.

Add check to mod_form to prevent "reopen until pass" and "blind marking" both being on

6 years agoMDL-43151 assign: Use grade_grade->is_passed
Damyon Wiese [Mon, 2 Dec 2013 05:29:38 +0000 (13:29 +0800)]
MDL-43151 assign: Use grade_grade->is_passed

Do not try and calculate this inside mod_assign - it's a gradebook thing only.

6 years agoMDL-43063 core: fix phpdoc comment codechecker issue.
Simey Lameze [Mon, 14 Jul 2014 07:55:23 +0000 (15:55 +0800)]
MDL-43063 core: fix phpdoc comment codechecker issue.

6 years agoMDL-42909 course: fixed whitespace
Sam Hemelryk [Sun, 20 Jul 2014 23:42:52 +0000 (11:42 +1200)]
MDL-42909 course: fixed whitespace

6 years agoMerge branch 'MDL-42909-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 20 Jul 2014 23:35:47 +0000 (11:35 +1200)]
Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle

6 years agoMerge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle
Sam Hemelryk [Sun, 20 Jul 2014 23:32:09 +0000 (11:32 +1200)]
Merge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle

6 years agoMerge branch 'm28_MDL-46406' of https://github.com/totara/moodle
Sam Hemelryk [Sun, 20 Jul 2014 23:14:30 +0000 (11:14 +1200)]
Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

6 years agoMerge branch 'mdl-46427-master' of git://github.com/deraadt/moodle
Sam Hemelryk [Sun, 20 Jul 2014 23:12:05 +0000 (11:12 +1200)]
Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle

6 years agoMerge branch 'MDL-46159-wip' of https://github.com/willylee/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:55:08 +0000 (10:55 +1200)]
Merge branch 'MDL-46159-wip' of https://github.com/willylee/moodle

6 years agoMerge branch 'MDL-45339-master' of git://github.com/xow/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:49:25 +0000 (10:49 +1200)]
Merge branch 'MDL-45339-master' of git://github.com/xow/moodle

6 years agoMerge branch 'master_MDL-46363' of https://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:45:33 +0000 (10:45 +1200)]
Merge branch 'master_MDL-46363' of https://github.com/danmarsden/moodle

6 years agoMDL-45724 cache: added cache API warnings to the admin notifications page
Sam Hemelryk [Thu, 29 May 2014 23:41:48 +0000 (11:41 +1200)]
MDL-45724 cache: added cache API warnings to the admin notifications page

6 years agoMDL-45828 cache: definitions now sorted in the admin UI
Sam Hemelryk [Mon, 9 Jun 2014 21:41:30 +0000 (09:41 +1200)]
MDL-45828 cache: definitions now sorted in the admin UI

6 years agoMDL-46427 Course: Correcting dimmed course link class on profile pages.
Michael de Raadt [Fri, 18 Jul 2014 07:30:33 +0000 (15:30 +0800)]
MDL-46427 Course: Correcting dimmed course link class on profile pages.

6 years agoMDL-42909 Course: Fix title for move-targets
Jason Fowler [Fri, 18 Jul 2014 00:22:17 +0000 (08:22 +0800)]
MDL-42909 Course: Fix title for move-targets

6 years agoMDL-46316 notes: coding style fixes
Andrew Davis [Thu, 10 Jul 2014 08:16:26 +0000 (16:16 +0800)]
MDL-46316 notes: coding style fixes

6 years agoMDL-34248 core_backup: used API instead of inserting into the log table directly
Mark Nelson [Wed, 16 Jul 2014 23:18:16 +0000 (16:18 -0700)]
MDL-34248 core_backup: used API instead of inserting into the log table directly

6 years agoenrol_imsenterprise: MDL-46363 including course lib when create_course is
Jim Thorpe [Wed, 16 Jul 2014 23:57:00 +0000 (11:57 +1200)]
enrol_imsenterprise: MDL-46363 including course lib when create_course is
used

6 years agoMDL-46335 backup: fixed casting issue with setting labels
Sam Hemelryk [Thu, 17 Jul 2014 00:52:18 +0000 (12:52 +1200)]
MDL-46335 backup: fixed casting issue with setting labels

The issue was that clean_param took an int and returned a string
and the result was used in an exact comparison.
The type change mean the comparison failed.
The solution was to ensure the param was cast as a string.

6 years agoMDL-45724 cache: admin screen now shows store warnings
Sam Hemelryk [Thu, 29 May 2014 23:27:10 +0000 (11:27 +1200)]
MDL-45724 cache: admin screen now shows store warnings

Implemented a means by which cache store instance can communicate
warnings due to things such as conflicting configurations etc.

6 years agoMDL-45339 Libraries: Add a note to docblock of get_config, set_config, and unset_conf...
John Okely [Thu, 17 Jul 2014 08:42:42 +0000 (16:42 +0800)]
MDL-45339 Libraries: Add a note to docblock of get_config, set_config, and unset_config to note they are used in lib/db/upgrade.php

6 years agoweekly release 2.8dev
Dan Poltawski [Thu, 17 Jul 2014 08:22:43 +0000 (09:22 +0100)]
weekly release 2.8dev

6 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 17 Jul 2014 08:22:40 +0000 (09:22 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

6 years agoMerge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2...
Sam Hemelryk [Thu, 17 Jul 2014 03:16:07 +0000 (15:16 +1200)]
Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle

Conflicts:
mod/quiz/lib.php
mod/quiz/mod_form.php
mod/quiz/tests/behat/completion_condition_passing_grade.feature

6 years agoMDL-46406 core_auth: Placed remember username before submit login form
Brian Barnes [Wed, 16 Jul 2014 22:32:05 +0000 (10:32 +1200)]
MDL-46406 core_auth: Placed remember username before submit login form

6 years agoRevert "MDL-46226 core: pix_icon no longer sets title to the alt text"
Sam Hemelryk [Thu, 17 Jul 2014 01:57:29 +0000 (13:57 +1200)]
Revert "MDL-46226 core: pix_icon no longer sets title to the alt text"

This reverts commit 40ebfaeefd0940049ce2ef6e481546d90f19b9af.

6 years agoRevert "MDL-46226 fix unit tests"
Sam Hemelryk [Thu, 17 Jul 2014 01:57:01 +0000 (13:57 +1200)]
Revert "MDL-46226 fix unit tests"

This reverts commit ffd17daf0a438fa63a32d3c1ba08218e16def46c.

6 years agoAutomatically generated installer lang files
AMOS bot [Thu, 17 Jul 2014 00:52:42 +0000 (00:52 +0000)]
Automatically generated installer lang files

6 years agoAutomatically generated installer lang files
AMOS bot [Thu, 17 Jul 2014 00:52:42 +0000 (00:52 +0000)]
Automatically generated installer lang files

6 years agoMDL-37993 Quiz: completion upon all passing grade or attempts exhausted
Ray Morris [Fri, 30 May 2014 16:39:42 +0000 (11:39 -0500)]
MDL-37993 Quiz: completion upon all passing grade or attempts exhausted
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails".  (Where "fail" means "using up all attempts without passing".)

6 years agoMDL-45594 core_message: added unit tests
Mark Nelson [Fri, 20 Jun 2014 00:29:42 +0000 (17:29 -0700)]
MDL-45594 core_message: added unit tests

6 years agoMDL-45594 core_message: ordered recent notifications by timecreated
Mark Nelson [Sun, 29 Jun 2014 23:18:24 +0000 (16:18 -0700)]
MDL-45594 core_message: ordered recent notifications by timecreated

6 years agoMDL-45594 simplify message_get_recent_conversations SQL
Tim Hunt [Thu, 26 Jun 2014 15:45:05 +0000 (16:45 +0100)]
MDL-45594 simplify message_get_recent_conversations SQL

I am pretty sure that this new SQL is logically equivalent to
the original, and it passes Mark's unit tests. However, it is
hard to be 100% sure.

6 years agoMDL-46370 Ajax and Javascript - Fixes docked blocks not expanding when using dock...
Sam Chaffee [Mon, 14 Jul 2014 22:26:54 +0000 (16:26 -0600)]
MDL-46370 Ajax and Javascript - Fixes docked blocks not expanding when using dock on right

6 years agoMDL-40479 mod_assign PHPDoc: Fix error, improve consistency.
David Balch [Thu, 10 Jul 2014 08:45:35 +0000 (09:45 +0100)]
MDL-40479 mod_assign PHPDoc: Fix error, improve consistency.

6 years agoMDL-40479 mod_assign: Fix the colour of grading success messages.
David Balch [Wed, 16 Jul 2014 07:57:48 +0000 (08:57 +0100)]
MDL-40479 mod_assign: Fix the colour of grading success messages.

6 years agoMerge branch 'wip-mdl-30431' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jul 2014 07:18:03 +0000 (09:18 +0200)]
Merge branch 'wip-mdl-30431' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-35870' of git://github.com/nobelium/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jul 2014 07:04:55 +0000 (09:04 +0200)]
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle

6 years agoMDL-35870 mod_scorm: Fixing undefined scoid for popup mode
Nobelium [Wed, 16 Jul 2014 11:51:03 +0000 (11:51 +0000)]
MDL-35870 mod_scorm: Fixing undefined scoid for popup mode

6 years agoMDL-30431 behat: Use table id for wiki comments in behat
Rajesh Taneja [Wed, 16 Jul 2014 06:56:08 +0000 (14:56 +0800)]
MDL-30431 behat: Use table id for wiki comments in behat

6 years agoMerge branch 'wip-mdl-44523' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jul 2014 06:52:28 +0000 (08:52 +0200)]
Merge branch 'wip-mdl-44523' of https://github.com/rajeshtaneja/moodle

6 years agoMDL-30431 behat: Fixed wiki behat
Rajesh Taneja [Wed, 16 Jul 2014 06:52:13 +0000 (14:52 +0800)]
MDL-30431 behat: Fixed wiki behat

6 years agoMDL-44523 Behat: Fixed event filter test with change in edulevel
Rajesh Taneja [Wed, 16 Jul 2014 06:05:42 +0000 (14:05 +0800)]
MDL-44523 Behat: Fixed event filter test with change in edulevel

6 years agoMDL-30431 mod_wiki: whitespace fix
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 23:19:13 +0000 (01:19 +0200)]
MDL-30431 mod_wiki: whitespace fix

6 years agoMerge branch 'MDL-30431_wiki_comments' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 23:16:04 +0000 (01:16 +0200)]
Merge branch 'MDL-30431_wiki_comments' of https://github.com/andyjdavis/moodle

6 years agoMDL-46290 Completion: document the deprecation
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 23:06:23 +0000 (01:06 +0200)]
MDL-46290 Completion: document the deprecation

6 years agoMerge branch 'MDL-46290_remove_unused_get_incomplete_criteria' of https://github...
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 22:57:47 +0000 (00:57 +0200)]
Merge branch 'MDL-46290_remove_unused_get_incomplete_criteria' of https://github.com/MorrisR2/moodle

6 years agoMerge branch 'wip-mdl-45991' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 15 Jul 2014 21:04:01 +0000 (09:04 +1200)]
Merge branch 'wip-mdl-45991' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-35870' of git://github.com/nobelium/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 16:30:29 +0000 (18:30 +0200)]
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle

6 years agoMDL-35870 mod_scorm : fix for debug.js.php not found error
Nobelium [Tue, 15 Jul 2014 16:05:40 +0000 (16:05 +0000)]
MDL-35870 mod_scorm : fix for debug.js.php not found error

6 years agoMDL-45991 behat: fixed deprecated behat steps used
Rajesh Taneja [Tue, 15 Jul 2014 08:10:29 +0000 (16:10 +0800)]
MDL-45991 behat: fixed deprecated behat steps used

6 years agoMDL-34248 core_backup: added missing end quotation
Mark Nelson [Tue, 15 Jul 2014 06:48:33 +0000 (23:48 -0700)]
MDL-34248 core_backup: added missing end quotation

6 years agoMerge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 15 Jul 2014 00:07:05 +0000 (12:07 +1200)]
Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-35870 mod_scorm : Bump version
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 23:45:23 +0000 (01:45 +0200)]
MDL-35870 mod_scorm : Bump version

6 years agoMDL-35870 mod_scorm : whitespace fixes
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 23:41:07 +0000 (01:41 +0200)]
MDL-35870 mod_scorm : whitespace fixes

6 years agoMerge branch 'MDL-35870' of git://github.com/nobelium/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 23:06:53 +0000 (01:06 +0200)]
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle

6 years agoMerge branch 'MDL-46346_blog' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 14 Jul 2014 22:32:28 +0000 (10:32 +1200)]
Merge branch 'MDL-46346_blog' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'MDL-46080' of https://github.com/jonof/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 21:29:07 +0000 (23:29 +0200)]
Merge branch 'MDL-46080' of https://github.com/jonof/moodle

6 years agoMDL-37993 mod_quiz: fixed deprecated behat step
Sam Hemelryk [Mon, 14 Jul 2014 21:10:17 +0000 (09:10 +1200)]
MDL-37993 mod_quiz: fixed deprecated behat step

6 years agoMerge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2...
Sam Hemelryk [Mon, 14 Jul 2014 20:48:55 +0000 (08:48 +1200)]
Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle

6 years agoMerge branch 'MDL-42179-003-master' of https://github.com/dbezborodovrp/moodle
Sam Hemelryk [Mon, 14 Jul 2014 20:39:37 +0000 (08:39 +1200)]
Merge branch 'MDL-42179-003-master' of https://github.com/dbezborodovrp/moodle

6 years agoMerge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 16:13:18 +0000 (18:13 +0200)]
Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle

6 years agoMerge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 16:06:52 +0000 (18:06 +0200)]
Merge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle

6 years agoMDL-37993 Quiz: completion upon all passing grade or attempts exhausted
Ray Morris [Fri, 30 May 2014 16:39:42 +0000 (11:39 -0500)]
MDL-37993 Quiz: completion upon all passing grade or attempts exhausted
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails".  (Where "fail" means "using up all attempts without passing".)

6 years agoMerge branch 'MDL-42752-master' of git://github.com/phalacee/moodle
Dan Poltawski [Mon, 14 Jul 2014 15:06:13 +0000 (16:06 +0100)]
Merge branch 'MDL-42752-master' of git://github.com/phalacee/moodle

6 years agoMDL-46226 fix unit tests
Dan Poltawski [Mon, 14 Jul 2014 14:49:20 +0000 (15:49 +0100)]
MDL-46226 fix unit tests

6 years agoMerge branch 'MDL-46218_disabled2' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 14 Jul 2014 14:33:12 +0000 (15:33 +0100)]
Merge branch 'MDL-46218_disabled2' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'm28_MDL-46197' of https://github.com/totara/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 13:54:52 +0000 (15:54 +0200)]
Merge branch 'm28_MDL-46197' of https://github.com/totara/moodle

6 years agoMerge branch 'm28_MDL-46226' of https://github.com/totara/moodle
Dan Poltawski [Mon, 14 Jul 2014 14:13:32 +0000 (15:13 +0100)]
Merge branch 'm28_MDL-46226' of https://github.com/totara/moodle

6 years agoMDL-46285 core_renderers: optionally hide user_picture from screen readers
Jetha Chan [Tue, 8 Jul 2014 07:17:26 +0000 (15:17 +0800)]
MDL-46285 core_renderers: optionally hide user_picture from screen readers

6 years agoMerge branch 'm28_MDL-46250' of https://github.com/totara/moodle
Dan Poltawski [Mon, 14 Jul 2014 12:12:43 +0000 (13:12 +0100)]
Merge branch 'm28_MDL-46250' of https://github.com/totara/moodle

6 years agoMerge branch 'MDL-46286-master' of https://github.com/lucisgit/moodle
Dan Poltawski [Mon, 14 Jul 2014 11:33:59 +0000 (12:33 +0100)]
Merge branch 'MDL-46286-master' of https://github.com/lucisgit/moodle

6 years agoMDL-42179 mod_assign: Time remaining issue for group assignment
Damien Bezborodov [Wed, 25 Jun 2014 06:02:25 +0000 (15:32 +0930)]
MDL-42179 mod_assign: Time remaining issue for group assignment

6 years agoMerge branch 'MDL-42214_popup_blocked' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 14 Jul 2014 03:27:16 +0000 (15:27 +1200)]
Merge branch 'MDL-42214_popup_blocked' of https://github.com/andyjdavis/moodle

6 years agoMerge branch 'MDL-45991_master' of https://github.com/Syxton/moodle
Sam Hemelryk [Mon, 14 Jul 2014 03:19:21 +0000 (15:19 +1200)]
Merge branch 'MDL-45991_master' of https://github.com/Syxton/moodle

6 years agoMerge branch 'MDL-46073_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 14 Jul 2014 03:14:49 +0000 (15:14 +1200)]
Merge branch 'MDL-46073_master' of https://github.com/totara/openbadges

6 years agoMDL-46346 blog: coding style fixes
Andrew Davis [Sun, 13 Jul 2014 10:43:09 +0000 (18:43 +0800)]
MDL-46346 blog: coding style fixes

6 years agoMDL-46218 reshuffled access checks in blog and notes
Andrew Davis [Thu, 10 Jul 2014 02:57:39 +0000 (10:57 +0800)]
MDL-46218 reshuffled access checks in blog and notes

6 years agoMDL-42214 core_message:prevented popup notifications of messages from blocked users
Andrew Davis [Fri, 27 Jun 2014 02:10:55 +0000 (10:10 +0800)]
MDL-42214 core_message:prevented popup notifications of messages from blocked users

6 years agoMerge branch 'MDL-45765-master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Mon, 14 Jul 2014 00:09:29 +0000 (12:09 +1200)]
Merge branch 'MDL-45765-master' of https://github.com/StudiUM/moodle

6 years agoMerge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Sun, 13 Jul 2014 23:55:02 +0000 (11:55 +1200)]
Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle

6 years agoMDL-30431 mod_wiki: clarified the logic around editing and deleting wiki comments...
Andrew Davis [Mon, 30 Jun 2014 02:36:10 +0000 (10:36 +0800)]
MDL-30431 mod_wiki: clarified the logic around editing and deleting wiki comments and added behat tests

6 years agoMDL-46138 post integratino phpdoc fixes
Sam Hemelryk [Sun, 13 Jul 2014 22:50:42 +0000 (10:50 +1200)]
MDL-46138 post integratino phpdoc fixes

6 years agoMerge branch 'MDL-46138-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:39:54 +0000 (10:39 +1200)]
Merge branch 'MDL-46138-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:32:28 +0000 (10:32 +1200)]
Merge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle