57417 Commits

Author SHA1 Message Date
Dan Poltawski
0e35ba6ffc MDL-36357 cleanup - remove double semicolons 2012-11-15 09:51:26 +08:00
Dan Poltawski
a3f3ea2684 MDL-36111 cache: remove double semicolons
Thanks to Matteo Scaramuccia!
2012-11-15 09:25:56 +08:00
Dan Poltawski
532a704d95 Merge branch 'wip-MDL-36576-m24' of git://github.com/amygroshek/moodle 2012-11-15 08:56:43 +08:00
Amy Groshek
8ebb84e281 MDL-36576 - change generalbox classname to generaltable to fix rounded corners on the table background color 2012-11-14 12:49:41 -06:00
Frederic Massart
253251a804 MDL-36446 usability: Resource icon on activity block read from page module 2012-11-14 15:00:40 +08:00
Dan Poltawski
cbb0459962 Merge branch 'MDL-36561-master-int' of git://github.com/FMCorz/moodle 2012-11-14 14:29:48 +08:00
Dan Poltawski
43b8730381 Merge branch 'MDL-36449-master-int' of git://github.com/FMCorz/moodle 2012-11-14 14:26:06 +08:00
Frederic Massart
85947dcc22 MDL-36449 usability: Fixed spinner position in lightbox 2012-11-14 14:24:51 +08:00
Dan Poltawski
cc94106b71 Merge branch 'MDL-36565-master-int' of git://github.com/FMCorz/moodle 2012-11-14 14:16:30 +08:00
Dan Poltawski
ebdbc6b781 Merge branch 'MDL-36323-master-int' of git://github.com/FMCorz/moodle 2012-11-14 14:10:49 +08:00
Barbara Ramiro
b7494afe49 MDL-36323 usability: Final icons for i/assignroles and i/switchrole 2012-11-14 14:07:40 +08:00
Frederic Massart
fbb207c57a MDL-36323 usability: New icon names to assign and switch roles 2012-11-14 14:07:40 +08:00
Barbara Ramiro
57dba02813 MDL-36323 usability: Resized icons to 16x16 2012-11-14 14:07:40 +08:00
Frederic Massart
045d946ccc MDL-36323 usability: CSS for block headers 2012-11-14 14:07:40 +08:00
Frederic Massart
11f8718780 MDL-36323 usability: Normalising icons used in blocks 2012-11-14 14:07:40 +08:00
Dan Poltawski
1720550b5d Merge branch 'MDL-36575_modLtiGenerator' of git://github.com/moodlerooms/moodle 2012-11-14 12:22:54 +08:00
Frederic Massart
81063d1fe6 MDL-36565 mod_url: The default activity icon is the module icon 2012-11-14 12:21:57 +08:00
Frederic Massart
d5dfb8d621 MDL-36444 themes: Fixed margin of activities on course page 2012-11-14 12:05:26 +08:00
Frederic Massart
10994f27a1 MDL-36449 usability: Improved renaming toolbox and alignment on course page 2012-11-14 11:38:11 +08:00
Frederic Massart
8a3b8918cb MDL-36449 usability: Course drag and drop field styling 2012-11-14 11:38:10 +08:00
Frederic Massart
bb128107e3 MDL-36449 usability: Normalising icons on course page 2012-11-14 11:38:06 +08:00
Dan Poltawski
7fc7a8b94c Merge branch 'w46_MDL-36457_m24_jsmin' of git://github.com/skodak/moodle 2012-11-14 11:32:52 +08:00
Dan Poltawski
8051e85a3f Merge branch 'w46_MDL-36283_m24_cohortmembers' of git://github.com/skodak/moodle 2012-11-14 11:25:54 +08:00
Dan Poltawski
124b3fcef7 Merge branch 'MDL-35358' of git://github.com/rwijaya/moodle 2012-11-14 11:16:47 +08:00
Dan Poltawski
3484a69861 Merge branch 'wip-MDL-36267-master' of git://github.com/marinaglancy/moodle 2012-11-14 10:45:19 +08:00
Dan Poltawski
5ebe0ca37a Merge branch 'MDL-26660-master' of git://github.com/FMCorz/moodle 2012-11-14 10:33:45 +08:00
Dan Poltawski
2d0d36f219 Merge branch 'wip-MDL-36048-master' of git://github.com/marinaglancy/moodle 2012-11-14 09:58:27 +08:00
Dan Poltawski
81d7798996 Merge branch 'MDL-34520-master' of git://github.com/ankitagarwal/moodle 2012-11-14 09:55:51 +08:00
Marina Glancy
9428a1545d MDL-36267 corrected phpdocs for get_fast_modinfo() 2012-11-14 09:52:52 +08:00
Amy Groshek
b1dd41de86 MDL-36540 - Survey language pack typo 2012-11-14 09:45:42 +08:00
Aparup Banerjee
bf10e51d44 MDL-24736 anotating tinymce changes to readme 2012-11-14 09:40:59 +08:00
Dan Poltawski
762c6c4fee Merge branch 'master_MDL-36467' of git://github.com/danmarsden/moodle 2012-11-14 09:30:59 +08:00
Marina Glancy
52b1ed5ee8 MDL-36048 advise theme developers to output course header/footer 2012-11-14 09:29:54 +08:00
Dan Poltawski
f58c96f842 Merge branch 'MDL-36369' of git://github.com/timhunt/moodle 2012-11-14 09:29:51 +08:00
Dan Poltawski
25c1b2edc4 Merge branch 'wip-MDL-36413-master' of https://github.com/nicolasconnault/moodle 2012-11-14 09:18:27 +08:00
Aparup Banerjee
f132d28aa5 Merge branch 'wip_master_mdl-25736_tinymce_spellchecker_frech_issues' of https://github.com/iarenaza/moodle 2012-11-14 09:12:28 +08:00
Michael Aherne
5035ed6376 MDL-34762 course Hide system archetypes from mod chooser 2012-11-14 09:06:10 +08:00
Dan Poltawski
59d332ea71 Merge branch 'MDL-36494-invalid-update-debugging' of git://github.com/mudrd8mz/moodle 2012-11-14 08:31:29 +08:00
Mark Nielsen
18b10b8721 MDL-36575: Adding mod_lti_generator
This adds the hook for LTI module generation
for unit tests.
2012-11-13 10:15:24 -08:00
Tim Hunt
837e181225 MDL-36369 qtypes and qbehaviour settings permissions.
The correct policy is that users with moodle/question:config can set the
default settings for particular qtypes. However, it requires
moodle/site:config in order to do manage qbehaviours or manage qtypes.
2012-11-13 16:07:28 +00:00
Marina Glancy
e75324a53e MDL-36369 Question types and behaviour settings should not require moodle/site:config 2012-11-13 15:14:03 +00:00
Dan Poltawski
5f7b0f2bdc MDL-30545 messaging - remove DISTINCT from union statement 2012-11-13 22:34:36 +08:00
David Mudrák
a22de4ce99 MDL-36494 Do not display a debugging message about invalid update info
It turned out that this well-meant debugging message just caused a lot
of false alarm with no good reason. It seems to be better just ignore it
at the moment.
2012-11-13 11:24:55 +01:00
Frederic Massart
69bc92160f MDL-36561 chat: Chat does not use calendar icons 2012-11-13 17:40:04 +08:00
Dan Poltawski
5c4685f0ad MDL-30545 - messagelib: use $DB->sql_concat() 2012-11-13 15:11:14 +08:00
Tyler Bannister
dcb28e6e7f MDL-30643 - Fixed timezone problems in test cases.
resolved integration time changes conflict.
Conflicts:
	lib/tests/statslib_test.php
2012-11-13 13:58:31 +08:00
Dan Poltawski
4f64267994 Merge branch 'w46_MDL-36169_m24_enrolsort' of git://github.com/skodak/moodle 2012-11-13 13:40:18 +08:00
Dan Poltawski
b0ba493cd0 Merge branch 'MDL-30545' of git://github.com/timhunt/moodle 2012-11-13 13:21:50 +08:00
Dan Poltawski
47e126569d Merge branch 'MDL-36509' of git://github.com/netspotau/moodle-mod_assign 2012-11-13 13:04:14 +08:00
Dan Poltawski
0da9003a45 Merge branch 'wip-MDL-36398-master' of git://github.com/barbararamiro/moodle 2012-11-13 12:57:30 +08:00