63574 Commits

Author SHA1 Message Date
Jason Fowler
2b6361305d MDL-41237 Atto - Adjusting the text styles for the editor 2013-09-10 14:30:02 +08:00
Dan Poltawski
3b46f8dfe1 MDL-41235 fix whitespace 2013-09-10 14:26:53 +08:00
Dan Poltawski
03608c253d Merge branch 'MDL-41235-master' of git://github.com/phalacee/moodle 2013-09-10 14:25:48 +08:00
Jason Fowler
37b16441b8 MDL-41235 atto - Matching the width of the html view to the wysiwyg view 2013-09-10 14:13:14 +08:00
Dan Poltawski
f07c2243b1 Merge branch '41189-26' of git://github.com/samhemelryk/moodle 2013-09-10 14:12:14 +08:00
Rossiani Wijaya
876c0ac382 MDL-41288 wiki: improve heading levels and styling 2013-09-10 14:08:34 +08:00
Damyon Wiese
b10ce36806 Merge branch 'MDL-40736' of git://github.com/rwijaya/moodle 2013-09-10 13:48:01 +08:00
Dan Poltawski
e025a2fc43 Merge branch 'MDL-40686' of git://github.com/rwijaya/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 13:39:01 +08:00
Damyon Wiese
f1f4a860c6 Merge branch 'w37_MDL-41408_m26_loginredirect' of https://github.com/skodak/moodle 2013-09-10 13:33:27 +08:00
Dan Poltawski
f7e719eb38 Merge branch 'MDL-41117_master' of git://github.com/kordan/moodle 2013-09-10 13:23:47 +08:00
Ankit Agarwal
28c4399b6b 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"
2013-09-10 13:14:33 +08:00
Damyon Wiese
bfcc07504e MDL-23335 forum: Fix whitespace 2013-09-10 12:59:49 +08:00
Damyon Wiese
6aca3fc419 Merge branch 'wip-mdl-23335-master' of https://github.com/deraadt/moodle 2013-09-10 12:56:40 +08:00
Damyon Wiese
4fae13bb5e Merge branch 'wip-MDL-37028-master' of git://github.com/marinaglancy/moodle 2013-09-10 12:51:33 +08:00
Damyon Wiese
9e674dbc33 MDL-41497 auth_db: Fix typo in lang string. 2013-09-10 12:26:00 +08:00
Damyon Wiese
603913bcbb Merge branch 'MDL-41497-master' of https://github.com/willylee/moodle 2013-09-10 12:21:20 +08:00
Marina Glancy
64501eeec9 MDL-41436 Remove DB fields course.modinfo and sectioncache 2013-09-10 14:11:52 +10:00
Marina Glancy
4cc819adf0 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
2013-09-10 14:11:51 +10:00
Marina Glancy
1cf1d6e62a MDL-41436 Save extra DB query since 'enablecompletion' is cached 2013-09-10 14:11:51 +10:00
Marina Glancy
4a3fb71c4f MDL-41436 Removing references to fields course.modinfo, sectioncache
Also add the field cacherev to the lists of default fields in course retrieval functions
2013-09-10 14:11:51 +10:00
Marina Glancy
299cfee5f2 MDL-41436 Move course content cache to MUC
added cache definition and DB field course.cacherev for cache validation
2013-09-10 14:11:45 +10:00
Petr Škoda
d82993dc7f 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.
2013-09-10 14:11:44 +10:00
Marina Glancy
44ddd2a115 MDL-41219 course: Make properties of course_modinfo read-only
added phpdocs and unittests
2013-09-10 14:11:37 +10:00
Marina Glancy
cbd6b1fc63 MDL-41192 course: Added unittests for cm_info properties 2013-09-10 14:11:37 +10:00
Marina Glancy
6d04c4f2a2 MDL-41192 course: Added property-read cm_info::effectivegroupmode 2013-09-10 14:11:36 +10:00
Marina Glancy
d872881f2a MDL-41192 course: Properties of cm_info are read-only and calculated on request
Also added phpdocs
2013-09-10 14:11:31 +10:00
Marina Glancy
88715ba2c0 MDL-41192 course: Can not write to the read-only properties of cm_info 2013-09-10 14:11:30 +10:00
Marina Glancy
4e4309064d 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
2013-09-10 14:11:24 +10:00
Dan Poltawski
840bbc1b64 Merge branch 'MDL-28561_M26' of git://github.com/lazydaisy/moodle 2013-09-10 12:04:51 +08:00
Damyon Wiese
cc93ed2698 Merge branch 'MDL-41451_master' of https://github.com/pauln/moodle 2013-09-10 11:59:29 +08:00
Sam Hemelryk
c0382dd012 Merge branch 'MDL-40735_lesson' of https://github.com/andyjdavis/moodle 2013-09-10 15:44:49 +12:00
Dan Poltawski
f841aa780d Merge branch 'MDL-38570-master' of https://github.com/timgus/moodle 2013-09-10 11:13:29 +08:00
Dan Poltawski
30d6c394e2 Merge branch 'MDL-41147-master' of git://github.com/sammarshallou/moodle 2013-09-10 10:27:59 +08:00
Damyon Wiese
b4c6b42eb6 Merge branch 'wip-MDL-40347-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
	theme/upgrade.txt
2013-09-10 09:40:10 +08:00
Damyon Wiese
d0eaa8bf49 Merge branch 'MDL-41626-master' of github.com:StudiUM/moodle 2013-09-10 09:30:56 +08:00
Sam Hemelryk
cb7ca00c55 Merge branch 'MDL-41600' of git://github.com/aolley/moodle 2013-09-10 13:12:13 +12:00
Sam Hemelryk
a63d1e2871 Merge branch 'wip-MDL-41556-master' of git://github.com/abgreeve/moodle 2013-09-10 13:07:37 +12:00
Damyon Wiese
934c70040c Merge branch 'MDL-41253-master' of git://github.com/sammarshallou/moodle 2013-09-10 09:03:42 +08:00
Sam Hemelryk
3eb032d743 NOBUG: fixed whitespace 2013-09-10 13:02:35 +12:00
Adam Olley
910051b798 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.
2013-09-10 09:16:51 +09:30
Sam Hemelryk
a775f2c96d Merge branch 'MDL-40731_headings' of https://github.com/andyjdavis/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-10 11:22:04 +12:00
Sam Hemelryk
bee0a508ef Merge branch 'MDL-41558-master' of git://github.com/ankitagarwal/moodle 2013-09-10 11:16:30 +12:00
Sam Hemelryk
8242ca0c34 MDL-32862 backup: fixed missing global 2013-09-10 10:57:20 +12:00
Sam Hemelryk
68d3e7682a Merge branch 'MDL-41167-master' of git://github.com/sammarshallou/moodle 2013-09-10 10:31:59 +12:00
Sam Hemelryk
12d50d8216 Merge branch 'wip-MDL-32862-master' of git://github.com/abgreeve/moodle 2013-09-10 09:38:46 +12:00
Sam Hemelryk
9b6415dd38 Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle 2013-09-10 09:36:24 +12:00
sam marshall
a7a64d774a MDL-41253 Restore: Mechanism to display progress during UI stages 2013-09-09 12:42:07 +01:00
Dan Poltawski
0df3254212 Merge branch 'MDL-41254-m' of git://github.com/micaherne/moodle 2013-09-09 18:04:05 +08:00
Dan Poltawski
cdf6fc243e Merge branch 'MDL-29069' of https://github.com/bostelm/moodle 2013-09-09 17:37:49 +08:00
Andrew Davis
e5d932cce2 MDL-40734 mod_glossary: cleaned up some headings 2013-09-09 17:30:12 +08:00