Commit graph

62206 commits

Author SHA1 Message Date
Tim Hunt
df14e8625d MDL-40443 setType notice in quiz reports. 2013-07-04 13:08:14 +01:00
Tim Hunt
726fd6db19 MDL-40318 quiz intro comprising just an impage was not shown
Also, ensure that we don't output an empty box if there are no access
messages.
2013-07-04 13:07:32 +01:00
Tim Hunt
b0ac85395c MDL-36479 quiz regrade: use progress bar to prevent time-outs 2013-07-04 13:06:18 +01:00
Eloy Lafuente (stronk7)
112f1ab9b0 MDL-40392 Navigation -> my courses listing tests
This introduces some behat tests to verify that
the display of enrolled courses in the navigation
block works as expected, both when a plain list
or a nested list is configured.

Personally I'm not happy with the way to select
expected text via css element. I'd love to see
something in an higher level like

I should see the text|link "xxxxx" in the "yyyy" "element"

with element being "block, header, footer, main...."

But that's another issue.
2013-07-04 13:51:25 +02:00
Ankit Agarwal
01546175d2 MDL-40402 libraries: update the mistake in comment 2013-07-04 15:46:15 +08:00
Ankit Agarwal
492ba9deb3 MDL-40402 libraries: Deprecate get_system_context() 2013-07-04 15:45:48 +08:00
Ankit Agarwal
1d364843ab MDL-40402 unittests: Make sure get_system_context() throws a deprecated warning 2013-07-04 15:41:19 +08:00
Ankit Agarwal
0601e0eef6 MDL-40402 libraries: Replace get_system_context() with context_system::instance() in core 2013-07-04 15:41:06 +08:00
Damyon Wiese
f8e6e5bc30 weekly release 2.6dev 2013-07-04 15:28:10 +08:00
Rajesh Taneja
85b2e46f23 MDL-40401 Libraries: load_temp_role() and remove_temp_roles() can not be used any more. 2013-07-04 15:04:09 +08:00
Adrian Greeve
b1d31f49dc MDL-40490 - database: Fixed a check on database port options.
The addition of a port for the database means that an array
would be set regardless of whether it had any information or not.
The isset() function sees an array as being set and follows through
with the rest of the if statement concatenating a colon to the end
of the database host name and throwing a connection problem if no port
number is supplied.

The if statement has now been changed to if not empty. The empty
function does see zero as an empty value, but a port shouldn't have
a value of zero anyway.
2013-07-04 15:01:53 +08:00
Mary Evans
46616bf5ee MDL-40131 theme_bootstrapbase: added missing grader table css to less/moodle/grade.less
Conflicts:

	theme/bootstrapbase/style/moodle.css
2013-07-04 14:43:18 +08:00
Damyon Wiese
af282bcc2c MDL-40308: Fix javascript for lti mod_form
It was toggling the state of the hidden input - not the checkbox.
2013-07-04 13:47:09 +08:00
Ankit Agarwal
71e38b128e MDL-40039 phpunit: Test core_files_external::upload() without the new params 2013-07-04 13:26:07 +08:00
Sam Hemelryk
07dd7fcc11 MDL-39813 behat: fixed up behat expectations 2013-07-04 09:22:54 +12:00
Eloy Lafuente (stronk7)
bb9c764caf MDL-40376 Fix copy/paste typo 2013-07-03 17:53:01 +02:00
Eloy Lafuente (stronk7)
619658b877 Merge branch 'moduleuninstallfix' of https://github.com/skodak/moodle 2013-07-03 11:36:29 +02:00
Eloy Lafuente (stronk7)
620e1e3787 Merge branch 'w27_MDL-39088_m26_uninstall' of https://github.com/skodak/moodle 2013-07-03 11:34:55 +02:00
Rajesh Taneja
33564ffb42 MDL-40400 Gradebook: get_toggles_html and print_toggle cannot be used anymore 2013-07-03 17:06:59 +08:00
Frederic Massart
8853cd202c MDL-40369 theme: Removing old gif icons with PNG/SVG versions 2013-07-03 16:58:18 +08:00
Frederic Massart
677541ebe7 MDL-40369 theme: MyMobile does not override deprecated icons 2013-07-03 16:47:36 +08:00
Frederic Massart
7125ef4b2c MDL-40369 theme: Afterburner does not override deprecated icons 2013-07-03 16:47:36 +08:00
Frederic Massart
36f5dd3943 MDL-40369 theme: Remove deprecated icons 2013-07-03 16:47:36 +08:00
Frederic Massart
a8dd22a7d7 MDL-40369 theme: Fix core using deprecated icons 2013-07-03 16:47:35 +08:00
Frederic Massart
0193dd1c32 MDL-38314 repository: Improving performance of upgrade script 2013-07-03 16:24:19 +08:00
Damyon Wiese
13e82f1c67 MDL-40472: Clean all codechecker warnings on mod_assign 2013-07-03 16:00:43 +08:00
Petr Škoda
02a541ee8e MDL-39088 fix incorrect module count SQL 2013-07-03 09:40:07 +02:00
Frederic Massart
65ef774544 MDL-38314 repository: Unit Tests for delete_all_for_context() 2013-07-03 15:26:20 +08:00
Frederic Massart
d802435e00 MDL-38314 repository: Delete repository instances on context deletion 2013-07-03 15:26:20 +08:00
Frederic Massart
4aa4d88da8 MDL-38314 repository: Remove orphan repository instances 2013-07-03 15:26:20 +08:00
Nadav Kavalerchik
8137e0496e MDL-37065 - Change get_string('status') token in assignment submissions page to a different token (for translation flexibility)
AMOS BEGIN
 CPY [status,core],[status,mod_assign]
AMOS END
2013-07-03 14:59:52 +08:00
Yuliya Bozhko
19a9f2eada MDL-39986 badges: Show badge navigation to users with awardbadge capability
Also fixes an arror when a user with this capability tries to award a badge,
but their role is not among the criteria set up for a badge
2013-07-03 13:13:55 +08:00
Damyon Wiese
4787014c56 MDL-39813 recompile less for bootstrapbase 2013-07-03 11:38:21 +08:00
Damyon Wiese
24e13d4283 Merge branch 'MDL-39813_login' of git://github.com/andyjdavis/moodle 2013-07-03 11:35:53 +08:00
Andrew Davis
29a24edd8b MDL-39813 added some white space above the cookie message 2013-07-03 11:07:35 +08:00
Damyon Wiese
74ed095606 MDL-39558 badges: Prevent backup of badges without user information 2013-07-03 10:52:50 +08:00
Yuliya Bozhko
bd0d2bdcc9 MDL-39558 badges: Add backup/restore of manually awarded badges 2013-07-03 09:36:45 +08:00
Yuliya Bozhko
2832093f53 MDL-39558 badges: Add backup/restore to course badges 2013-07-03 09:35:06 +08:00
Eloy Lafuente (stronk7)
cfe8b6df33 Merge branch 'MDL-40275-m' of git://github.com/micaherne/moodle 2013-07-02 21:52:17 +02:00
Eloy Lafuente (stronk7)
1b80060ff0 MDL-35009 Normalize deprecation (also MDL-34472)
- Use same deprecation phrases style.
- Use same upgrade.txt phrases style.
- Add unit test covering the deprecation.

See the issue for some more rationale / comments.
2013-07-02 21:40:16 +02:00
Eloy Lafuente (stronk7)
7b2ca65574 Merge branch 'wip-mdl-35009' of git://github.com/rajeshtaneja/moodle
Conflicts:
	lib/accesslib.php
	lib/deprecatedlib.php
	lib/upgrade.txt
2013-07-02 21:22:30 +02:00
Eloy Lafuente (stronk7)
aefc66dd35 Merge branch 'MDL-40376-m' of git://github.com/andrewnicols/moodle 2013-07-02 21:11:49 +02:00
Eloy Lafuente (stronk7)
f8c54a7469 MDL-37516 Translate fieldnames on output only.
This reverts a change performed by the previous commit where user
fieldnames were being translated (and cached) when fetched,
causing the information to remain static later, not responding
to language switches (and perhaps leading to other problems if those
structures are used lated for DB / $USER comparisons.

With the commit, the translation happens on output, so no
potential interferences will happen and, also, the information
changes dynamically on lang switching.
2013-07-02 20:39:05 +02:00
sam marshall
6316bfa0c7 MDL-37516 Conditional activities: user field condition display fixes 2013-07-02 20:00:17 +02:00
Eloy Lafuente (stronk7)
c946f60b0d Merge branch 'MDL-40314_M26' of git://github.com/lazydaisy/moodle 2013-07-02 19:41:44 +02:00
Eloy Lafuente (stronk7)
1203222a3c Merge branch 'MDL-40246_master' of git://github.com/dmonllao/moodle 2013-07-02 14:27:34 +02:00
Eloy Lafuente (stronk7)
3c2e7a0e7c Merge branch 'MDL-34472-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	lib/upgrade.txt
2013-07-02 14:09:11 +02:00
Eloy Lafuente (stronk7)
8b180f2317 Merge branch 'MDL-40439-en_fix' of git://github.com/mudrd8mz/moodle 2013-07-02 13:47:09 +02:00
Helen Foster
77fc81f3ee MDL-40439 Merge English strings from the en_fix language pack 2013-07-02 11:42:10 +02:00
Dan Poltawski
6f3c780f3b Merge branch 'w27_MDL-40337_m26_rolescleanup' of https://github.com/skodak/moodle 2013-07-02 17:09:38 +08:00