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

62068 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
bb0458aa7c Merge branch 'MDL-40403-master' of git://github.com/FMCorz/moodle 2013-07-09 13:38:10 +08:00
Frederic Massart
82c9aa843e MDL-40403 tests: Fix pointless assertion 2013-07-09 13:34:44 +08:00
Frederic Massart
8e8891b76b MDL-40403 libraries: Deprecate get_parent_contexts() 2013-07-09 13:34:44 +08:00
Damyon Wiese
c2bee5e0d1 Merge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle 2013-07-09 13:33:42 +08:00
Damyon Wiese
eb729e0391 Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle 2013-07-09 13:26:49 +08:00
Damyon Wiese
26616e4b6d Merge branch 'MDL-40386' of https://github.com/prateeksachan/moodle 2013-07-09 12:34:31 +08:00
Jamie Pratt
596ea56f6b MDL-40388 Reset globals after each unit test 2013-07-09 12:26:28 +08:00
Tony Levi
00726467f6 MDL-40035: Avoid rebuild_course_cache always for empty course 2013-07-09 13:53:27 +10:00
Adrian Greeve
a327f25ef1 MDL-31776 - lib: Alternate name fields 
Add support for additional name fields and flexible formating of
user names.
 2013-07-09 11:45:50 +08:00
Damyon Wiese
9d871499fe Merge branch 'MDL-40318' of git://github.com/timhunt/moodle 2013-07-09 11:11:42 +08:00
Damyon Wiese
9ac5809512 Merge branch 'MDL-40562_master' of git://github.com/dmonllao/moodle 2013-07-09 11:04:58 +08:00
Damyon Wiese
35a8f0cb77 Merge branch 'wip-MDL-40368-m26' of git://github.com/samhemelryk/moodle 
Conflicts:
	admin/tool/capability/index.php
 2013-07-09 10:48:47 +08:00
Sam Hemelryk
a13ee8e18a Merge branch 'MDL-40402-master2' of git://github.com/ankitagarwal/moodle 2013-07-09 14:42:03 +12:00
Damyon Wiese
b080d5b688 Merge branch 'wip-MDL-40490-master' of git://github.com/abgreeve/moodle 2013-07-09 10:03:22 +08:00
Marina Glancy
b4a044f3fb Merge branch 'MDL-40434' of git://github.com/timhunt/moodle 2013-07-09 11:30:42 +10:00
Tim Lock
a9166e8210 MDL-40436: auth_ldap: Fixed warning when adding new LDAP users 2013-07-08 22:57:25 +08:00
Damyon Wiese
15b726d584 Merge branch 'MDL-40561-master' of git://github.com/FMCorz/moodle 2013-07-08 22:28:21 +08:00
David Monllao
bda1dea4de MDL-40562 behat: Catch NoSuchElement exception 2013-07-08 12:05:45 +02:00
Frederic Massart
dc95bdd8d9 MDL-40561 phpunit: Return the right guessed class 2013-07-08 17:58:38 +08:00
Damyon Wiese
64830bf658 Merge branch 'MDL-38314-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-07-08 15:10:58 +08:00
Damyon Wiese
3536560eff Merge branch 'w28_MDL-40415_m26_opcache' of https://github.com/skodak/moodle 2013-07-08 13:40:09 +08:00
Dan Marsden
f2b3e82b09 MDL-37484 SCORM: disable toc in player when using direct AICC url 2013-07-05 14:37:20 +12:00
Petr Škoda
c05a50992e MDL-40415 add explicit OPcache support 2013-07-04 19:32:26 +02:00
Petr Škoda
9240ecbd98 MDL-40500 move MOODLE_INTERNAL define before core_component include 
This resolves problems with MOODLE_INTERNAL in db/subplugins.php
 2013-07-04 19:04:23 +02:00
Jean-Michel Vedrine
f383a58a90 MDL-40499 Edit question from 1.9 backup breaks if images in subdirs 2013-07-04 14:09:13 +02: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
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
Frederic Massart
0193dd1c32 MDL-38314 repository: Improving performance of upgrade script 2013-07-03 16:24:19 +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
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