Commit graph

25048 commits

Author SHA1 Message Date
Andrew Nicols
434d7869df MDL-59882 behat: Add newer modal type to selectors 2017-10-02 12:43:16 +08:00
Andrew Nicols
8c0fa3f20a Merge branch 'MDL-58550-master' of git://github.com/ankitagarwal/moodle 2017-10-02 11:57:34 +08:00
Andrew Nicols
91f64fe0ac Merge branch 'MDL-60289-master' of git://github.com/lameze/moodle 2017-10-02 11:32:03 +08:00
Ankit Agarwal
c56c1d98a3 MDL-60238 libraries: Upgrade HTML2Text to 4.1.0 2017-10-02 08:43:33 +05:30
Andrew Nicols
1bee636fdd Merge branch 'MDL-60236-master' of git://github.com/ankitagarwal/moodle 2017-10-02 10:31:40 +08:00
Simey Lameze
84d6589e1e MDL-60289 libraries: Upgrade Chart.js to 2.7.0 2017-10-02 10:30:48 +08:00
Andrew Nicols
9c8ab01446 Merge branch 'MDL-60239-master' of git://github.com/ankitagarwal/moodle 2017-10-02 10:21:56 +08:00
Adrian Greeve
7c1177649d MDL-58548 lib: Update to moodle specific files.
Update to moodle specific files related to the upgrade
of htmlpurifier.
2017-10-02 08:19:40 +08:00
Adrian Greeve
247ff6bc2b MDL-58548 lib: Update htmlpurifier to the latest version. 2017-10-02 08:19:40 +08:00
Matt Clarkson
b1eb6dd7f2 MDL-33174 lib/filestorage: Add filename to curl request
While the lack of the filename in curl POST does not
directly affect Moodle, some external API's expect to get
the filename of the original file, which affects plugins
using the CURL class.
2017-10-02 09:27:51 +13:00
Marina Glancy
22abb52bac MDL-60287 scssphp: patch for PHP7.2 compatibility 2017-10-01 11:48:02 +08:00
Marina Glancy
653b2bd351 MDL-60287 scssphp: upgraded to 0.6.7 2017-10-01 11:47:58 +08:00
Andrew Nicols
05f184bb7f MDL-59890 calendar: Add ability to add category events 2017-09-29 08:57:08 +08:00
Andrew Nicols
7b1e5e6f3a MDL-59890 calendar: Add categoryid to DB 2017-09-29 08:57:08 +08:00
David Monllao
698f361702 MDL-60275 analytics: Specify missing prediction_action constructor arg 2017-09-28 18:17:36 +02:00
Ankit Agarwal
4f3b046cf9 MDL-60236 libraries: Upgrade simplepie to 1.5.0 2017-09-28 10:19:33 +05:30
Andrew Nicols
839aa86f0d Merge branch 'wip-MDL-59495-master' of git://github.com/marinaglancy/moodle 2017-09-27 15:11:20 +08:00
Ankit Agarwal
503ce10cad MDL-60239 libraries: upgrade MD library to 1.7.0 2017-09-27 12:28:20 +05:30
Marina Glancy
ef467fff04 MDL-59495 registration: register site on moodle.net only
Remove support for alternative hubs
2017-09-27 13:07:37 +08:00
Marina Glancy
da48baa2cd MDL-59495 moodlenet: move all moodlenet code into new namespace
Support for alternative hubs will be removed in 3.4
We can move all methods working with registration, course publishing and moodle.net
communication into separate namespace
2017-09-27 13:07:33 +08:00
Eloy Lafuente (stronk7)
536572cf0b Merge branch 'MDL-59645-master-flickr' of git://github.com/mudrd8mz/moodle 2017-09-26 19:29:40 +02:00
Eloy Lafuente (stronk7)
18348b0781 Merge branch 'MDL-57115-master' of git://github.com/ankitagarwal/moodle 2017-09-26 01:11:21 +02:00
Marina Glancy
9d18cfd0e8 MDL-60167 upgrade: Fix duplicate site registrations 2017-09-24 18:46:41 +08:00
Jun Pataleta
d38bb774ef Merge branch 'MDL-37810-master-fix' of https://github.com/snake/moodle 2017-09-22 10:54:40 +08:00
Eloy Lafuente (stronk7)
7ab0993265 MDL-53169 database: use bound empty strings for cross-db 2017-09-21 19:27:59 +02:00
Jake Dallimore
b7e9f1cc42 MDL-37810 roles: fix profile roles logic to include all roles
If the user has the role:assign capability then the list of profile roles
will include any role assigned in the context or above.
2017-09-21 22:23:41 +08:00
Ankit Agarwal
c7f9a59f3d MDL-58550 libraries: Upgrade matthiasmullie libraries 2017-09-21 16:46:24 +05:30
Jun Pataleta
7326663237 Merge branch 'MDL-53169-master' of https://github.com/sammarshallou/moodle 2017-09-19 22:26:30 +08:00
David Mudrák
05e77ab8f0 MDL-59645 flickrlib: Show debug notice when using legacy authentication 2017-09-19 14:44:41 +02:00
David Mudrák
f438cca1a0 MDL-59645 oauth1: Implement a new simple Flickr API client
Flickr has switched over to OAuth 1.0 based authentication. This is a
simple client allowing Moodle to perform authenticated calls to the
Flickr API.
2017-09-19 14:44:41 +02:00
David Mudrák
a650517a41 MDL-59645 oauth1: Improve reporting of token errors
Provide a more meaningful error message and debuginfo allowing to
diagnose what is going on. In case of flickr, this is typically thrown
when flickr API responses with their "bad, bad panda" HTML page instead
of the expected reply.
2017-09-19 14:44:41 +02:00
David Mudrák
f2252e9501 MDL-59645 oauth1: Pass oauth_callback only to obtain the request token
As per the oauth1 spec, the oauth_callback is supposed to be passed only
when obtaining the initial request token. The client used to append it
automatically to all requests which broke the request signature.
2017-09-19 14:44:41 +02:00
sam marshall
22ef155087 MDL-53169 Lib: enrol_get_my_courses can list available courses too 2017-09-19 12:19:49 +01:00
Dan Poltawski
708100cbef Merge branch 'MDL-59277-master' of https://github.com/snake/moodle 2017-09-19 09:48:30 +01:00
Dan Poltawski
5b1d6143be Merge branch 'MDL-59507-master' of https://github.com/snake/moodle 2017-09-19 09:17:47 +01:00
Dan Poltawski
a1b8b9c9b5 Merge branch 'MDL-59960_mimetype' of https://github.com/mrmark/moodle 2017-09-19 09:10:24 +01:00
Jun Pataleta
c8d20b2a73 Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle 2017-09-19 13:38:26 +08:00
Andrew Nicols
5ff6114623 MDL-60065 calendar: Deprecate calendar_get_mini and friends
This is no longer used and should be deprecated.
2017-09-19 13:21:58 +08:00
Eloy Lafuente (stronk7)
dffca49945 Merge branch 'MDL-37810-master' of https://github.com/snake/moodle 2017-09-19 01:45:29 +02:00
Jun Pataleta
58cd2bfd82 Merge branch 'MDL-59995_master' of git://github.com/markn86/moodle 2017-09-18 14:39:46 +08:00
Jake Dallimore
434d138c2a MDL-37810 roles: added manager case to test_get_user_roles_in_course()
Managers can assign managers, and should be able to see that role on
the course profile page, as a link to the participants page.
2017-09-18 10:16:08 +08:00
Jake Dallimore
5d0cc05b20 MDL-59277 navigation: add support for container type in get_css_type() 2017-09-18 09:03:51 +08:00
Jake Dallimore
b8c31dfe6d MDL-59507 forms: unit tests confirming that .xxx is an invalid extension
Modified:
- test_data_for_browser()
- test_unknow_file_types()
2017-09-18 09:03:00 +08:00
Jake Dallimore
405cbc09ba MDL-59507 forms: accepted file types won't allow the .xxx extension
- Modified get_filetypes_browser_data() to exclude this extension.
- Server side form validation blocks this extension too.
2017-09-18 09:03:00 +08:00
Jake Dallimore
da655d9ee4 MDL-37810 roles: get_user_roles_in_course returns all relevant roles
Fixed to return both those roles in the profileroles site policy and
any roles which the current user can assign in the respective context,
meaning a user can see a link to any role they can assign.
2017-09-18 08:59:29 +08:00
Jake Dallimore
42a2c4794d MDL-37810 roles: unit tests for get_profile_roles() 2017-09-18 08:59:29 +08:00
Jake Dallimore
7b30582669 MDL-37810 roles: fix get_profile_roles() so it returns assignable roles 2017-09-18 08:59:29 +08:00
Eloy Lafuente (stronk7)
1ae99ec327 MDL-60150 install: update the list of stale files for 3.4 2017-09-17 13:27:28 +02:00
Davo Smith
8cab0a2571 MDL-60012 form: fix 'neq' disabledif regression 2017-09-14 16:28:53 +01:00
Ankit Agarwal
f3a3e23448 MDL-57115 blocks: Cleanup block_messages instances and other configs 2017-09-14 09:57:03 +05:30