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

62389 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
cb88ffb698 Merge branch 'MDL-38366-master' of git://github.com/FMCorz/moodle 2013-07-10 16:22:38 +10:00
Frederic Massart
c122f484c5 MDL-38366 repository_filesystem: Prevent use of empty subdir 2013-07-10 14:03:46 +08:00
Frederic Massart
a76efbcac8 MDL-38366 repository: get_option() returns proper values 
Previously, even when a specific setting had to be returned, this method
would return an empty array. Now, the behaviour is the same whether
some options or none are set: if the requested setting is not found
null is returned.
 2013-07-10 14:03:46 +08:00
Sam Hemelryk
858fc79db8 MDL-40368 tool_capability: fixed regression marking single result selected 2013-07-10 16:23:46 +12:00
Jamie Pratt
76149901a9 MDL-40449 use data generator to create random qs 2013-07-10 15:45:45 +12:00
Marina Glancy
06832223d4 Merge branch 'MDL-40354-master' of git://github.com/ankitagarwal/moodle 2013-07-10 13:15:37 +10:00
Ankit Agarwal
e481f05c0d MDL-40354 groups: Fix issues in groups_group_visible() 2013-07-10 10:50:22 +08:00
Ankit Agarwal
2d4d29da06 MDL-40354 groups:groups_get_activity_allowed_groups() should use passed userid to check capabilities 2013-07-10 10:50:22 +08:00
Ankit Agarwal
e7eb992d3a MDL-40354 groups: Add new api groups_group_visible() 2013-07-10 10:50:21 +08:00
Ankit Agarwal
f4d46f6848 MDL-40354 groups: Add unit tests for the api groups_group_visible() 2013-07-10 10:50:21 +08:00
Marina Glancy
f8be9f9e73 Merge branch 'm26_MDL-39832_Fix_Chrome_Issues_ETag_XSendfile_2ndRound' of https://github.com/scara/moodle 2013-07-10 11:58:44 +10:00
Raymond Wijaya
bf57184c28 MDL-40093: mod/assign: Remove count of drafts in offline assignment's grading summary screen 2013-07-10 11:18:28 +10:00
Marina Glancy
9de65fffb6 Merge branch 'w28_MDL-40488_m26_admin' of https://github.com/skodak/moodle 2013-07-10 11:08:49 +10:00
Sam Hemelryk
6426d2d264 Merge branch 'wip-MDL-40593-master' of git://github.com/marinaglancy/moodle 2013-07-10 12:19:05 +12:00
Russell Smith
ae21341523 MDL-40538 caching: Use isset for performance 
isset is much faster than array_key_exists. For caches we need to
ensure as much performance as possible. To all null to continue to
be stored and provide correct results, non ttl also now saves in
$this->store[$key][0].  As isset($this->store[$key]) will return
true in all cases.

time() as found in cache::now() can be slow on some platforms and
we shouldn't bother checking it unless needed. It also stops non-ttl
caches paying the ttl price.

Unit tests were adjusted to ensure null is still handled correctly
when we are only using isset.
 2013-07-10 10:15:19 +10:00
Marina Glancy
9100a8f4bb Merge branch 'MDL-40441' of git://github.com/timhunt/moodle 2013-07-10 10:02:04 +10:00
Marina Glancy
9a2188812d Merge branch 'wip-mdl-40218' of git://github.com/rajeshtaneja/moodle 2013-07-10 09:58:09 +10:00
Sam Hemelryk
93b4d2658a Merge branch 'master_MDL-20867' of git://github.com/danmarsden/moodle 2013-07-10 11:07:00 +12:00
Sam Hemelryk
1be1f6be53 Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle 2013-07-10 11:02:21 +12:00
Sam Hemelryk
ccae3a612d Merge branch 'w28_MDL-40537_m26_majorupgrade' of https://github.com/skodak/moodle 2013-07-10 10:43:28 +12:00
Sam Hemelryk
4e6ad78679 Merge branch 'MDL-39815' of git://github.com/rwijaya/moodle 2013-07-10 10:35:18 +12:00
Sam Hemelryk
a8402cc115 Merge branch 'MDL-40527' of git://github.com/timhunt/moodle 2013-07-10 10:31:39 +12:00
Sam Hemelryk
a4fd82ac75 Merge branch 'MDL-40466-master' of git://github.com/FMCorz/moodle 2013-07-10 10:19:13 +12:00
Sam Hemelryk
33ed6a9d94 Merge branch 'MDL-40516-master' of git://github.com/danpoltawski/moodle 2013-07-10 10:12:44 +12:00
Sam Hemelryk
05fb99ac70 Merge branch 'master_MDL-40512' of git://github.com/danmarsden/moodle 2013-07-10 10:10:11 +12:00
Sam Hemelryk
d9734c91ee MDL-40358 enrol: whitespace clean up 2013-07-10 10:07:10 +12:00
Sam Hemelryk
fc7e5a031e Merge branch 'wip-mdl-40358' of git://github.com/rajeshtaneja/moodle 2013-07-10 09:54:38 +12:00
Sam Hemelryk
59cd82f9b7 Merge branch 'MDL-40496-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	lib/deprecatedlib.php
 2013-07-10 09:51:15 +12:00
Damyon Wiese
c6df1f5ad0 Merge branch 'MDL-39420' of git://github.com/timhunt/moodle 2013-07-09 22:43:54 +08:00
Damyon Wiese
57cf73a825 Merge branch 'MDL-36479' of git://github.com/timhunt/moodle 2013-07-09 22:28:51 +08:00
Damyon Wiese
e931954558 Merge branch 'MDL-40392' of git://github.com/stronk7/moodle 2013-07-09 21:51:41 +08:00
Marina Glancy
deabf12e31 MDL-40593 fixed SQL query to be postgres-compartible 2013-07-09 22:24:02 +10:00
Marina Glancy
f429d25d37 MDL-40472 fixed missing semicolon 2013-07-09 22:01:49 +10:00
Marina Glancy
ed2896d990 Merge branch 'MDL-40472-master' of git://github.com/damyon/moodle 2013-07-09 21:34:49 +10:00
Tim Hunt
dad5f63d3d MDL-39420 multichoice: fix layout of multi-line choices. 2013-07-09 11:56:28 +01:00
Tim Hunt
475225a1c8 MDL-40441 fix obscure notice in the quiz. 
This can only happen if you have both a user with both a real attempt
and a preview, and then edit the quiz settings.

Also clean up this code a bit.
 2013-07-09 10:43:56 +01:00
Dan Poltawski
3a1b0dd908 Merge branch 'wip-MDL-40430-master' of git://github.com/abgreeve/moodle 2013-07-09 16:57:07 +08:00
Dan Poltawski
f6455e63dd Merge branch 'wip-MDL-40429-master' of git://github.com/abgreeve/moodle 2013-07-09 16:52:52 +08:00
Dan Poltawski
58b2251be3 Merge branch 'MDL-40425-master' of git://github.com/ankitagarwal/moodle 2013-07-09 16:42:18 +08:00
Adrian Greeve
329846f198 MDL-40430 - Libraries: Deprecate print_context_name(). 2013-07-09 16:11:55 +08:00
Adrian Greeve
b4482dfe19 MDL-40429 - Libraries: Deprecate get_contextlevel_name(). 2013-07-09 16:07:04 +08:00
Marina Glancy
73118a2687 Merge branch 'MDL-37065-master' of git://github.com/damyon/moodle 2013-07-09 18:06:33 +10:00
Damyon Wiese
ef5fd5bf40 Merge branch 'wip-mdl-40400' of git://github.com/rajeshtaneja/moodle 2013-07-09 16:05:02 +08:00
Dan Poltawski
92e9260d96 Merge branch 'wip-mdl-40427' of git://github.com/rajeshtaneja/moodle 2013-07-09 16:00:12 +08:00
Ankit Agarwal
db314f34fb MDL-40425 libraries: Remove context_instance_preload() from core 2013-07-09 15:55:51 +08:00
Ankit Agarwal
c5dcd25d5f MDL-40425 libraries: Deprecate context_instance_preload() 2013-07-09 15:55:40 +08:00
Dan Poltawski
af578aec7c Merge branch 'wip-mdl-40407' of git://github.com/rajeshtaneja/moodle 
(moved a deprecation warning around to try and avoid more conflicts in
upgrade.txt)

Conflicts:
	lib/upgrade.txt
 2013-07-09 15:55:20 +08:00
Rajesh Taneja
2c5b0eb7fc MDL-40427 Libraries: Deprecated context_moved in favor of context::update_moved() 2013-07-09 15:51:29 +08:00
Dan Poltawski
9e40816b3a Merge branch 'MDL-40406-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/upgrade.txt
 2013-07-09 15:49:45 +08:00
Dan Poltawski
0574cd9061 Merge branch 'MDL-40405-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/upgrade.txt
 2013-07-09 15:47:07 +08:00