moodle.git
7 years agoMerge branch 'MDL-41891_master' of https://github.com/nadavkav/moodle
Sam Hemelryk [Mon, 14 Apr 2014 22:26:44 +0000 (10:26 +1200)]
Merge branch 'MDL-41891_master' of https://github.com/nadavkav/moodle

7 years agoMerge branch 'MDL-45086-master' of git://github.com/danpoltawski/moodle
Sam Hemelryk [Mon, 14 Apr 2014 21:50:38 +0000 (09:50 +1200)]
Merge branch 'MDL-45086-master' of git://github.com/danpoltawski/moodle

7 years agoMerge branch 'MDL-45047-module-notation-deprecated' of git://github.com/mudrd8mz...
Marina Glancy [Mon, 14 Apr 2014 09:10:31 +0000 (17:10 +0800)]
Merge branch 'MDL-45047-module-notation-deprecated' of git://github.com/mudrd8mz/moodle

7 years agoMerge branch 'MDL-45057_master' of git://github.com/markn86/moodle
Marina Glancy [Mon, 14 Apr 2014 09:10:02 +0000 (17:10 +0800)]
Merge branch 'MDL-45057_master' of git://github.com/markn86/moodle

7 years agoMerge branch 'w16_MDL-44911_m27_unknownevent' of git://github.com/skodak/moodle
Marina Glancy [Mon, 14 Apr 2014 09:09:49 +0000 (17:09 +0800)]
Merge branch 'w16_MDL-44911_m27_unknownevent' of git://github.com/skodak/moodle

7 years agoMDL-45086 lib: force upgrade
Dan Poltawski [Mon, 14 Apr 2014 08:34:41 +0000 (16:34 +0800)]
MDL-45086 lib: force upgrade

The availability changes change the course query for front page.

7 years agoMerge branch 'wip-MDL-43719-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 14 Apr 2014 07:22:59 +0000 (15:22 +0800)]
Merge branch 'wip-MDL-43719-master' of git://github.com/abgreeve/moodle

7 years agoMerge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 14 Apr 2014 07:19:58 +0000 (15:19 +0800)]
Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle

7 years agoMDL-44366 fix use of cm->uservisible in glossary concept cache
Petr Škoda [Mon, 14 Apr 2014 07:16:28 +0000 (15:16 +0800)]
MDL-44366 fix use of cm->uservisible in glossary concept cache

7 years agoMDL-45047 Put the deprecation warning into mod/upgrade.txt, too
David Mudrák [Thu, 10 Apr 2014 21:59:01 +0000 (23:59 +0200)]
MDL-45047 Put the deprecation warning into mod/upgrade.txt, too

It is already in the main lib/upgrade.txt but it should be mentioned here as
well.

7 years agoMDL-45057 mod_quiz: restored the user/group override deleted events
Mark Nelson [Mon, 14 Apr 2014 01:37:06 +0000 (18:37 -0700)]
MDL-45057 mod_quiz: restored the user/group override deleted events

7 years agoMerge branch 'MDL-45009-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 14 Apr 2014 04:23:57 +0000 (12:23 +0800)]
Merge branch 'MDL-45009-master' of git://github.com/damyon/moodle

7 years agoMDL-44911 use unknown_logged class when viewing unknown events in reports
Petr Škoda [Mon, 14 Apr 2014 03:40:36 +0000 (11:40 +0800)]
MDL-44911 use unknown_logged class when viewing unknown events in reports

7 years agoMerge branch 'MDL-44936-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 14 Apr 2014 03:38:46 +0000 (11:38 +0800)]
Merge branch 'MDL-44936-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 14 Apr 2014 02:53:56 +0000 (10:53 +0800)]
Merge branch 'w16_MDL-44366_m27_filtergloss' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-44844-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Mon, 14 Apr 2014 02:32:00 +0000 (10:32 +0800)]
Merge branch 'MDL-44844-master' of git://github.com/andrewnicols/moodle

7 years agoMerge branch 'w16_MDL-44910_m27_logupgrade' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 14 Apr 2014 02:14:47 +0000 (10:14 +0800)]
Merge branch 'w16_MDL-44910_m27_logupgrade' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-45048-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 14 Apr 2014 02:01:11 +0000 (10:01 +0800)]
Merge branch 'MDL-45048-master' of git://github.com/FMCorz/moodle

7 years agoMDL-45009 Tex filter: Add \( \) delimiters for 1:1 compatibility with MathJax
Damyon Wiese [Fri, 11 Apr 2014 07:28:31 +0000 (15:28 +0800)]
MDL-45009 Tex filter: Add \( \) delimiters for 1:1 compatibility with MathJax

7 years agoMDL-44910 enable new logging during upgrade and installation
Petr Škoda [Sun, 6 Apr 2014 13:00:40 +0000 (21:00 +0800)]
MDL-44910 enable new logging during upgrade and installation

The legacy logging is now enabled for reading only
if legacy log data older than one day exists.

7 years agoMDL-44366 improve glossary filter performance
Petr Škoda [Mon, 7 Apr 2014 06:04:31 +0000 (14:04 +0800)]
MDL-44366 improve glossary filter performance

This should have when there are no glossaries in course or
when there are no linked entries in existing glossaries.

7 years agoMDL-44366 bump up glossary and filter version
Petr Škoda [Sun, 6 Apr 2014 12:36:56 +0000 (20:36 +0800)]
MDL-44366 bump up glossary and filter version

7 years agoMDL-44366 rework glossary filter caching
Petr Škoda [Fri, 28 Mar 2014 07:02:46 +0000 (15:02 +0800)]
MDL-44366 rework glossary filter caching

7 years agoMoodle release 2.7beta v2.7.0-beta
Dan Poltawski [Fri, 11 Apr 2014 09:41:36 +0000 (17:41 +0800)]
Moodle release 2.7beta

7 years agoMDL-40063/MDL-45057 quiz: disable related unit tests
Dan Poltawski [Fri, 11 Apr 2014 09:36:40 +0000 (17:36 +0800)]
MDL-40063/MDL-45057 quiz: disable related unit tests

I kept the commit number format same as the last commit just
to annoy Fred.

7 years agoMDL-40063/MDL-45057 quiz: disable firing of override events
Dan Poltawski [Fri, 11 Apr 2014 08:55:59 +0000 (16:55 +0800)]
MDL-40063/MDL-45057 quiz: disable firing of override events

This hacky solution is brought to you by the the motivation to
release.

7 years agoMDL-45048 repository_wikimedia: Abusing usage of optional_param
Frederic Massart [Fri, 11 Apr 2014 07:16:31 +0000 (15:16 +0800)]
MDL-45048 repository_wikimedia: Abusing usage of optional_param

The optional_param call was moved outside of the constructor
because it was called every time the repository would be initialised.
That was leading to problems when the parameter was defined from
another form and not complying with its expected type.

7 years agoMerge branch 'MDL-40063_master' of https://github.com/markn86/moodle
Dan Poltawski [Fri, 11 Apr 2014 06:31:27 +0000 (14:31 +0800)]
Merge branch 'MDL-40063_master' of https://github.com/markn86/moodle

7 years agoMDL-43719 tags: Fix the sql statement in the tag management page.
Adrian Greeve [Fri, 11 Apr 2014 05:41:16 +0000 (13:41 +0800)]
MDL-43719 tags: Fix the sql statement in the tag management page.

MSSQL and Oracle require that all fields in teh select also be present
in the group by section.

7 years agoMerge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Fri, 11 Apr 2014 05:01:38 +0000 (13:01 +0800)]
Merge branch 'MDL-44981-master' of git://github.com/jamiepratt/moodle

7 years agoMerge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle
Dan Poltawski [Fri, 11 Apr 2014 04:55:15 +0000 (12:55 +0800)]
Merge branch 'MDL-44980-master-v2' of git://github.com/jamiepratt/moodle

7 years agoMerge branch 'wip-MDL-45038-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Fri, 11 Apr 2014 04:48:14 +0000 (12:48 +0800)]
Merge branch 'wip-MDL-45038-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-44936 csslib: Chunking supports @media queries and commas in rules
Frederic Massart [Mon, 7 Apr 2014 08:30:58 +0000 (16:30 +0800)]
MDL-44936 csslib: Chunking supports @media queries and commas in rules

7 years agoMDL-40063 mod_quiz: created 'override_created' events
Mark Nelson [Sat, 25 Jan 2014 02:08:54 +0000 (18:08 -0800)]
MDL-40063 mod_quiz: created 'override_created' events

7 years agoMDL-40063 mod_quiz: replaced ‘manualgrade’ add_to_log call with an event
Mark Nelson [Tue, 17 Dec 2013 04:15:51 +0000 (20:15 -0800)]
MDL-40063 mod_quiz: replaced ‘manualgrade’ add_to_log call with an event

7 years agoMDL-40063 mod_quiz: replaced 'attempt' add_to_log call with an event
Mark Nelson [Fri, 22 Nov 2013 01:08:58 +0000 (17:08 -0800)]
MDL-40063 mod_quiz: replaced 'attempt' add_to_log call with an event

7 years agoMDL-40063 mod_quiz: replaced 'preview' add_to_log call with an event
Mark Nelson [Fri, 22 Nov 2013 01:03:17 +0000 (17:03 -0800)]
MDL-40063 mod_quiz: replaced 'preview' add_to_log call with an event

7 years agoMDL-40063 mod_quiz: replaced 'continue attempt' add_to_log call with an event
Mark Nelson [Fri, 22 Nov 2013 00:18:10 +0000 (16:18 -0800)]
MDL-40063 mod_quiz: replaced 'continue attempt' add_to_log call with an event

7 years agoMDL-40063 mod_quiz: replaced 'delete override' add_to_log call with events
Mark Nelson [Thu, 21 Nov 2013 22:34:44 +0000 (14:34 -0800)]
MDL-40063 mod_quiz: replaced 'delete override' add_to_log call with events

7 years agoMDL-40063 mod_quiz: replaced 'edit override' add_to_log call with events
Mark Nelson [Thu, 21 Nov 2013 22:23:10 +0000 (14:23 -0800)]
MDL-40063 mod_quiz: replaced 'edit override' add_to_log call with events

7 years agoMDL-40063 mod_quiz: removed 'close attempt' add_to_log call
Mark Nelson [Thu, 21 Nov 2013 21:59:14 +0000 (13:59 -0800)]
MDL-40063 mod_quiz: removed 'close attempt' add_to_log call

7 years agoMDL-40063 mod_quiz: replaced 'view summary' add_to_log call with an event
Mark Nelson [Wed, 20 Nov 2013 08:26:40 +0000 (00:26 -0800)]
MDL-40063 mod_quiz: replaced 'view summary' add_to_log call with an event

7 years agoMDL-40063 mod_quiz: replaced 'review' add_to_log call with an event
Mark Nelson [Wed, 20 Nov 2013 07:57:52 +0000 (23:57 -0800)]
MDL-40063 mod_quiz: replaced 'review' add_to_log call with an event

7 years agoweekly release 2.7dev
Dan Poltawski [Fri, 11 Apr 2014 03:39:56 +0000 (11:39 +0800)]
weekly release 2.7dev

7 years agoMDL-40063 mod_quiz: replaced 'report' add_to_log call with an event
Mark Nelson [Wed, 20 Nov 2013 07:12:52 +0000 (23:12 -0800)]
MDL-40063 mod_quiz: replaced 'report' add_to_log call with an event

7 years agoNOBUG: Fixed file access permissions
Dan Poltawski [Fri, 11 Apr 2014 03:39:56 +0000 (11:39 +0800)]
NOBUG: Fixed file access permissions

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Fri, 11 Apr 2014 03:39:52 +0000 (11:39 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMDL-40063 mod_quiz: replaced 'delete attempt' add_to_log call with an event
Mark Nelson [Wed, 20 Nov 2013 05:27:47 +0000 (21:27 -0800)]
MDL-40063 mod_quiz: replaced 'delete attempt' add_to_log call with an event

7 years agoMDL-40063 mod_quiz: replaced 'addcategory' add_to_log call with an event
Mark Nelson [Wed, 20 Nov 2013 04:49:17 +0000 (20:49 -0800)]
MDL-40063 mod_quiz: replaced 'addcategory' add_to_log call with an event

7 years agoMDL-40063 mod_quiz: replaced 'editquestions' add_to_log call with an event
Mark Nelson [Tue, 19 Nov 2013 06:07:09 +0000 (22:07 -0800)]
MDL-40063 mod_quiz: replaced 'editquestions' add_to_log call with an event

7 years agoMDL-40063 mod_quiz: replaced 'view' and 'view all' add_to_log calls with events
Mark Nelson [Tue, 19 Nov 2013 04:47:20 +0000 (20:47 -0800)]
MDL-40063 mod_quiz: replaced 'view' and 'view all' add_to_log calls with events

7 years agoRevert "MDL-44758 editor-atto: prevent table-in-table creation"
Damyon Wiese [Fri, 11 Apr 2014 01:47:57 +0000 (09:47 +0800)]
Revert "MDL-44758 editor-atto: prevent table-in-table creation"

This reverts commit 3a6511a530015813f7bfda5547f8fc9de750efcf.

Conflicts:
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
lib/editor/atto/plugins/table/yui/src/button/js/button.js

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 10 Apr 2014 22:38:35 +0000 (22:38 +0000)]
Automatically generated installer lang files

7 years agoMDL-45038 modinfo: added property section_info::modinfo
Marina Glancy [Thu, 10 Apr 2014 12:23:16 +0000 (20:23 +0800)]
MDL-45038 modinfo: added property section_info::modinfo

7 years agoMDL-44342 air notifier: Fixied checking for empty values in event object
Juan Leyva [Thu, 10 Apr 2014 09:26:23 +0000 (11:26 +0200)]
MDL-44342 air notifier: Fixied checking for empty values in event object

7 years agoMDL-44342 airnotifier: Added new functions to the Mobile service
Juan Leyva [Thu, 10 Apr 2014 08:23:28 +0000 (10:23 +0200)]
MDL-44342 airnotifier: Added new functions to the Mobile service

7 years agoMerge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle
Dan Poltawski [Thu, 10 Apr 2014 06:51:42 +0000 (14:51 +0800)]
Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

7 years agoMDL-44070 core_completion: Removed unwanted tag
Rajesh Taneja [Thu, 10 Apr 2014 06:28:28 +0000 (14:28 +0800)]
MDL-44070 core_completion: Removed unwanted tag

7 years agoMDL-44868 editor_atto: Remember the last focused button in the toolbar
Frederic Massart [Thu, 10 Apr 2014 06:22:10 +0000 (14:22 +0800)]
MDL-44868 editor_atto: Remember the last focused button in the toolbar

7 years agoMDL-44170 LTI - fix unit tests.
Damyon Wiese [Thu, 10 Apr 2014 06:13:45 +0000 (14:13 +0800)]
MDL-44170 LTI - fix unit tests.

7 years agoMerge branch 'MDL-44927-master-fix2' of https://github.com/damyon/moodle
Dan Poltawski [Thu, 10 Apr 2014 06:09:15 +0000 (14:09 +0800)]
Merge branch 'MDL-44927-master-fix2' of https://github.com/damyon/moodle

7 years agoMerge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle
Damyon Wiese [Thu, 10 Apr 2014 05:33:50 +0000 (13:33 +0800)]
Merge branch 'MDL-44170-master' of https://github.com/adrianfish/moodle

7 years agoMDL-44927 Atto: Fix bad merge of MDL-44760 (missing menu entry)
Damyon Wiese [Thu, 10 Apr 2014 05:24:28 +0000 (13:24 +0800)]
MDL-44927 Atto: Fix bad merge of MDL-44760 (missing menu entry)

7 years agoMDL-44342 Airnotifier: Bug in retrieving user prefs (fixes fail in unit test)
Damyon Wiese [Thu, 10 Apr 2014 05:16:40 +0000 (13:16 +0800)]
MDL-44342 Airnotifier: Bug in retrieving user prefs (fixes fail in unit test)

7 years agoMDL-44342 airnotifier: Change default Airnotifier url to use SSL
Juan Leyva [Wed, 9 Apr 2014 09:47:45 +0000 (11:47 +0200)]
MDL-44342 airnotifier: Change default Airnotifier url to use SSL

This commit include also a fix for checking forced settings

7 years agoMerge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle
Sam Hemelryk [Wed, 9 Apr 2014 21:26:07 +0000 (09:26 +1200)]
Merge branch 'MDL-44760-master-2' of https://github.com/andrewnicols/moodle

7 years agoMDL-44070 Behat: Fixed restrict_activity_by_date.feature
sam marshall [Wed, 9 Apr 2014 15:45:08 +0000 (16:45 +0100)]
MDL-44070 Behat: Fixed restrict_activity_by_date.feature

7 years agoMDL-44070 core_completion: Fixed behat
Rajesh Taneja [Wed, 9 Apr 2014 09:51:29 +0000 (17:51 +0800)]
MDL-44070 core_completion: Fixed behat

7 years agoMerge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle
Dan Poltawski [Wed, 9 Apr 2014 09:37:24 +0000 (17:37 +0800)]
Merge branch 'MDL-43856-master-fix1' of https://github.com/damyon/moodle

7 years agoMDL-43856 MathJax: Delay setting of lang until after MathJax startup
Damyon Wiese [Wed, 9 Apr 2014 08:44:40 +0000 (16:44 +0800)]
MDL-43856 MathJax: Delay setting of lang until after MathJax startup

7 years agoMerge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 9 Apr 2014 07:44:39 +0000 (15:44 +0800)]
Merge branch 'wip-MDL-40843-fix' of git://github.com/marinaglancy/moodle

7 years agoMDL-42462 mod_feedback: added $OUTPUT to list of global variables used to avoid error
Mark Nelson [Wed, 9 Apr 2014 07:00:25 +0000 (00:00 -0700)]
MDL-42462 mod_feedback: added $OUTPUT to list of global variables used to avoid error

7 years agoMerge branch 'MDL-42195-master-fix2' of https://github.com/damyon/moodle
Dan Poltawski [Wed, 9 Apr 2014 07:32:30 +0000 (15:32 +0800)]
Merge branch 'MDL-42195-master-fix2' of https://github.com/damyon/moodle

7 years agoMDL-40843 chat: fixed bug in SQL query in recent activity block
Marina Glancy [Wed, 9 Apr 2014 07:31:49 +0000 (15:31 +0800)]
MDL-40843 chat: fixed bug in SQL query in recent activity block

7 years agoMDL-44760 editor_atto: Address issues with focus when closing menus
Andrew Nicols [Wed, 9 Apr 2014 07:26:32 +0000 (15:26 +0800)]
MDL-44760 editor_atto: Address issues with focus when closing menus

Safari fires it's events in a slightly different order for the focusoutside
event which causes the focusAfterHide to be called *after* we change focus.

As a result, we must keep track of the menus which are currently open and
remove their focusAfterHide.

7 years agoMDL-42195 Bootstrap: Make selector for responsive images 100% the same as bootstrap3.
Damyon Wiese [Wed, 9 Apr 2014 06:57:33 +0000 (14:57 +0800)]
MDL-42195 Bootstrap: Make selector for responsive images 100% the same as bootstrap3.

7 years agoMDL-44844 core: Fix custom menu navigation
Andrew Nicols [Wed, 9 Apr 2014 06:44:58 +0000 (14:44 +0800)]
MDL-44844 core: Fix custom menu navigation

Atto introduced a rule to hide all Nodes with the yui3-menu-hidden class
but this rule is too general and applies to non-atto content too.

As a result, when loading the menu and during the XY calculation, the
native Element.getBoundingClientRect() function was returning a bounding
box size of 0 because the Node was not visible and the node was being
hidden from view when it was later made visible.

7 years agoMDL-44070 availability: corrected SQL to be mysql-compatible
Marina Glancy [Wed, 9 Apr 2014 06:41:12 +0000 (14:41 +0800)]
MDL-44070 availability: corrected SQL to be mysql-compatible

7 years agoMDL-44268 Assign: Fix behat test for assigned marker filter
Damyon Wiese [Wed, 9 Apr 2014 06:26:57 +0000 (14:26 +0800)]
MDL-44268 Assign: Fix behat test for assigned marker filter

7 years agoMDL-44268 Assign: Improve the "not submitted" filter
Damyon Wiese [Wed, 9 Apr 2014 06:07:40 +0000 (14:07 +0800)]
MDL-44268 Assign: Improve the "not submitted" filter

7 years agoMDL-44268 assign: add 'not submitted' and 'no marker' filter options
Jonathon Fowler [Tue, 18 Feb 2014 06:46:51 +0000 (16:46 +1000)]
MDL-44268 assign: add 'not submitted' and 'no marker' filter options

7 years agoMerge branch 'MDL-41123-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Wed, 9 Apr 2014 06:03:42 +0000 (14:03 +0800)]
Merge branch 'MDL-41123-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'mdl44669-master' of https://github.com/tlock/moodle
Damyon Wiese [Wed, 9 Apr 2014 05:05:46 +0000 (13:05 +0800)]
Merge branch 'mdl44669-master' of https://github.com/tlock/moodle

7 years agoMerge branch 'MDL-31679' of git://github.com/aolley/moodle
Dan Poltawski [Wed, 9 Apr 2014 04:49:35 +0000 (12:49 +0800)]
Merge branch 'MDL-31679' of git://github.com/aolley/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-39759_http_response_code_master' of https://github.com/dongsheng...
Dan Poltawski [Wed, 9 Apr 2014 04:38:30 +0000 (12:38 +0800)]
Merge branch 'MDL-39759_http_response_code_master' of https://github.com/dongsheng/moodle

7 years agoMDL-44507 filemanger: fix coding style
Dan Poltawski [Wed, 9 Apr 2014 04:00:31 +0000 (12:00 +0800)]
MDL-44507 filemanger: fix coding style

7 years agoMerge branch 'MDL-44507_master' of https://github.com/SWiT/moodle
Dan Poltawski [Wed, 9 Apr 2014 03:52:33 +0000 (11:52 +0800)]
Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle
Dan Poltawski [Wed, 9 Apr 2014 03:38:42 +0000 (11:38 +0800)]
Merge branch 'MDL-29572_master' of https://github.com/jrchamp/moodle

7 years agoMDL-44927 Atto: Table editor typo that prevents creation of new tables.
Damyon Wiese [Wed, 9 Apr 2014 03:31:26 +0000 (11:31 +0800)]
MDL-44927 Atto: Table editor typo that prevents creation of new tables.

7 years agoMerge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman...
Dan Poltawski [Wed, 9 Apr 2014 03:12:55 +0000 (11:12 +0800)]
Merge branch 'MDL-39740_grade_item_idnumber_fix' of git://github.com/ashleyholman/moodle

7 years agoMerge branch '44944-27' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 9 Apr 2014 01:48:41 +0000 (09:48 +0800)]
Merge branch '44944-27' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

7 years agoMerge branch 'MDL-40908_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 8 Apr 2014 23:26:33 +0000 (11:26 +1200)]
Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 8 Apr 2014 22:38:25 +0000 (22:38 +0000)]
Automatically generated installer lang files

7 years agoMerge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 8 Apr 2014 22:37:05 +0000 (10:37 +1200)]
Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44765-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 8 Apr 2014 22:26:33 +0000 (10:26 +1200)]
Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle

7 years agoMerge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalys...
Sam Hemelryk [Tue, 8 Apr 2014 22:15:50 +0000 (10:15 +1200)]
Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle

7 years agoMDL-39833 format: tidied up API improvement to allow for future backport
Sam Hemelryk [Mon, 7 Apr 2014 22:11:23 +0000 (10:11 +1200)]
MDL-39833 format: tidied up API improvement to allow for future backport

7 years agoMerge branch 'MDL-39833' of https://github.com/shashirepo/moodle
Sam Hemelryk [Tue, 8 Apr 2014 22:09:02 +0000 (10:09 +1200)]
Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle

7 years agoMDL-42195 Bootstrap - put border and vertical-align back in the reset for all images
Damyon Wiese [Tue, 8 Apr 2014 09:02:58 +0000 (17:02 +0800)]
MDL-42195 Bootstrap - put border and vertical-align back in the reset for all images

7 years agoMerge branch 'MDL-44881-master' of git://github.com/phalacee/moodle
Marina Glancy [Tue, 8 Apr 2014 08:55:49 +0000 (16:55 +0800)]
Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css