moodle.git
8 years agoMerge branch 'wip-MDL-40174-m26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 22 Jul 2013 08:00:41 +0000 (16:00 +0800)]
Merge branch 'wip-MDL-40174-m26' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'w30_MDL-40545_m26_localcachedir' of https://github.com/skodak/moodle
Dan Poltawski [Mon, 22 Jul 2013 07:47:48 +0000 (15:47 +0800)]
Merge branch 'w30_MDL-40545_m26_localcachedir' of https://github.com/skodak/moodle

8 years agoMerge branch 'w30_MDL-39846_m26_event2' of https://github.com/skodak/moodle
Damyon Wiese [Mon, 22 Jul 2013 07:05:53 +0000 (15:05 +0800)]
Merge branch 'w30_MDL-39846_m26_event2' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-38837_dev' of https://github.com/totara/openbadges
Dan Poltawski [Mon, 22 Jul 2013 07:01:26 +0000 (15:01 +0800)]
Merge branch 'MDL-38837_dev' of https://github.com/totara/openbadges

8 years agoMerge branch 'wip-MDL-40121-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 22 Jul 2013 06:36:29 +0000 (14:36 +0800)]
Merge branch 'wip-MDL-40121-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'MDL-40649_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 22 Jul 2013 04:11:43 +0000 (12:11 +0800)]
Merge branch 'MDL-40649_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-40468_master' of https://github.com/markn86/moodle
Damyon Wiese [Mon, 22 Jul 2013 03:47:21 +0000 (11:47 +0800)]
Merge branch 'MDL-40468_master' of https://github.com/markn86/moodle

8 years agoMerge branch 'MDL-39441_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 22 Jul 2013 02:45:42 +0000 (10:45 +0800)]
Merge branch 'MDL-39441_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'wip-MDL-37333_master' of git://github.com/gjb2048/moodle
Dan Poltawski [Mon, 22 Jul 2013 02:27:11 +0000 (10:27 +0800)]
Merge branch 'wip-MDL-37333_master' of git://github.com/gjb2048/moodle

8 years agoMDL-40174 navigation: don't remove active root nodes without children
Sam Hemelryk [Fri, 19 Jul 2013 03:51:40 +0000 (15:51 +1200)]
MDL-40174 navigation: don't remove active root nodes without children

8 years agoMDL-40545 convert font cache to localcachedir
Petr Škoda [Sat, 20 Jul 2013 12:11:40 +0000 (14:11 +0200)]
MDL-40545 convert font cache to localcachedir

8 years agoMDL-40545 convert js and theme resources to localcachedir
Petr Škoda [Fri, 12 Jul 2013 22:05:58 +0000 (00:05 +0200)]
MDL-40545 convert js and theme resources to localcachedir

8 years agoMDL-40545 add $CFG->localcachedir intended for local caching on cluster nodes
Petr Škoda [Sun, 7 Jul 2013 19:42:03 +0000 (21:42 +0200)]
MDL-40545 add $CFG->localcachedir intended for local caching on cluster nodes

8 years agoMDL-23493 allow numbers in components used in CSS placeholders
Petr Škoda [Sat, 20 Jul 2013 11:08:35 +0000 (13:08 +0200)]
MDL-23493 allow numbers in components used in CSS placeholders

8 years agoMDL-23493 add support for theme fonts
Petr Škoda [Fri, 19 Jul 2013 09:53:16 +0000 (11:53 +0200)]
MDL-23493 add support for theme fonts

8 years agoMDL-40649 libraries: deprecated get_recent_enrolments()
Mark Nelson [Fri, 19 Jul 2013 08:12:28 +0000 (16:12 +0800)]
MDL-40649 libraries: deprecated get_recent_enrolments()

8 years agoMDL-40468 libraries: removed usages of get_related_contexts_string() in core
Mark Nelson [Tue, 9 Jul 2013 05:34:39 +0000 (13:34 +0800)]
MDL-40468 libraries: removed usages of get_related_contexts_string() in core

Also tidied up the functions by removing unused parameters.

8 years agoMDL-40468 libraries: deprecated get_related_contexts_string()
Mark Nelson [Mon, 8 Jul 2013 10:30:30 +0000 (18:30 +0800)]
MDL-40468 libraries: deprecated get_related_contexts_string()

8 years agoMDL-39846 make all legacy info protected so that it is not used accidentally outside...
Petr Škoda [Fri, 19 Jul 2013 07:00:42 +0000 (09:00 +0200)]
MDL-39846 make all legacy info protected so that it is not used accidentally outside of trigger()

8 years agoMDL-39846 lock down snapshot handling in event
Petr Škoda [Fri, 19 Jul 2013 06:46:29 +0000 (08:46 +0200)]
MDL-39846 lock down snapshot handling in event

8 years agoMDL-39846 fix forgotten object event property
Petr Škoda [Thu, 18 Jul 2013 06:04:32 +0000 (08:04 +0200)]
MDL-39846 fix forgotten object event property

Thanks Dan!

8 years agoMDL-39846 prevent data modification from event init() method
Petr Škoda [Wed, 17 Jul 2013 05:33:22 +0000 (07:33 +0200)]
MDL-39846 prevent data modification from event init() method

8 years agoMDL-39846 use new special value -1 in $CFG->loglifetime to prevent legacy logging
Petr Škoda [Wed, 17 Jul 2013 04:40:34 +0000 (06:40 +0200)]
MDL-39846 use new special value -1 in $CFG->loglifetime to prevent legacy logging

8 years agoMDL-39846 rename the $object var to match the property name
Petr Škoda [Tue, 16 Jul 2013 09:43:27 +0000 (11:43 +0200)]
MDL-39846 rename the $object var to match the property name

Thanks Fred again.

8 years agoMDL-39846 rename object property to target
Petr Škoda [Tue, 16 Jul 2013 09:38:21 +0000 (11:38 +0200)]
MDL-39846 rename object property to target

Credit goes to Fred, this should be easier to understand.

8 years agoMDL-39846 improve docs
Petr Škoda [Tue, 16 Jul 2013 05:51:14 +0000 (07:51 +0200)]
MDL-39846 improve docs

8 years agoMDL-39846 remove contextlevel validation
Petr Škoda [Tue, 16 Jul 2013 05:50:10 +0000 (07:50 +0200)]
MDL-39846 remove contextlevel validation

Do this in new validate_data() instead, thanks Fred.

8 years agoMDL-39846 fix comment typos
Petr Škoda [Tue, 16 Jul 2013 05:43:43 +0000 (07:43 +0200)]
MDL-39846 fix comment typos

Thanks Fred!

8 years agoMDL-39846 simplify context parameter when creating new evetns
Petr Škoda [Mon, 15 Jul 2013 10:25:18 +0000 (12:25 +0200)]
MDL-39846 simplify context parameter when creating new evetns

8 years agoMDL-39846 improve validation and enable hardcoding of system context
Petr Škoda [Mon, 15 Jul 2013 09:37:00 +0000 (11:37 +0200)]
MDL-39846 improve validation and enable hardcoding of system context

8 years agoMDL-39846 prevent use of snapshots in restored events
Petr Škoda [Mon, 15 Jul 2013 08:03:05 +0000 (10:03 +0200)]
MDL-39846 prevent use of snapshots in restored events

8 years agoMDL-39846 prevent adding of snapshots after event trigger
Petr Škoda [Mon, 15 Jul 2013 07:23:45 +0000 (09:23 +0200)]
MDL-39846 prevent adding of snapshots after event trigger

8 years agoMDL-39846 improve docs and fix use of deprecated classes
Petr Škoda [Sun, 14 Jul 2013 11:35:15 +0000 (13:35 +0200)]
MDL-39846 improve docs and fix use of deprecated classes

8 years agoMDL-39846 fix name of property for record snapshots
Petr Škoda [Sun, 14 Jul 2013 11:27:32 +0000 (13:27 +0200)]
MDL-39846 fix name of property for record snapshots

8 years agoMDL-39846 improve role assignment tests
Petr Škoda [Sun, 14 Jul 2013 11:25:36 +0000 (13:25 +0200)]
MDL-39846 improve role assignment tests

8 years agoMDL-39846 add event property iterator
Petr Škoda [Sat, 13 Jul 2013 12:25:57 +0000 (14:25 +0200)]
MDL-39846 add event property iterator

8 years agoMDL-39846 require context when creating events
Petr Škoda [Sat, 13 Jul 2013 12:14:33 +0000 (14:14 +0200)]
MDL-39846 require context when creating events

No more guessing or falling back to system context.

8 years agoMDL-39846 implement event sink for unit testing
Petr Škoda [Sat, 13 Jul 2013 10:40:16 +0000 (12:40 +0200)]
MDL-39846 implement event sink for unit testing

8 years agoMDL-39846 introduce new objecttable property
Petr Škoda [Sat, 13 Jul 2013 09:20:45 +0000 (11:20 +0200)]
MDL-39846 introduce new objecttable property

8 years agoMDL-39846 rename cached record to snapshot
Petr Škoda [Sat, 13 Jul 2013 09:00:30 +0000 (11:00 +0200)]
MDL-39846 rename cached record to snapshot

8 years agoMDL-39846 use word 'extra' for special log fields
Petr Škoda [Tue, 9 Jul 2013 13:13:27 +0000 (15:13 +0200)]
MDL-39846 use word 'extra' for special log fields

8 years agoMDL-39846 rename 'extra' event property to 'other'
Petr Škoda [Tue, 9 Jul 2013 13:00:15 +0000 (15:00 +0200)]
MDL-39846 rename 'extra' event property to 'other'

8 years agoMDL-39846 add more magic and improve tests
Petr Škoda [Tue, 9 Jul 2013 12:51:36 +0000 (14:51 +0200)]
MDL-39846 add more magic and improve tests

8 years agoMDL-39846 add logging TODOs
Petr Škoda [Tue, 9 Jul 2013 12:31:39 +0000 (14:31 +0200)]
MDL-39846 add logging TODOs

8 years agoMDL-39846 protect event dispatching process
Petr Škoda [Mon, 8 Jul 2013 13:03:34 +0000 (15:03 +0200)]
MDL-39846 protect event dispatching process

8 years agoMDL-39846 more fixing and cleanup of new events
Petr Škoda [Sat, 6 Jul 2013 12:35:02 +0000 (14:35 +0200)]
MDL-39846 more fixing and cleanup of new events

* fix typos (thanks Rajesh)
* move log related data out from event API specification
* change callable key in definition to callback
* use event data in observers instead of cached records if possible
* event level is now a number 1…100
* improved event safety checks
* add event name and description method
* new can_view() method
* improve unit tests to test all callable types
* improved performance

8 years agoMDL-39846 convert enrol_category to new events and class loader
Petr Škoda [Sat, 29 Jun 2013 19:07:11 +0000 (21:07 +0200)]
MDL-39846 convert enrol_category to new events and class loader

8 years agoMDL-39846 sample conversion of role assignment events
Petr Škoda [Sat, 29 Jun 2013 19:06:31 +0000 (21:06 +0200)]
MDL-39846 sample conversion of role assignment events

8 years agoMDL-39846 implement new event dispatching and base event class
Petr Škoda [Sun, 16 Jun 2013 13:33:47 +0000 (15:33 +0200)]
MDL-39846 implement new event dispatching and base event class

8 years agoweekly release 2.6dev
Damyon Wiese [Fri, 19 Jul 2013 01:47:55 +0000 (09:47 +0800)]
weekly release 2.6dev

8 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Damyon Wiese [Fri, 19 Jul 2013 01:19:29 +0000 (09:19 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

8 years agoMerge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Thu, 18 Jul 2013 18:22:47 +0000 (20:22 +0200)]
Merge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle

8 years agoMDL-35851 lesson: Handle importing questions into an empty lesson.
Damyon Wiese [Thu, 18 Jul 2013 08:45:44 +0000 (16:45 +0800)]
MDL-35851 lesson: Handle importing questions into an empty lesson.

Also - make sure the page we are updating belongs to the lesson.

8 years agoMDL-39441 behat: New setting to expand the list of allowed settings
David Monllao [Mon, 15 Jul 2013 09:22:49 +0000 (11:22 +0200)]
MDL-39441 behat: New setting to expand the list of allowed settings

8 years agoMDL-39441 behat: Restrict config.php allowed settings
David Monllao [Fri, 12 Jul 2013 19:42:04 +0000 (21:42 +0200)]
MDL-39441 behat: Restrict config.php allowed settings

8 years agoMDL-13114 tool_uploadcourse: Fixed typo in CLI help
Frederic Massart [Thu, 18 Jul 2013 01:18:05 +0000 (09:18 +0800)]
MDL-13114 tool_uploadcourse: Fixed typo in CLI help

8 years agoMDL-38837 badges: Check for http or https in badges backpack support
Yuliya Bozhko [Tue, 16 Jul 2013 04:09:11 +0000 (16:09 +1200)]
MDL-38837 badges: Check for http or https in badges backpack support

8 years agoMDL-37333 theme: Fix 'Clear theme caches' redirect.
Gareth J Barnard [Wed, 17 Jul 2013 13:42:50 +0000 (14:42 +0100)]
MDL-37333 theme: Fix 'Clear theme caches' redirect.

8 years agoMDL-39926 SCORM: objetives report now core plugin
Eloy Lafuente (stronk7) [Wed, 17 Jul 2013 09:06:05 +0000 (11:06 +0200)]
MDL-39926 SCORM: objetives report now core plugin

8 years ago MDL-40604 course: remove deprecated function
Dan Poltawski [Wed, 17 Jul 2013 05:46:31 +0000 (13:46 +0800)]
 MDL-40604 course: remove deprecated function

* course_delete_module was calling delete_event
* Also fix missing inclusion from 379cd2d4

8 years agoMDL-40604 course: add test to cover course_delete_module
Dan Poltawski [Wed, 17 Jul 2013 05:45:57 +0000 (13:45 +0800)]
MDL-40604 course: add test to cover course_delete_module

8 years agoMDL-40604 wiki: fix use of print_container
Dan Poltawski [Wed, 17 Jul 2013 02:48:48 +0000 (10:48 +0800)]
MDL-40604 wiki: fix use of print_container

8 years agoMDL-35851 Lesson: Check/fix the page order every time the pages are loaded
Damyon Wiese [Wed, 17 Jul 2013 03:59:10 +0000 (11:59 +0800)]
MDL-35851 Lesson: Check/fix the page order every time the pages are loaded

8 years agoMerge branch 'MDL-40701-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Wed, 17 Jul 2013 02:45:18 +0000 (12:45 +1000)]
Merge branch 'MDL-40701-master' of git://github.com/danpoltawski/moodle

8 years agoMDL-40701 mod_assignment: fix refresh events
Dan Poltawski [Wed, 17 Jul 2013 02:29:25 +0000 (10:29 +0800)]
MDL-40701 mod_assignment: fix refresh events

It was getting the cm event with the wrong id and calling
deprecated functions

8 years agoMDL-40424 user: Incorrect use of named parameters
Frederic Massart [Wed, 17 Jul 2013 01:45:42 +0000 (09:45 +0800)]
MDL-40424 user: Incorrect use of named parameters

8 years agoMerge branch 'MDL-40478-m' of git://github.com/andrewnicols/moodle
Marina Glancy [Wed, 17 Jul 2013 01:09:08 +0000 (11:09 +1000)]
Merge branch 'MDL-40478-m' of git://github.com/andrewnicols/moodle

8 years agoAutomatically generated installer lang files
AMOS bot [Wed, 17 Jul 2013 00:42:25 +0000 (00:42 +0000)]
Automatically generated installer lang files

8 years agoMDL-40604 Fix 2 uses causing unit test failures
Eloy Lafuente (stronk7) [Wed, 17 Jul 2013 00:34:07 +0000 (02:34 +0200)]
MDL-40604 Fix 2 uses causing unit test failures

There are still a lot of deprecated uses in core
that we should move to the new counterparts ASAP.

This commit just fixes the 2 deprecated uses that
are causing unit tests to fail.

8 years agoMDL-40424 vomit back wrongly digested brace, grrr.
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 23:43:11 +0000 (01:43 +0200)]
MDL-40424 vomit back wrongly digested brace, grrr.

8 years agoMerge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 23:21:51 +0000 (01:21 +0200)]
Merge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle

Conflicts:
admin/oacleanup.php

8 years agoMerge branch 'MDL-40477-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 23:13:17 +0000 (01:13 +0200)]
Merge branch 'MDL-40477-m' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'w29_MDL-40220_m26_core_component' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 23:07:21 +0000 (01:07 +0200)]
Merge branch 'w29_MDL-40220_m26_core_component' of https://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-40634-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 22:58:26 +0000 (00:58 +0200)]
Merge branch 'wip-MDL-40634-m26' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'wip-MDL-40635-m26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 22:43:45 +0000 (00:43 +0200)]
Merge branch 'wip-MDL-40635-m26' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-40652_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 22:41:15 +0000 (00:41 +0200)]
Merge branch 'MDL-40652_master' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'w29_MDL-40611_m26_accesslibtest' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 22:32:32 +0000 (00:32 +0200)]
Merge branch 'w29_MDL-40611_m26_accesslibtest' of https://github.com/skodak/moodle

8 years agoMerge branch 'w29_MDL-40546_m26_jscache' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 22:30:13 +0000 (00:30 +0200)]
Merge branch 'w29_MDL-40546_m26_jscache' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-40536-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 22:24:10 +0000 (00:24 +0200)]
Merge branch 'MDL-40536-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-40604-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 22:22:15 +0000 (00:22 +0200)]
Merge branch 'MDL-40604-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-40690_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 22:17:30 +0000 (00:17 +0200)]
Merge branch 'MDL-40690_master' of git://github.com/dmonllao/moodle

8 years agoMDL-40220 improve lib/upgrade.txt info for the new core_component class and deprecate...
Petr Škoda [Tue, 16 Jul 2013 20:16:58 +0000 (22:16 +0200)]
MDL-40220 improve lib/upgrade.txt info for the new core_component class and deprecated functions

8 years agoMDL-40220 use new core_component::get_component_directory()
Petr Škoda [Tue, 16 Jul 2013 20:42:37 +0000 (22:42 +0200)]
MDL-40220 use new core_component::get_component_directory()

8 years agoMDL-40220 use new core_component::normalize_component()
Petr Škoda [Tue, 16 Jul 2013 20:41:00 +0000 (22:41 +0200)]
MDL-40220 use new core_component::normalize_component()

8 years agoMDL-40220 use new core_component::get_plugin_directory()
Petr Škoda [Tue, 16 Jul 2013 20:38:38 +0000 (22:38 +0200)]
MDL-40220 use new core_component::get_plugin_directory()

8 years agoMDL-40220 use new core_component::get_plugin_list_with_class()
Petr Škoda [Tue, 16 Jul 2013 20:37:15 +0000 (22:37 +0200)]
MDL-40220 use new core_component::get_plugin_list_with_class()

8 years agoMDL-40220 use new core_component::get_plugin_list()
Petr Škoda [Tue, 16 Jul 2013 20:36:11 +0000 (22:36 +0200)]
MDL-40220 use new core_component::get_plugin_list()

8 years agoMDL-40220 use new core_component::get_plugin_types()
Petr Škoda [Tue, 16 Jul 2013 20:31:48 +0000 (22:31 +0200)]
MDL-40220 use new core_component::get_plugin_types()

8 years agoMerge branch 'MDL-38857_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 20:02:18 +0000 (22:02 +0200)]
Merge branch 'MDL-38857_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'w29_MDL-40423_m26_localsubdir' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 19:55:46 +0000 (21:55 +0200)]
Merge branch 'w29_MDL-40423_m26_localsubdir' of https://github.com/skodak/moodle

8 years agoMDL-39926 SCORM: Adapt report to alt name fields
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 16:27:35 +0000 (18:27 +0200)]
MDL-39926 SCORM: Adapt report to alt name fields

8 years agoMerge branch 'master_MDL-39926' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 13:29:03 +0000 (15:29 +0200)]
Merge branch 'master_MDL-39926' of git://github.com/danmarsden/moodle

8 years agoMDL-40690 behat: Ignore StaleElementReference exception
David Monllao [Tue, 16 Jul 2013 14:45:12 +0000 (16:45 +0200)]
MDL-40690 behat: Ignore StaleElementReference exception

Is another of the exceptions thrown by
Selenium when it tries to interact with
an element that disappeared from the DOM,
in happens randomly when redirecting the
user to another page with a wait period to
show him/her a message.

8 years agoMerge branch 'MDL-40463-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 16 Jul 2013 13:59:47 +0000 (21:59 +0800)]
Merge branch 'MDL-40463-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'wip-mdl-40467' of git://github.com/rajeshtaneja/moodle
Damyon Wiese [Tue, 16 Jul 2013 13:51:19 +0000 (21:51 +0800)]
Merge branch 'wip-mdl-40467' of git://github.com/rajeshtaneja/moodle

8 years agoMerge branch 'MDL-40465-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 16 Jul 2013 13:35:38 +0000 (21:35 +0800)]
Merge branch 'MDL-40465-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 16 Jul 2013 13:29:58 +0000 (21:29 +0800)]
Merge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 16 Jul 2013 13:23:30 +0000 (21:23 +0800)]
Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle

8 years agoMerge branch 'wip-MDL-39299-master' of git://github.com/phalacee/moodle
Damyon Wiese [Tue, 16 Jul 2013 12:59:41 +0000 (20:59 +0800)]
Merge branch 'wip-MDL-39299-master' of git://github.com/phalacee/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMerge branch 'w29_MDL-40563_m26_themecaching' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 16 Jul 2013 09:41:47 +0000 (11:41 +0200)]
Merge branch 'w29_MDL-40563_m26_themecaching' of https://github.com/skodak/moodle