moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76751 commits 37 branches 540 tags 1.3 GiB
Commit graph

76751 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Nicols
ca922c24e7 Merge branch 'MDL-51710-master' of git://github.com/FMCorz/moodle 2016-01-13 09:12:18 +08:00
Andrew Nicols
9ef638652b Merge branch 'MDL-52507_master' of https://github.com/jinhofer/moodle 2016-01-13 09:07:13 +08:00
Andrew Nicols
38c6a307eb Merge branch 'MDL-52586-master' of git://github.com/jleyva/moodle 2016-01-13 09:06:03 +08:00
Andrew Nicols
64858d435c Merge branch 'MDL-52649-master' of git://github.com/junpataleta/moodle 2016-01-13 08:58:29 +08:00
Joseph Inhofer
93172318b7 MDL-52507 enrol/manual: Generated a smart zIndex 2016-01-12 12:11:09 -06:00
Dan Poltawski
1be8237d41 Merge branch 'MDL-49021_master' of git://github.com/markn86/moodle 2016-01-12 17:02:24 +00:00
Dan Poltawski
6f838471f9 Merge branch 'MDL-49111_master' of git://github.com/markn86/moodle 2016-01-12 17:01:51 +00:00
Dan Poltawski
e6f519b73e Merge branch 'MDL-49553_master' of git://github.com/markn86/moodle 2016-01-12 17:01:13 +00:00
Dan Poltawski
5ea1de4d85 Merge branch 'MDL-49724_master' of git://github.com/markn86/moodle 2016-01-12 16:56:12 +00:00
Dan Poltawski
d31c63fc0e Merge branch 'MDL-49784_master' of git://github.com/markn86/moodle 2016-01-12 16:56:06 +00:00
Dan Poltawski
6fc72ea59e Merge branch 'MDL-49824_master' of git://github.com/markn86/moodle 2016-01-12 16:56:01 +00:00
Dan Poltawski
7fa6a8f1a6 MDL-50851 tag: fix whitespace errors 2016-01-12 16:34:58 +00:00
AMOS bot
ae4dd1b0c8 Automatically generated installer lang files 2016-01-13 00:03:55 +08:00
Dan Poltawski
04a03ff282 Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle 2016-01-12 14:17:14 +00:00
Dan Poltawski
b8ab80f07e Merge branch 'MDL-52210-master' of git://github.com/cameron1729/moodle 2016-01-12 13:36:13 +00:00
Dan Poltawski
07f4e11100 Merge branch 'MDL-52315-master' of git://github.com/andrewnicols/moodle 2016-01-12 13:31:40 +00:00
Dan Poltawski
149ba5c227 Merge branch 'MDL-52661-master' of git://github.com/junpataleta/moodle 2016-01-12 12:56:09 +00:00
Dan Poltawski
73c2ae931d Merge branch 'MDL-52491-master' of git://github.com/jleyva/moodle 2016-01-12 11:35:25 +00:00
Dan Poltawski
e7cacf211e Merge branch 'MDL-21912-master' of git://github.com/cameron1729/moodle 2016-01-12 11:08:11 +00:00
Dan Poltawski
7931245f95 Merge branch 'wip-mdl-52656' of https://github.com/rajeshtaneja/moodle 2016-01-12 10:39:46 +00:00
Andrew Nicols
dc8675fdad Merge branch 'master' of https://github.com/janeklb/moodle 2016-01-12 09:31:09 +00:00
Andrew Nicols
0755d638d7 Merge branch 'MDL-52560-m' of https://github.com/micaherne/moodle 2016-01-12 09:31:08 +00:00
Andrew Nicols
c7198e2a0e Merge branch 'MDL-52585-master' of git://github.com/jleyva/moodle 2016-01-12 09:31:08 +00:00
Andrew Nicols
8b9a15bbab Merge branch 'MDL-52610_master' of git://github.com/dmonllao/moodle 2016-01-12 09:31:07 +00:00
Andrew Nicols
576d953415 Merge branch 'MDL-52643_m31v1' of https://github.com/sbourget/moodle 2016-01-12 09:31:06 +00:00
Andrew Nicols
7b9b861b7b Merge branch 'MDL-52290_editpdf_pagecount' of git://github.com/davosmith/moodle 2016-01-12 09:31:06 +00:00
Andrew Nicols
6009fa550c Merge branch 'patch-11' of https://github.com/sk-unikent/moodle 2016-01-12 09:31:05 +00:00
Andrew Nicols
ae39b42337 Merge branch 'MDL-52563-master' of git://github.com/cameron1729/moodle 2016-01-12 09:31:05 +00:00
Andrew Nicols
c57542a8d2 MDL-38020 behat: Correct singleselect usage 2016-01-12 09:31:05 +00:00
Andrew Nicols
a1013a8054 Merge branch 'MDL-38020-master' of git://github.com/danpoltawski/moodle 2016-01-12 09:31:04 +00:00
Andrew Nicols
dc2aa7f947 Merge branch 'MDL-27840-master' of git://github.com/danpoltawski/moodle 2016-01-12 09:31:03 +00:00
Dan Poltawski
46767cc204 Merge branch 'MDL-52589-m' of https://github.com/micaherne/moodle 2016-01-12 09:31:03 +00:00
David Monllao
9ccc372917 MDL-52610 user: Honour allowaccountssameemail in create_users ws 
Credit to Dmitriy Kuzevanov.
 2016-01-12 13:54:48 +08:00
Jun Pataleta
9488b6f3a4 MDL-52649 user: Add check for potentially undefined variables 2016-01-12 08:56:17 +08:00
Steve Bader
1dabeb8439 MDL-52309 gradereport_history: require user to submit parameters 
Prevent a timely full report from loading when need is exceedingly
rare. Only execute the report when the user has submitted the form.
 2016-01-11 11:12:30 -05:00
Dan Poltawski
a17820bb70 Merge branch 'MDL-52000-master' of git://github.com/andrewnicols/moodle 2016-01-11 13:17:10 +00:00
Dan Poltawski
687a268cbd Merge branch 'MDL-41531-master' of git://github.com/junpataleta/moodle 2016-01-11 11:08:25 +00:00
Dan Poltawski
b8ebc30cd1 Merge branch 'wip-MDL-52697-master' of git://github.com/abgreeve/moodle 2016-01-11 09:24:22 +00:00
Michael Aherne
d9ffd8518a MDL-52589 cache: Allow unused stores to be uninstalled 2016-01-11 09:04:37 +00:00
Mark Nelson
ae139d7911 MDL-52218 gradereport_grader: added behat test for switching views 2016-01-11 16:02:31 +08:00
Mark Nelson
20180b3167 MDL-52218 gradereport_grader: fixed 'grade:viewhidden' related errors 
There were two main reasons why there were PHP errors.

1) We were not passing variables as references.
2) When we were restricting the number of items shown in
   the report we were not collecting all of the dependencies
   which were required when a user did *not* have the
   capability 'moodle/grade:viewhidden'. This would cause
   an undefined offset error due to the index missing in
   the dependency array.

This also meant that a user without the capability 'moodle/grade:viewhidden'
could view the course total without hidden items being taken into account
if they were not being displayed. To resolve this we now pass all the grades
and grade items when the user does not have the capability - which also solves
the PHP errors listed above.
 2016-01-11 16:01:33 +08:00
Cameron Ball
035247e0f2 MDL-52486 JavaScript: Make sure lang codes use underscores. 
In some cases, underscores in lang codes get replaced with dashes
which causes some JavaScript to be unhappy. This patch simply reverse
the underscore to dash replacement on the JS side.
 2016-01-11 15:23:29 +08:00
Cameron Ball
088d6086d8 MDL-21912 restore: Add admin setting to restore conflicting admin user 2016-01-11 14:08:58 +08:00
eWallah
f07bbccb03 MDL-41531 enrol_paypal: Fix enrol errors due to non-ASCII characters 2016-01-11 10:48:47 +08:00
AMOS bot
eacc9ebaf3 Automatically generated installer lang files 2016-01-11 00:04:07 +08:00
Marina Glancy
3da0c3cbf4 MDL-50851 tool_uploaduser: allow to set interests 2016-01-10 15:25:48 +08:00
Marina Glancy
54f63cd11b MDL-50851 tool_uploadcourse: allow to set tags 2016-01-10 15:25:48 +08:00
Marina Glancy
ac840cf487 MDL-50851 blocks: convert to new tag API 2016-01-10 15:25:48 +08:00
Marina Glancy
b0c62e00bc MDL-50851 block_tags: tag collections settings 2016-01-10 15:25:48 +08:00
Marina Glancy
c4e868d5f0 MDL-50851 user: use new tag API for interests 2016-01-10 15:25:47 +08:00