Sam Hemelryk [Tue, 10 Sep 2013 21:28:42 +0000 (09:28 +1200)]
Merge branch 'MDL-41238-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 10 Sep 2013 21:26:44 +0000 (09:26 +1200)]
Merge branch 'MDL-41528_master' of https://github.com/nitzo/moodle
Sam Hemelryk [Tue, 10 Sep 2013 21:20:53 +0000 (09:20 +1200)]
Merge branch 'MDL-41630-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 10 Sep 2013 21:12:32 +0000 (09:12 +1200)]
Merge branch 'MDL-41632-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 10 Sep 2013 21:00:54 +0000 (09:00 +1200)]
Merge branch 'wip-MDL-41578-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 10 Sep 2013 20:54:26 +0000 (08:54 +1200)]
Merge branch 'MDL-41599-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 10 Sep 2013 20:52:52 +0000 (08:52 +1200)]
Merge branch 'MDL-41587_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 10 Sep 2013 20:51:02 +0000 (08:51 +1200)]
Merge branch 'MDL-41555_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 10 Sep 2013 20:45:22 +0000 (08:45 +1200)]
Merge branch 'wip-mdl-41590' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 10 Sep 2013 20:42:37 +0000 (08:42 +1200)]
Merge branch 'MDL-40471_master' of https://github.com/totara/openbadges
Sam Hemelryk [Tue, 10 Sep 2013 20:36:54 +0000 (08:36 +1200)]
Merge branch 'MDL-41236-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 10 Sep 2013 20:34:58 +0000 (08:34 +1200)]
Merge branch 'wip-mdl-41589' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 10 Sep 2013 12:16:14 +0000 (14:16 +0200)]
Merge branch 'wip-MDL-41288-fix' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 10 Sep 2013 12:09:34 +0000 (14:09 +0200)]
Merge branch 'wip-MDL-41508-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 10 Sep 2013 12:02:24 +0000 (22:02 +1000)]
MDL-41288 Bugfix of error occuring when subwiki is not set
Dan Poltawski [Tue, 10 Sep 2013 09:35:40 +0000 (17:35 +0800)]
Merge branch 'MDL-40733_forum_name' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 10 Sep 2013 09:30:04 +0000 (17:30 +0800)]
Merge branch 'MDL-41566' of git://github.com/rwijaya/moodle
Rossiani Wijaya [Thu, 5 Sep 2013 04:56:56 +0000 (12:56 +0800)]
MDL-41562 file resource: fix page heading levels.
Also removing printheading options setting.
Dan Poltawski [Tue, 10 Sep 2013 09:14:40 +0000 (17:14 +0800)]
Merge branch 'MDL-41305-master' of git://github.com/FMCorz/moodle
Rossiani Wijaya [Thu, 5 Sep 2013 04:21:01 +0000 (12:21 +0800)]
MDL-41567 url resource: fix page heading levels.
Also removing printheading options setting.
Rossiani Wijaya [Thu, 5 Sep 2013 05:37:29 +0000 (13:37 +0800)]
MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels
Dan Poltawski [Tue, 10 Sep 2013 08:00:52 +0000 (16:00 +0800)]
Merge branch 'MDL-40833-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 10 Sep 2013 07:29:23 +0000 (15:29 +0800)]
Merge branch 'MDL-41564' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 10 Sep 2013 07:21:49 +0000 (15:21 +0800)]
Merge branch 'MDL-41565-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 10 Sep 2013 06:58:54 +0000 (14:58 +0800)]
Merge branch 'MDL-39992-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 10 Sep 2013 06:31:59 +0000 (14:31 +0800)]
Revert "MDL-37028 Integrity check for course modules and sections"
This is failing unit tests.
This reverts commit
0bac49dc1983824e4861086ed1ab9e13af99d76d.
This reverts commit
1f0a9ce48b3e6f8c5dc6628aa692323909925032.
Dan Poltawski [Tue, 10 Sep 2013 06:33:41 +0000 (14:33 +0800)]
Merge branch 'MDL-40631-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 10 Sep 2013 06:29:08 +0000 (14:29 +0800)]
MDL-41237 Atto: Add missing js method docs.
Jason Fowler [Fri, 30 Aug 2013 06:50:51 +0000 (14:50 +0800)]
MDL-41237 Atto - Adjusting the text styles for the editor
Dan Poltawski [Tue, 10 Sep 2013 06:26:28 +0000 (14:26 +0800)]
MDL-41235 fix whitespace
Dan Poltawski [Tue, 10 Sep 2013 06:25:48 +0000 (14:25 +0800)]
Merge branch 'MDL-41235-master' of git://github.com/phalacee/moodle
Jason Fowler [Fri, 30 Aug 2013 07:23:31 +0000 (15:23 +0800)]
MDL-41235 atto - Matching the width of the html view to the wysiwyg view
Dan Poltawski [Tue, 10 Sep 2013 06:12:14 +0000 (14:12 +0800)]
Merge branch '41189-26' of git://github.com/samhemelryk/moodle
Rossiani Wijaya [Tue, 27 Aug 2013 12:59:42 +0000 (20:59 +0800)]
MDL-41288 wiki: improve heading levels and styling
Damyon Wiese [Tue, 10 Sep 2013 05:48:01 +0000 (13:48 +0800)]
Merge branch 'MDL-40736' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 10 Sep 2013 05:39:01 +0000 (13:39 +0800)]
Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Tue, 10 Sep 2013 05:33:27 +0000 (13:33 +0800)]
Merge branch 'w37_MDL-41408_m26_loginredirect' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 10 Sep 2013 05:23:47 +0000 (13:23 +0800)]
Merge branch 'MDL-41117_master' of git://github.com/kordan/moodle
Ankit Agarwal [Tue, 30 Oct 2012 03:29:53 +0000 (11:29 +0800)]
MDL-21415 reports: Adding support of groups to course participation reports
Also introducing new api groups_allgroups_course_menu() that generates a selector for all groups in course"
Damyon Wiese [Tue, 10 Sep 2013 04:59:49 +0000 (12:59 +0800)]
MDL-23335 forum: Fix whitespace
Damyon Wiese [Tue, 10 Sep 2013 04:56:40 +0000 (12:56 +0800)]
Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle
Damyon Wiese [Tue, 10 Sep 2013 04:51:33 +0000 (12:51 +0800)]
Merge branch 'wip-MDL-37028-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 10 Sep 2013 04:26:00 +0000 (12:26 +0800)]
MDL-41497 auth_db: Fix typo in lang string.
Damyon Wiese [Tue, 10 Sep 2013 04:21:20 +0000 (12:21 +0800)]
Merge branch 'MDL-41497-master' of https://github.com/willylee/moodle
Marina Glancy [Wed, 28 Aug 2013 03:54:26 +0000 (13:54 +1000)]
MDL-41436 Remove DB fields course.modinfo and sectioncache
Marina Glancy [Thu, 1 Aug 2013 04:12:05 +0000 (14:12 +1000)]
MDL-41436 Allow user=-1 in get_fast_modinfo()
Remove ref to nonexisting course.modinfo in MNET auth, use get_fast_modinfo() for user=-1 instead
Marina Glancy [Thu, 1 Aug 2013 04:10:23 +0000 (14:10 +1000)]
MDL-41436 Save extra DB query since 'enablecompletion' is cached
Marina Glancy [Thu, 25 Jul 2013 11:53:50 +0000 (21:53 +1000)]
MDL-41436 Removing references to fields course.modinfo, sectioncache
Also add the field cacherev to the lists of default fields in course retrieval functions
Marina Glancy [Tue, 27 Aug 2013 06:58:58 +0000 (16:58 +1000)]
MDL-41436 Move course content cache to MUC
added cache definition and DB field course.cacherev for cache validation
Petr Škoda [Tue, 3 Sep 2013 14:42:42 +0000 (16:42 +0200)]
MDL-41436 implement new increment_revision_number() function
This is intended as a revision counter for local modinfo caching. It should be a lot more reliable and faster than doing it in PHP. Please note you need to invalidate all course caches after using this.
Marina Glancy [Tue, 27 Aug 2013 02:40:56 +0000 (12:40 +1000)]
MDL-41219 course: Make properties of course_modinfo read-only
added phpdocs and unittests
Marina Glancy [Mon, 2 Sep 2013 04:30:33 +0000 (14:30 +1000)]
MDL-41192 course: Added unittests for cm_info properties
Marina Glancy [Tue, 27 Aug 2013 02:08:53 +0000 (12:08 +1000)]
MDL-41192 course: Added property-read cm_info::effectivegroupmode
Marina Glancy [Fri, 26 Jul 2013 04:16:28 +0000 (14:16 +1000)]
MDL-41192 course: Properties of cm_info are read-only and calculated on request
Also added phpdocs
Marina Glancy [Wed, 31 Jul 2013 01:37:32 +0000 (11:37 +1000)]
MDL-41192 course: Can not write to the read-only properties of cm_info
Marina Glancy [Tue, 27 Aug 2013 00:33:49 +0000 (10:33 +1000)]
MDL-41218 Object section_info calculates expensive data on demand only
Added phpdocs and unittests, removed unnecessary fields such as course and userid because they can be retrieved from modinfo
Dan Poltawski [Tue, 10 Sep 2013 04:04:51 +0000 (12:04 +0800)]
Merge branch 'MDL-28561_M26' of git://github.com/lazydaisy/moodle
Damyon Wiese [Tue, 10 Sep 2013 03:59:29 +0000 (11:59 +0800)]
Merge branch 'MDL-41451_master' of https://github.com/pauln/moodle
Sam Hemelryk [Tue, 10 Sep 2013 03:44:49 +0000 (15:44 +1200)]
Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 10 Sep 2013 03:13:29 +0000 (11:13 +0800)]
Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle
Dan Poltawski [Tue, 10 Sep 2013 02:27:59 +0000 (10:27 +0800)]
Merge branch 'MDL-41147-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Tue, 10 Sep 2013 01:39:06 +0000 (09:39 +0800)]
Merge branch 'wip-MDL-40347-master' of git://github.com/marinaglancy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
theme/upgrade.txt
Damyon Wiese [Tue, 10 Sep 2013 01:30:56 +0000 (09:30 +0800)]
Merge branch 'MDL-41626-master' of github.com:StudiUM/moodle
Sam Hemelryk [Tue, 10 Sep 2013 01:12:13 +0000 (13:12 +1200)]
Merge branch 'MDL-41600' of git://github.com/aolley/moodle
Sam Hemelryk [Tue, 10 Sep 2013 01:07:37 +0000 (13:07 +1200)]
Merge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 10 Sep 2013 01:03:42 +0000 (09:03 +0800)]
Merge branch 'MDL-41253-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 10 Sep 2013 01:02:35 +0000 (13:02 +1200)]
NOBUG: fixed whitespace
Adam Olley [Thu, 5 Sep 2013 04:13:32 +0000 (13:43 +0930)]
MDL-41600: qformat_blackboard_six Fix test_import_match fail w/ddmatch
With qtype_ddmatch installed, the unit tests for qformat_blackboard_six
fail as they generate ddmatch questions instead of match ones. This
patch checks for ddmatch and changes the test to expect that instead if
its installed.
Sam Hemelryk [Mon, 9 Sep 2013 23:22:04 +0000 (11:22 +1200)]
Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 9 Sep 2013 23:16:30 +0000 (11:16 +1200)]
Merge branch 'MDL-41558-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Mon, 9 Sep 2013 22:40:11 +0000 (10:40 +1200)]
MDL-32862 backup: fixed missing global
Sam Hemelryk [Mon, 9 Sep 2013 22:31:59 +0000 (10:31 +1200)]
Merge branch 'MDL-41167-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 9 Sep 2013 21:38:46 +0000 (09:38 +1200)]
Merge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 9 Sep 2013 21:36:24 +0000 (09:36 +1200)]
Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle
sam marshall [Fri, 16 Aug 2013 16:26:26 +0000 (17:26 +0100)]
MDL-41253 Restore: Mechanism to display progress during UI stages
Dan Poltawski [Mon, 9 Sep 2013 10:04:05 +0000 (18:04 +0800)]
Merge branch 'MDL-41254-m' of git://github.com/micaherne/moodle
Dan Poltawski [Mon, 9 Sep 2013 09:37:49 +0000 (17:37 +0800)]
Merge branch 'MDL-29069' of https://github.com/bostelm/moodle
Andrew Davis [Mon, 26 Aug 2013 04:57:50 +0000 (11:57 +0700)]
MDL-40734 mod_glossary: cleaned up some headings
David Mudrák [Mon, 9 Sep 2013 09:19:48 +0000 (11:19 +0200)]
MDL-29378 Fix the recent string modification
But accident, I have modified the string 'collesaintro' in the previous patch.
The correct string to be amended is 'collesapintro'.
Dan Poltawski [Mon, 9 Sep 2013 09:13:22 +0000 (17:13 +0800)]
Merge branch 'MDL-37804' of github.com:recreate/moodle
Mary Evans [Sun, 8 Sep 2013 15:23:14 +0000 (16:23 +0100)]
MDL-40575 theme_bootstrapbase: Unable to scroll language menu in theme/clean.
Dan Poltawski [Mon, 9 Sep 2013 07:29:48 +0000 (15:29 +0800)]
Merge branch 'MDL-41163-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 9 Sep 2013 06:25:07 +0000 (14:25 +0800)]
MDL-41438 version bump
Dan Poltawski [Mon, 9 Sep 2013 06:23:41 +0000 (14:23 +0800)]
Merge branch 'MDL-41438' of git://github.com/rwijaya/moodle
Damyon Wiese [Mon, 9 Sep 2013 04:43:32 +0000 (12:43 +0800)]
Merge branch 'wip-MDL-41517-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Mon, 9 Sep 2013 03:25:02 +0000 (11:25 +0800)]
MDL-18275 Calendar types: Add a major version + redirect for ci server fail.
Damyon Wiese [Mon, 9 Sep 2013 02:46:59 +0000 (10:46 +0800)]
Merge branch 'master_MDL-41290' of git://github.com/danmarsden/moodle
Damyon Wiese [Mon, 9 Sep 2013 02:41:12 +0000 (10:41 +0800)]
Merge branch 'MDL-18375_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 9 Sep 2013 02:22:02 +0000 (10:22 +0800)]
Merge branch 'MDL-41151-master' of git://github.com/sammarshallou/moodle
Rossiani Wijaya [Thu, 5 Sep 2013 03:39:02 +0000 (11:39 +0800)]
MDL-41566 page resource: fix page heading levels.
Also removing printheading options setting.
Rossiani Wijaya [Tue, 3 Sep 2013 07:40:43 +0000 (15:40 +0800)]
MDL-41564 folder resource: fix page heading levels
Rossiani Wijaya [Tue, 27 Aug 2013 12:46:35 +0000 (20:46 +0800)]
MDL-40736 Survey: improve heading levels and styling
Rossiani Wijaya [Mon, 2 Sep 2013 06:45:00 +0000 (14:45 +0800)]
MDL-40686 book: fix heading level and styling
Rossiani Wijaya [Mon, 2 Sep 2013 06:39:04 +0000 (14:39 +0800)]
MDL-41438 core renderer: additional patch to remove .main definition from all core themes
Rossiani Wijaya [Thu, 29 Aug 2013 02:30:02 +0000 (10:30 +0800)]
MDL-41438 core_renderer: Update the parameters for heading() and heading_with_help().
heading(), change the default value for classes from 'main' to null.
heading_with_help(), add 2 additional parameters for level and classnames. Default value of level is set to 2 and classnames is set to null.
With the changes for heading_with_help(), icon image vertical alignment needs to be adjusted, so it display in the middle of the heading.
Also added some notes in theme/upgrade.txt file.
Paul Nicholls [Sun, 8 Sep 2013 23:21:33 +0000 (11:21 +1200)]
MDL-41451 - formslib: use create_function instead of inline function
As per MDL-39432, closure-style inline functions can result in fatal
errors when using eAccelerator and thus should be avoided.
Sam Hemelryk [Sun, 8 Sep 2013 23:12:56 +0000 (11:12 +1200)]
Merge branch 'MDL-38794' of https://github.com/prateeksachan/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:54:11 +0000 (10:54 +1200)]
Merge branch 'MDL-41417_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:48:13 +0000 (10:48 +1200)]
Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:19:00 +0000 (10:19 +1200)]
Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle
