mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 18:04:43 +02:00
Code Issues Projects Releases Wiki Activity
61,062 Commits 37 Branches 536 Tags
Commit Graph

61062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
1d9ec4cbc2 MDL-38041 behat: Respect error_reporting() values overwritten by moodle code 2013-05-06 14:12:41 +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
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
Dan Poltawski
1fc7079857 Merge branch 'MDL-39476-master' of git://github.com/damyon/moodle 2013-05-03 16:05:41 +01:00
Damyon Wiese
e1cd72ec72 Merge branch 'MDL-38714_tmp' of git://github.com/rwijaya/moodle 2013-05-03 15:37:57 +08:00
Damyon Wiese
4a4f590eab MDL-39476 Assign: Cleanup old bad data before adding new index 2013-05-03 14:03:29 +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
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
Marina Glancy
69bbd2a7cd MDL-38594 Core themes changed for the new course listings styles 2013-05-03 11:16:16 +10:00
Marina Glancy
d891aaba73 MDL-39318 CSS bug on mouse hover of paging bar in some themes 2013-05-03 11:14:49 +10:00
Tim Hunt
6382060daf MDL-39450 course formats: add static cache to get_format_or_default 
This function gets called hundreds of times on every page, often with
exactly the same input, so I added a static cache.
 2013-05-02 16:38:52 +01:00
Dan Poltawski
95190fda69 on demand release 2.5beta+ 2013-05-02 14:34:48 +01:00
Dan Poltawski
b741e1c186 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-05-02 14:32:03 +01:00
Damyon Wiese
e7c5ee5102 Merge branch 'MDL-30775-master' of git://github.com/mouneyrac/moodle 
Conflicts:
	course/externallib.php
 2013-05-02 16:20:30 +08:00
Rossiani Wijaya
343a48256a MDL-38717: Lesson mod: fixed behat script to accomodate the fix of settype() 2013-05-02 15:26:35 +08:00
Damyon Wiese
b99122155c Merge branch 'MDL-39401' of git://github.com/rwijaya/moodle 2013-05-02 14:50:49 +08:00
Damyon Wiese
9c898f682a Merge branch 'MDL-39207_master' of git://github.com/totara/openbadges 2013-05-02 14:44:20 +08:00
Rossiani Wijaya
2213893766 MDL-39401 portfolio: fixed setType() warnings in box.net and flickr portfolios 2013-05-02 14:20:03 +08:00
Damyon Wiese
f85fba3eeb Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-02 13:54:59 +08:00
Damyon Wiese
c9c01f75b1 MDL-39077 maxbytes - fix warnings for cli install 2013-05-02 12:11:08 +08:00
Yuliya Bozhko
265b866fe5 MDL-39207 badges: Generate badge assertions using user's backpack email if it is set 2013-05-02 16:05:11 +12: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
AMOS bot
fdb2851204 Automatically generated installer lang files 2013-05-02 00:38:12 +00:00
Andrew Nicols
323aa3248c MDL-39355: Correct the z-index for moodle-dialogue 2013-05-01 18:34:04 +01:00
Dan Poltawski
d773056669 Merge branch 'MDL-39367-master-int' of git://github.com/FMCorz/moodle 2013-05-01 17:32:09 +01:00
Eloy Lafuente (stronk7)
ea7f9109d5 MDL-39434 Bump main version to observe all deps 2013-05-01 18:04:58 +02: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
Damyon Wiese
367b977d4d MDL-39077 max_files does not include current option when it is non-standard 
Non-standard means php.ini was set to something not in the default list (like 7MB),
then the config was saved to that specific value, and now the value in php.ini has been changed
again so 7MB does not appear in the list.
 2013-05-01 12:40:57 +01: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
Dan Poltawski
5f5843f84b Merge branch 'w17_MDL-39402_m25_themedep' of git://github.com/skodak/moodle 2013-05-01 09:53:18 +01:00
Petr Škoda
a824d7d4ac MDL-39402 fix wrong binarius dependency 
Credit goes to Frédéric Massart, thanks.
 2013-05-01 10:36:30 +02:00
Dan Poltawski
142fa8c75d Merge branch 'MDL-39438_master' of git://github.com/dmonllao/moodle 2013-05-01 08:32:30 +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
David Monllao
5bc7cd922b MDL-39438 behat: Updating tests 
According to MDL-38415 changes.
 2013-05-01 13:39:06 +08:00
Rossiani Wijaya
747d5b1cf6 MDL-38714 Lesson module: add setType for hidden and text inputs 2013-05-01 11:39:31 +08:00
Damyon Wiese
25927c42ce MDL-39312 Cache lock plugins - fix undefined var and language typo 2013-05-01 10:51:32 +08:00
Damyon Wiese
a6b274b232 Merge branch 'wip-MDL-39312-m25' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-05-01 10:04:50 +08:00
AMOS bot
f4711cd2f5 Automatically generated installer lang files 2013-05-01 00:39:23 +00:00