Commit graph

61523 commits

Author SHA1 Message Date
Marina Glancy
8a3d804a32 MDL-39520 always include lib file when accessing coursecat class 2013-05-06 21:06:55 +10:00
Damyon Wiese
76640b273d MDL-38443 Assignment: Missing permissions check on downloadall submissions 2013-05-06 10:19:23 +01:00
Dan Poltawski
4736236959 Merge branch 'MDL-39442-copy-addon' of git://github.com/mudrd8mz/moodle
Conflicts:
	admin/tool/installaddon/version.php
2013-05-06 10:00:23 +01:00
Barbara Ramiro
311e117d75 MDL-39514 usability: New award icon - clearer 2013-05-06 15:52:57 +08:00
Damyon Wiese
373a40c5db Merge branch 'MDL-39484-master-int' of git://github.com/FMCorz/moodle 2013-05-06 15:38:24 +08:00
Damyon Wiese
881a90c0bb MDL-39143: Version bump and svgfix for ie9 2013-05-06 15:32:48 +08:00
Damyon Wiese
3b8841dda2 Merge branch 'MDL-39143-master' of git://github.com/barbararamiro/moodle 2013-05-06 15:31:05 +08:00
Damyon Wiese
4017ea2fce Merge branch 'MDL-39445' of git://github.com/timhunt/moodle 2013-05-06 15:15:02 +08:00
Marina Glancy
36ba8fded0 MDL-38596 Added caching to the list of course contacts 2013-05-06 16:57:56 +10:00
Barbara Ramiro
a129cc06e8 MDL-39143 usability: New badge icon - monochrome, bigger, clearer 2013-05-06 14:37:04 +08:00
David Monllao
1d9ec4cbc2 MDL-38041 behat: Respect error_reporting() values overwritten by moodle code 2013-05-06 14:12:41 +08:00
Mark Nelson
33bea465bd MDL-39470 cache: added missing component to get_string call 2013-05-06 13:51:00 +08:00
Damyon Wiese
9fbf1dfb6e Merge branch 'MDL-39412' of git://github.com/timhunt/moodle 2013-05-06 12:27:19 +08:00
Yuliya Bozhko
f8ba185ac5 MDL-39162: Add badges CSS to bootstrap theme 2013-05-06 16:20:02 +12:00
Damyon Wiese
b67eb16a16 MDL-39399: Version bump for css 2013-05-06 12:17:44 +08:00
Marina Glancy
31b0530aa6 MDL-38596 Optimise SQL in preloading course contacts for number of courses 2013-05-06 14:15:22 +10:00
Damyon Wiese
4c2a46e507 Merge branch 'MDL-39399-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-05-06 12:13:27 +08:00
Marina Glancy
5db8f5a8f4 MDL-39482 avoid using get_category_or_system_context() because file might not be included 2013-05-06 14:06:54 +10:00
Damyon Wiese
80b9793b87 Merge branch 'MDL-39480_badge' of git://github.com/andyjdavis/moodle 2013-05-06 12:00:34 +08:00
Damyon Wiese
516b8c9029 Merge branch 'wip-MDL-38594-master' of git://github.com/marinaglancy/moodle 2013-05-06 11:43:37 +08:00
Frederic Massart
cf4cef7d76 MDL-39484 core: Undefined ostype during installation process 2013-05-06 10:06:09 +08:00
AMOS bot
c198a6dda9 Automatically generated installer lang files 2013-05-06 00:40:34 +00:00
Eloy Lafuente (stronk7)
081bfdc5ff Merge branch 'MDL-39348_master' of git://github.com/dmonllao/moodle 2013-05-06 01:49:51 +02:00
Eloy Lafuente (stronk7)
07c9a6db96 Merge branch 'MDL-38041_master' of git://github.com/dmonllao/moodle 2013-05-06 01:23:49 +02:00
Dan Poltawski
8f9ae1d5e8 Merge branch 'brokencalc' of git://github.com/andyjdavis/moodle 2013-05-05 11:29:11 +01:00
Andrew Davis
36388ba832 MDL-39480 core_badge: prevented a php notice 2013-05-04 11:58:01 +08:00
Mary Evans
3a61956f66 MDL-39364 theme_clean: remove all references to the Simple theme from Clean theme. 2013-05-04 02:34:44 +01:00
AMOS bot
9ed7ed3d80 Automatically generated installer lang files 2013-05-04 00:40:08 +00:00
David Scotson
c57a883080 MDL-39499 bootstrapbase: Make two .singlebuttons line up 2013-05-03 16:28:07 +01:00
Dan Poltawski
1fc7079857 Merge branch 'MDL-39476-master' of git://github.com/damyon/moodle 2013-05-03 16:05:41 +01:00
David Scotson
ed88a6f32a MDL-30130 bootstrapbase: Bring back Quiz answer feedback 2013-05-03 15:47:15 +01:00
David Mudrák
6133e6ee76 MDL-39497 Consider workshop scheduled allocator stable 2013-05-03 15:47:03 +02:00
Andrew Nicols
42b53d4650 MDL-39496 Admin: Reduce excessive is_array tests in admin_category
admin_category::category_cache is a protected value which is only ever
treated as an array. We shouldn't need to test that it's an array each time
we use it.
2013-05-03 14:31:28 +01:00
Andrea Bicciolo
088645e22c MDL-29472_m WebServices Cohorts 2013-05-03 12:24:40 +02:00
David Mudrák
55c6c6f153 MDL-39491 Fix order of Workshop submission text processing
The order of format_text() and file_rewrite_pluginfile_urls() is
important to make filters work correctly.
2013-05-03 11:56:44 +02:00
Barbara Ramiro
9c554f7797 MDL-38238 usability: Revised t/lock and t/unlocked icons 2013-05-03 17:11:36 +08:00
Albert Gasset
c4d0e4efe3 MDL-39487 mod/assign: fixed ID number of grade item changing 2013-05-03 11:07:28 +02:00
Damyon Wiese
e1cd72ec72 Merge branch 'MDL-38714_tmp' of git://github.com/rwijaya/moodle 2013-05-03 15:37:57 +08:00
Jerome Mouneyrac
2af34ab005 MDL-31193 display the correct and translated token valid until date 2013-05-03 14:09:34 +08:00
Damyon Wiese
4a4f590eab MDL-39476 Assign: Cleanup old bad data before adding new index 2013-05-03 14:03:29 +08:00
Mark Nelson
34f9862edf MDL-39187 forms: fixed issue where calendar pop-up did not display when a date selector form element was added to a group 2013-05-03 13:01:58 +08:00
Marina Glancy
cf230d98a8 MDL-39482 avoid using get_category_or_system_context() because file might not be included 2013-05-03 14:45:23 +10:00
David Monllao
b32ca4caf9 MDL-39481 behat: Provide info about init.php 2013-05-03 12:04:42 +08:00
Rajesh Taneja
5e0ab6704a MDL-39332 Formslib: remove z-index from calendar panel
calendar panel.render() sets zIndex to 0, when calendar is used next to filepicker, it overlaps
zIndex should be set by css and not JS, and previously used removeAttr on panel breaks JS on ie8.
So solution is to render panel and then remove z-index from dom
2013-05-03 10:59:46 +08:00
David Monllao
28abad1ab2 MDL-39348 behat: Compatibility with Safari and IE
Also changing from SeleniumDriver checking
to GoutteDriver as is less probably to change
goutte than to change selenium.
2013-05-03 10:43:06 +08:00
David Monllao
c59e52f561 MDL-39348 behat: Switching to wait which does not conflict with IE
Also solving bug with DOM ready, timeout
was set to self::TIMEOUT miliseconds not
seconds.
2013-05-03 10:16:44 +08:00
David Monllao
00ea74cb54 MDL-39348 behat: Chaining strings instead of splitting strings in lines 2013-05-03 10:16:44 +08:00
David Monllao
4d40089d88 MDL-39348 behat: Changing to correct activity names 2013-05-03 10:16:44 +08:00
David Monllao
e73062c135 MDL-39348 behat: Removing redundant step
This is causing some browsers to fail tests
as they uses the DOM of the current page to
search "You are logged in as".
2013-05-03 10:16:44 +08:00
David Monllao
bbd802f7b7 MDL-38041 behat: Also fail tests if there is any other backtrace 2013-05-03 10:05:08 +08:00