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

79131 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Nicols
f9cabe8f99 Merge branch 'wip-mdl-54974' of https://github.com/rajeshtaneja/moodle 2016-06-29 15:05:13 +08:00
Eloy Lafuente (stronk7)
22a0896767 Merge branch 'MDL-55028-master' of git://github.com/junpataleta/moodle 2016-06-27 22:13:48 +02:00
Eloy Lafuente (stronk7)
d4ca1215bb Merge branch 'MDL-54599-31' of git://github.com/vadimonus/moodle 2016-06-27 20:38:18 +02:00
Eloy Lafuente (stronk7)
f8ca380b47 Merge branch 'MDL-54997-master' of git://github.com/damyon/moodle 2016-06-27 20:22:14 +02:00
Eloy Lafuente (stronk7)
74eb5bb9fe Merge branch 'MDL-54707_master' of git://github.com/dmonllao/moodle 2016-06-27 20:00:43 +02:00
Eloy Lafuente (stronk7)
0efd933a1f Merge branch 'MDL-54900-master' of git://github.com/marinaglancy/moodle 2016-06-27 18:53:23 +02:00
Eloy Lafuente (stronk7)
bc413a6078 Merge branch 'MDL-52887-master' of git://github.com/marinaglancy/moodle 2016-06-27 16:13:25 +02:00
Eloy Lafuente (stronk7)
f780baf063 Merge branch 'MDL-54663-master' of git://github.com/andrewnicols/moodle 2016-06-27 13:26:34 +02:00
Rajesh Taneja
e5f2478b9f MDL-54974 behat: Handle interupts on PHP7 
As https://bugs.php.net/bug.php?id=71448 is
not going to get fixed, we need to declare tick
 2016-06-27 14:30:58 +08:00
Jun Pataleta
ead440b649 MDL-55028 webservice_soap: Use strlen for setting Content-Length header 2016-06-27 13:59:20 +08:00
Andrew Nicols
623395ff7b Merge branch 'MDL-53111_m32v1' of https://github.com/sbourget/moodle 2016-06-27 13:30:51 +08:00
Andrew Nicols
04b189a875 Merge branch 'MDL-54924-master' of git://github.com/junpataleta/moodle 2016-06-27 12:53:35 +08:00
Marina Glancy
540200aee5 MDL-54900 mod_choice: correctly count number of answered users 2016-06-27 12:47:49 +08:00
Andrew Nicols
607e900e2d Merge branch 'MDL-54785-master' of git://github.com/FMCorz/moodle 2016-06-27 08:59:49 +08:00
David Monllao
25ba053ff2 MDL-54707 search: Add user context to get_areas_user_accesses 2016-06-26 21:23:16 +02:00
Damyon Wiese
e824cd502d MDL-54997 competencies: Fix random unit test fail 
Sorting on timecreated is not unique enough to
guarantee a predictable ordering.
 2016-06-25 08:04:15 -07:00
Damyon Wiese
da880d320c MDL-54997 competencies: Listing evidence contexts 
When listing the evidence for a user competency in a course,
the query is missing evidences for sub-contexts in the course.
 2016-06-23 09:14:19 -07:00
Andrew Nicols
b8474fe0c7 weekly release 3.2dev 2016-06-23 14:49:30 +08:00
Andrew Nicols
de2f6d840a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-06-23 14:49:25 +08:00
Frederic Massart
df52c272cf
MDL-54785 files: Deprecate the support for $usepost and related 2016-06-23 12:41:03 +08:00
Frederic Massart
4f9b94fdd5
Revert "MDL-44626 files: Show the PHP max upload size instead of 'unlimited'" 
This reverts commit 6f0768618a.
 2016-06-23 11:51:44 +08:00
Frederic Massart
048f8073d1
Revert "Merge branch 'MDL-54110_master' of https://github.com/marxjohnson/moodle" 
This reverts commit 016e0abfbc, reversing
changes made to 58a2f0ac40.
 2016-06-23 11:51:44 +08:00
Frederic Massart
796f86f753
Revert "MDL-54110 repositories: Whitespace, Typo + unit test fixes" 
This reverts commit 7e4d43e1a2.
 2016-06-23 11:51:44 +08:00
Andrew Nicols
0f56ea9d2f Merge branch 'MDL-54948-master-fix2' of https://github.com/lameze/moodle 2016-06-23 10:50:14 +08:00
Simey Lameze
37eafbb6dc MDL-54948 core_files: return false if theres no output from unoconv 2016-06-23 08:37:23 +08:00
Andrew Nicols
797b7efc0b Merge branch 'MDL-35104-master-fix' of https://github.com/cameron1729/moodle 2016-06-22 14:57:09 +08:00
Andrew Nicols
1331869eb2 Merge branch 'MDL-54948-master-fix' of https://github.com/lameze/moodle 2016-06-22 14:43:35 +08:00
Cameron Ball
6a80681112
MDL-35104 auth: Always allow editing username for new users 2016-06-22 13:59:39 +08:00
Marina Glancy
dcd320b5ad MDL-52887 mod_choice: backup allowmultiple option 2016-06-22 13:51:36 +08:00
Simey Lameze
84440fe3d2 MDL-54948 core_upgrade: fix check_unoconv_version logic 2016-06-22 13:44:48 +08:00
Andrew Nicols
d1a62a5046 MDL-54663 forum: Correct digest link to forum preferences 2016-06-22 13:11:23 +08:00
Andrew Nicols
6c8e98ddd2 Merge branch 'wip-mdl-53399' of https://github.com/rajeshtaneja/moodle 2016-06-22 09:10:19 +08:00
Rajesh Taneja
f34ab57411 MDL-53399 behat: Activity chooser link is removed. 2016-06-22 09:07:31 +08:00
Eloy Lafuente (stronk7)
0f20bf7507 Merge branch 'wip-mdl-54589-mac' of https://github.com/rajeshtaneja/moodle 2016-06-22 01:42:15 +02:00
Eloy Lafuente (stronk7)
e40dd1cdcd MDL-54778 form: Make it all js style (eslint) compliant 
The changes in this commit should not be problematic, just:

- different whitespace.
- some docs.
- 1 variable to camelCase.

And then, less trivial, but safe enough IMO:

- a change to camelCase some identifiers and their calculation.
 2016-06-22 01:29:51 +02:00
Eloy Lafuente (stronk7)
0f30b4beeb Merge branch 'MDL-54778-master' of git://github.com/andrewnicols/moodle 2016-06-22 01:29:39 +02:00
Dan Poltawski
6a6b0085e0 Merge branch 'MDL-54983-master' of git://github.com/damyon/moodle 2016-06-21 12:56:32 -07:00
Damyon Wiese
0edd7bd7bd MDL-54983 docs: Improve phpdocs for create_user_key 
Also fixed the docs for get_user_key.
 2016-06-21 12:46:59 -07:00
Eloy Lafuente (stronk7)
e822312af3 Merge branch 'MDL-54939-master' of git://github.com/danpoltawski/moodle 2016-06-21 20:00:36 +02:00
AMOS bot
9c084c424f Automatically generated installer lang files 2016-06-22 00:06:06 +08:00
Andrew Nicols
6a359c20fb Merge branch 'wip-mdl-54940' of https://github.com/rajeshtaneja/moodle 2016-06-21 19:00:33 +08:00
Rajesh Taneja
f0be6b892e MDL-54940 behat: No need to press save 
Previous step press save button, so no need to press again
 2016-06-21 18:53:03 +08:00
Eloy Lafuente (stronk7)
878835db7f Merge branch 'MDL-54948-master' of git://github.com/lameze/moodle 2016-06-21 11:48:10 +02:00
Andrew Nicols
3584865b3a MDL-51789 users: Correct deprecation version 2016-06-21 14:59:00 +08:00
Andrew Nicols
92e4d84b62 Merge branch 'MDL-51789' of https://github.com/mr-russ/moodle 2016-06-21 14:38:51 +08:00
Russell Smith
5407c5b0f4 MDL-51789 users: Allow picture update from webservices. 
useredit_update_picture as moved to user_update_picture
as it's more general.  It was also moved to user/lib.php
so it can be used by both webservices and edit without more include files.
 2016-06-21 16:36:53 +10:00
Andrew Nicols
bc341d4f08 Merge branch 'MDL-54920-master' of https://github.com/sammarshallou/moodle 2016-06-21 14:15:41 +08:00
Andrew Nicols
65126de122 Merge branch 'MDL-54894-master' of git://github.com/crazyserver/moodle 2016-06-21 12:09:09 +08:00
Andrew Nicols
0871afcd5f Merge branch 'MDL-54940-master' of https://github.com/LukeCarrier/moodle 2016-06-21 11:53:05 +08:00
Andrew Nicols
4a837c7ba0 Merge branch 'MDL-54881' of https://github.com/mr-russ/moodle 2016-06-21 11:31:19 +08:00