mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 08:30:04 +01:00
Code Issues Projects Releases Wiki Activity
79,080 Commits 36 Branches 527 Tags
Commit Graph

79080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Andrew Nicols
ad6b958997 Merge branch 'MDL-54652-master' of git://github.com/danpoltawski/moodle 2016-06-21 11:26:42 +08:00
Andrew Nicols
b3f25cbfbf Merge branch 'MDL-35104-master-2' of git://github.com/cameron1729/moodle 2016-06-21 11:18:03 +08:00
Cameron Ball
8c2b696bf7
MDL-35104 auth: Don't allow modification of username 
Presently it is either unreliable, or not possible to change
the username of a user created with an authentication plugin.
In some cases it is even hard coded to fail. Ideally we would
sync the username, and the issue MDL-21928 exists to address
that. However, in the mean time we should not allow the
username of an external user to be modified.
 2016-06-21 11:15:19 +08:00
Andrew Nicols
8a46580603 Merge branch 'MDL-51505-master' of git://github.com/FMCorz/moodle 2016-06-21 10:30:22 +08:00
Andrew Nicols
62d34a4af2 Merge branch 'MDL-54654-master' of git://github.com/danpoltawski/moodle 2016-06-21 09:58:18 +08:00
Simey Lameze
6937d89be6 MDL-54948 core_upgrade: fix unoconv check on the environment page 2016-06-21 09:38:01 +08:00
Simey Lameze
9254ba09e8 MDL-54948 core_files: make the check consistent on unoconv test page 2016-06-21 09:36:44 +08:00
Andrew Nicols
c6d20e61e3 Merge branch 'wip-MDL-53399' of https://github.com/JoeyAndres/moodle 2016-06-21 09:03:48 +08:00
Andrew Nicols
da871bb4c1 Merge branch 'wip-MDL-53292-master' of https://github.com/marinaglancy/moodle 2016-06-21 08:46:38 +08:00
Russell Smith
8675453e82 MDL-54881 quiz: Ensure user attempts are deterministic for testing. 2016-06-21 08:31:26 +10:00
Eloy Lafuente (stronk7)
795150c550 Merge branch 'MDL-37554-master-test' of git://github.com/cameron1729/moodle 2016-06-21 00:03:45 +02:00
Pau Ferrer Ocaña
6f26fcd7e0 MDL-54894 comments: Get course from context if not informed 2016-06-20 08:58:05 +02:00
Andrew Nicols
5c3de4fe55 Merge branch 'wip-MDL-54590-master-test' of git://github.com/abgreeve/moodle 2016-06-20 14:09:54 +08:00
Vadim Dvorovenko
68b50753ae MDL-54590 Installer: Additional info about database name 
Additional info that creating database name containing dots is not
   supported
 2016-06-20 14:06:14 +08:00
Andrew Nicols
0256b7a620 Merge branch 'MDL-51163-master' of git://github.com/cameron1729/moodle 2016-06-20 11:09:47 +08:00
Luke Carrier
a48f2d3d90 MDL-54940 behat: use the fixed step 2016-06-19 17:22:17 +01:00
Luke Carrier
3ceaea2638 MDL-54940 behat: rectify section edit regression in MDL-53381 2016-06-19 17:11:31 +01:00
Dan Poltawski
7f70d548fe MDL-54939 amd: build modified files 2016-06-17 09:03:18 +01:00
Dan Poltawski
c96f55e6f9 MDL-54939 amd: fix lint issues 
Mostly correcting jsdoc, some other line wrapping rules and empty
functions.
 2016-06-17 09:03:18 +01:00
Dan Poltawski
926ac16ef3 MDL-54654 mod: fix forum/scorm invalid css 2016-06-16 20:52:04 +01:00
Dan Poltawski
c6eddafcad MDL-54654 mod_data: fix invalid css for image gallery preset 2016-06-16 20:52:04 +01:00
Dan Poltawski
f909e9e5a9 MDL-54654 choice: remove CSS definitions 
The 'inherit' for border colour was not valid and so no border was
displayed.

The display:inline does not work with floated elemenets.
 2016-06-16 20:52:04 +01:00
Dan Poltawski
48d5c2183a MDL-54654 choice: reformat CSS 2016-06-16 20:52:04 +01:00
Dan Poltawski
f567699fe4 MDL-54654 book: silence csslint warning 
(Important is by design for print layout)
 2016-06-16 20:52:04 +01:00
Dan Poltawski
4c62bdab0d MDL-54654 assignfeedback_editpdf: remove invalid CSS 
The 'left' positioing was invalid and conflicting with the
right definition anyway, so wasn't necessary.
 2016-06-16 20:52:04 +01:00
Dan Poltawski
cc3ca25e57 MDL-54652 singleview: remove invalid css decleration 
margin-bottom can't be used with display: inline, so use padding
instead.
 2016-06-16 20:49:04 +01:00
Dan Poltawski
9072631311 MDL-54652 grade_report: fix css lint issues 
max-width: initial isn't valid css and in my testing it makes no
difference, so is removed.

We also remove invalid css on exception.

This reverts commit 72ece42858643c789d2c2f86fccdab0afefa18d0
 2016-06-16 20:49:04 +01:00
Dan Poltawski
f3ac852859 MDL-54652 block_community: remove unused css 
Fixing lint errors
 2016-06-16 20:49:04 +01:00
Dan Poltawski
8a802c9032 MDL-54652 filter_mediaplugin: refomat css 2016-06-16 20:49:04 +01:00
Dan Poltawski
d8b5fb1255 MDL-54652 filter_mediaplugin: removed unused invalid css 
It is override by core styles anyway.
 2016-06-16 20:49:04 +01:00
Dan Poltawski
64527edca2 MDL-54652 tool_lp: remove invalid css on comeptency menu bar 2016-06-16 20:49:04 +01:00
Dan Poltawski
c74b305dfa MDL-54652 tool_health: make css more specific to avoid '!important' 
This admin tool is unsupported anyway..
 2016-06-16 20:49:04 +01:00
Dan Poltawski
0d06a20038 MDL-54939 eslint: tweak rules 
1) Allow jsdoc descriptions to be empty. I think that matches our phpdoc
checker, and I think its probably better than me filling the
descriptions in poorly.

2) For the captilisation rules, don't apply to object properties (this
is because jQuery has lots of violators of this rule)
 2016-06-16 19:33:00 +01:00
Dan Poltawski
35be582696 MDL-54939 amd: Fix lint issues fixable with eslint --fix 2016-06-16 19:33:00 +01:00
Eloy Lafuente (stronk7)
49619ce243 weekly release 3.2dev 2016-06-16 17:01:29 +02:00
Eloy Lafuente (stronk7)
badd6b2344 NOBUG: Fixed SVG browser compatibility 2016-06-16 17:01:25 +02:00
Andrew Nicols
eddf7994f0 Merge branch 'MDL-52127-eloy' of https://github.com/danpoltawski/moodle 2016-06-16 09:04:17 +01:00