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
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
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
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
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
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
Tim Hunt
5f85073525
MDL-39445 get_plugin_list clean_param use is slow
...
get_plugin_list was calling clean_param($pluginname, PARAM_PLUGIN) a
lot (600+ times per page), and that is much slower than you would guess.
A specific function for this case, (which we then also use from
clean_param) is a performance win.
2013-05-02 16:20:24 +01:00
Eloy Lafuente (stronk7)
e7ff753cab
Merge branch 'wip-MDL-39432-m25-i' of git://github.com/samhemelryk/moodle
2013-05-02 03:33:35 +02:00
Andrew Davis
459843d495
MDL-32913 core_grade:made it more obvious when the gradebook is broken due to a broken calculation
2013-05-02 09:03:02 +08:00
Eloy Lafuente (stronk7)
cedb0aab5a
MDL-39434 Bump all versions near 2.5 release
2013-05-01 18:03:29 +02:00
Eloy Lafuente (stronk7)
2f679b426a
Merge branch 'MDL-39444' of git://github.com/timhunt/moodle
2013-05-01 16:55:36 +02:00
Tim Hunt
296daf41c7
MDL-39444 get_string: remove unnecessary clean_param
...
This clean_param was added as part of MDL-22015. It is a good idea when
developer debug is turned on, but it showed up as a surprisingly
expensive cost in our profiling.
This change:
1. Removes the check during string_extist. This will not change
behaviour, the method returns false if the string does not exist.
2. In get_string, it only does the check if debugging is set to
DEVELOPER level.
2013-05-01 10:16:37 +01:00
Sam Hemelryk
15f89e2872
MDL-39422 course: converted closures to fix eAccelerator issues
2013-05-01 18:43:27 +12:00
Dan Poltawski
dd4a197e0f
MDL-39207 badges: don't use curl version depedent constant
...
It seems that CURLOPT_CONNECTTIMEOUT_MS is depdendent on the version
of curl compiled against. We don't need milliseconds here anyway, so
switch to the seconds value.
2013-05-01 07:21:58 +01:00
Eloy Lafuente (stronk7)
bee592add8
Merge branch 'wip-MDL-39216-m25' of git://github.com/samhemelryk/moodle
2013-05-01 02:29:36 +02:00
Sam Hemelryk
a697000b53
MDL-39216 url: included test for empty string param
2013-05-01 12:27:36 +12:00
Eloy Lafuente (stronk7)
6a222aa127
Merge branch 'MDL-39232_master' of git://github.com/dmonllao/moodle
2013-05-01 00:47:32 +02:00
Dan Poltawski
1af49024a5
Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges
2013-04-30 14:42:44 +01:00
Dan Poltawski
0542fdc6b4
Merge branch 'w17_MDL-39343_m25_installupgrade' of git://github.com/skodak/moodle
2013-04-30 13:37:52 +01:00
Petr Škoda
e2e35e71f9
MDL-39343 disable all caching in install and upgrades
...
This should resolve all problem on developer machines when switching branches or when restoring previous Moodle databases. It also prevents any potential problems during upgrades such as concurrent DB modification and resolves chicken egg problems in future caching upgrades.
2013-04-30 10:27:34 +02:00
Damyon Wiese
34e46d7556
Merge branch 'mdl-39335' of git://github.com/vostreltsov/moodle
2013-04-30 15:51:12 +08:00
Dan Poltawski
e0b3f5f235
Merge branch 'w17_MDL-39077_m25_sizes' of git://github.com/skodak/moodle
2013-04-30 08:24:31 +01:00
Damyon Wiese
59d003497c
Merge branch 'MDL-39351' of git://github.com/timhunt/moodle
2013-04-30 14:13:25 +08:00
