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
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
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
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
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
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
89a24463ad
MDL-39065 fixed bug with quick jump to category
2013-05-03 11:28:41 +10: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
103928da0b
MDL-39412 question behaviours: hide manual graded option
...
The ability to set all your quiz questions to require manual grading is
an interesting possibility, but practically almost useless.
If you set that accidentally, then you are badly stuck. There is no way
to fix it after the students have answered the quiz.
Therefore, we should set the config option to hide that option from the
UI. We do this for all Moodle sites as part of the upgrade, not just for
new installs.
If any admin wants to re-enable this, they can later.
2013-05-02 17:02:46 +01: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
Tim Hunt
f16d5f979b
MDL-39446 calculated qtype: make answer formula input bigger
...
This makes it easier for teachers editing questions.
2013-05-02 16:37:52 +01: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
sam marshall
cb86f1ebb3
MDL-39472 MUC: Improve parse_key performance
2013-05-02 16:04:29 +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
David Mudrák
ed70c74be5
MDL-39442 Do not use native rename() when moving folders
...
The native rename() function does not support moving folders
cross-device. See https://bugs.php.net/bug.php?id=54097 for details. So
instead of trying to move the whole tree, the new installer's method
moves files recursively one by one.
This is consistent with what mdeploy.php already does.
2013-05-02 13:58:43 +02: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
sam marshall
a9f5fc158c
MDL-38315 Completion: Bugs with 'locked' status in activity form
2013-05-01 11:57:29 +01:00