Andrew Nicols
1331869eb2
Merge branch 'MDL-54948-master-fix' of https://github.com/lameze/moodle
2016-06-22 14:43:35 +08:00
Simey Lameze
84440fe3d2
MDL-54948 core_upgrade: fix check_unoconv_version logic
2016-06-22 13:44:48 +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
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
Andrew Nicols
badbaa64e3
MDL-54778 form: Fix lots of issues with form dependencies
...
The original issue here was that each loop of the named values did not
check for prototypal properties. As a result, if there were input fields
with names such as 'sort', 'valueOf', 'constructor', etc. these would
return their prototypal functions instead of a falsy value, and be treated
as though they are array - hence the 'Cannot push to Function' type error.
Following on from this I discovered that the data stores were being created
as arrays, but used as objects. This can also cause issues with some form
input names -- e.g. if they are numeric.
These two issues were resolved together by correctly storing them in
objects, and checking that those objects had real properties
(hasOwnProperty). This itself has to use the prototypal function to cater
for the potential of a field name called 'hasOwnProperty'.
I also found that the instance value stores were being initialised in the
prototype (and therefore shared), which meant that there were numerous
issues if two forms were present on the same page, or one form replaced an
existing one (e.g. forms initialised in JS).
In addition, it also became apparant that several values were being used
outside of scope, or in the wrong scope. This caused further issues when
creating multiple forms on a page.
2016-06-21 07:58:13 +08:00
Rajesh Taneja
481a5ee517
MDL-54589 behat: Update composer to point to new tag
2016-06-21 06:31:42 +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
Rajesh Taneja
f55d87c55c
MDL-54589 behat: Fixed failures for phantomjs standalone
2016-06-20 16:03:36 +08:00
Rajesh Taneja
6a51c58542
MDL-54589 behat: Don't allow floating headers for behat
2016-06-20 16:03:36 +08:00
Rajesh Taneja
fba0ac63b8
MDL-54589 behat: Added hack for some OS/browsers
2016-06-20 16:03:36 +08: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
Rajesh Taneja
6a021f59f3
MDL-54589 group: ensure loader is available before remobing
2016-06-20 09:43:08 +08:00
Rajesh Taneja
3aaf98f62c
MDL-54589 behat: Trigger change event after selecting option
...
After selecting option, some browsers need
explicit change event
2016-06-20 09:43:08 +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
