moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 02:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63309 commits 37 branches 544 tags 1.3 GiB
Commit graph

16741 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
474e0d3cd2 Merge branch 'MDL-39397_master' of git://github.com/totara/openbadges 2013-05-09 00:20:06 +02:00
Dan Poltawski
ae3507af09 Merge branch 'MDL-39552' of git://github.com/stronk7/moodle 2013-05-08 13:03:58 +01:00
Mark Nelson
e019dcccdf MDL-39463 forms: use the date selectors 'optional' parameter rather than creating additional logic 2013-05-08 16:36:54 +08:00
Damyon Wiese
35aba51758 Merge branch 'MDL-31193-master' of git://github.com/mouneyrac/moodle 2013-05-08 15:21:47 +08:00
Damyon Wiese
59add07d01 Merge branch 'MDL-29472_m' of git://github.com/andreabix/moodle 2013-05-08 12:51:00 +08:00
Damyon Wiese
8ed91fdabb Merge branch 'MDL-37552-master' of git://github.com/mouneyrac/moodle 2013-05-08 12:47:44 +08:00
Yuliya Bozhko
7deff81f80 MDL-39397 badges: Handle course badges when course is deleted 2013-05-08 16:12:44 +12:00
Eloy Lafuente (stronk7)
4ce97aed0d Merge branch 'wip-mdl-39332' of git://github.com/rajeshtaneja/moodle 2013-05-08 00:28:15 +02:00
Sam Hemelryk
b3a9bf23f5 Merge branch 'MDL-39481_master' of git://github.com/dmonllao/moodle 2013-05-08 09:54:13 +12:00
Eloy Lafuente (stronk7)
d40a24384e Merge branch 'MDL-39452-master' of git://github.com/sammarshallou/moodle 2013-05-07 22:06:04 +02:00
Eloy Lafuente (stronk7)
de10fcac5f MDL-39552 Make behat code re-entrant safe 
With yui combo in action, some times setup.php is
included more than once. So it's mandatory to
guarantee that code until ABORT_AFTER_CONFIG_CANCEL
can be executed safely multiple times in the same
request.

This change just prevents the behat section to be executed
more than once. All the values that are set within it
should be already defined for the re-entrant call.
 2013-05-07 19:00:41 +02:00
Eloy Lafuente (stronk7)
5b003e9cdd Merge branch 'MDL-39478_master' of git://github.com/dmonllao/moodle 2013-05-07 17:52:00 +02:00
Damyon Wiese
5946813506 Merge branch 'master_MDL-38102' of github.com:totara/moodle 2013-05-07 23:06:09 +08:00
Dan Poltawski
577f21ec24 Merge branch 'MDL-39496-m' of git://github.com/andrewnicols/moodle 2013-05-07 12:15:38 +01:00
Dan Poltawski
bdc8928339 Merge branch 'master_MDL-35852' of git://github.com/danmarsden/moodle 2013-05-07 11:41:30 +01:00
Damyon Wiese
670fd5aad4 Merge branch 'MDL-39187_master' of https://github.com/markn86/moodle 2013-05-07 16:09:10 +08:00
Damyon Wiese
d285e5e628 Merge branch 'MDL-31713_override' of git://github.com/andyjdavis/moodle 2013-05-07 15:28:17 +08:00
Jerome Mouneyrac
ea29059efa MDL-37552 external_format_text: missing require_once filelib.php (shared credits to Adam Fredericks for report and patch proposal) 2013-05-07 14:55:55 +08:00
Damyon Wiese
ef4d3233b6 MDL-38596 coursecatlib performance 
Version bump for cache definitions and added user delete check to sql
 2013-05-07 14:10:23 +08:00
Damyon Wiese
fc075899e0 Merge branch 'wip-MDL-38596-master' of git://github.com/marinaglancy/moodle 2013-05-07 14:09:56 +08:00
Damyon Wiese
98b2443961 Merge branch 'wip-MDL-39482-master' of git://github.com/marinaglancy/moodle 2013-05-07 12:43:50 +08:00
Andrew Davis
ea11496d0b MDL-31713 core_grade: added updating of grade min and max to update_final_grade() 2013-05-07 12:21:07 +08:00
Andrew Davis
59772c066a MDL-31713 core_grade:added a unit test to replicate a raw grade max bug 2013-05-07 11:14:08 +08:00
David Monllao
cfcbc34a61 MDL-39478 behat: New constant to detect when the test site is running 
Also removing an unused var and method.
 2013-05-07 11:12:01 +08:00
Frederic Massart
b31bd82d60 MDL-38289 condition: Do not fetch profile fields when not logged in 2013-05-07 10:18:53 +08:00
Hugh Davenport
9a2b5e0b4f MDL-35852 Add config option to prevent changes to configexecutable settings 2013-05-07 11:17:05 +12:00
Eloy Lafuente (stronk7)
fc17f75684 Merge branch 'MDL-38041_master-fix' of git://github.com/dmonllao/moodle 2013-05-06 16:50:30 +02: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
David Monllao
1d9ec4cbc2 MDL-38041 behat: Respect error_reporting() values overwritten by moodle code 2013-05-06 14:12:41 +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
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
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
David Mudrák
3633c2576d MDL-39490 Inform the developer about incorrect order of text processing 
Before calling format_text(), the text must be processed with
file_rewrite_pluginfile_urls(). This order is important
for some text filters that look for valid pluginfile.php URLs.
 2013-05-03 17:09:58 +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
Jerome Mouneyrac
2af34ab005 MDL-31193 display the correct and translated token valid until date 2013-05-03 14:09:34 +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
bbd802f7b7 MDL-38041 behat: Also fail tests if there is any other backtrace 2013-05-03 10:05:08 +08:00
David Monllao
90ed22ab70 MDL-38041 behat: Capturing also PHP debug messages 2013-05-03 10:05:08 +08:00
David Monllao
5f4b4e918d MDL-38041 behat: Adding hook 
Stops execution when the output contains
an exception, a debugging message or a PHP
debug message.
 2013-05-03 10:05:08 +08:00
David Monllao
b060de934b MDL-38041 behat: Adding styles to debugging messages 
Only when a simulated user session
is running.
 2013-05-03 10:05:08 +08:00