Commit graph

86655 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
186a8c1572 Merge branch 'MDL-43176' of https://github.com/NeillM/moodle 2017-09-20 10:12:37 +02:00
Simey Lameze
c602220798 MDL-59750 core_calendar: fix minithree logic on get_view 2017-09-20 13:25:19 +08:00
Simey Lameze
563ae695dc MDL-59750 calendar: fix logic on subscription template 2017-09-20 12:51:11 +08:00
Simey Lameze
d85651d82c MDL-59750 core_calendar: remove show_day method 2017-09-20 12:51:02 +08:00
Simey Lameze
63b13467a9 MDL-59750 calendar: organise exporters code 2017-09-20 12:50:52 +08:00
Simey Lameze
5a35675e53 MDL-59750 calendar: add edit and delete url to exporter 2017-09-20 12:50:43 +08:00
Simey Lameze
146d371344 MDL-59750 calendar: render day view using templates 2017-09-20 12:50:12 +08:00
Simey Lameze
ac671b3739 MDL-59750 core_calendar: rename template month_header to header 2017-09-20 12:48:26 +08:00
Simey Lameze
578eb78981 MDL-59750 core_calendar: add next and previous days handling methods 2017-09-20 12:47:38 +08:00
Simey Lameze
8afe9f8a14 MDL-59750 core_calendar: better handling of event subscription 2017-09-20 12:47:27 +08:00
Eloy Lafuente (stronk7)
e98f05340d Merge branch 'MDL-43176' of https://github.com/NeillM/moodle 2017-09-19 23:10:31 +02:00
Eloy Lafuente (stronk7)
77b767c362 Merge branch 'MDL-60132-master' of git://github.com/jleyva/moodle 2017-09-19 22:34:39 +02:00
Dan Poltawski
be5d95fc74 Merge branch 'MDL-59920-master' of git://github.com/andrewnicols/moodle 2017-09-19 18:14:18 +01:00
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
f4d1aa9573 MDL-59645 portfolio_flickr: Make the Flickr portfolio export work again
The patch modifies the Flickr portfolio to make it use of the new oauth1
based client.
2017-09-19 14:44:41 +02:00
David Mudrák
34db9e9342 MDL-59645 repository_flickr: Drop legacy auth tokens and nsids
The values stored in these user preferences were valid for the old
flickr auth mechanism and are not usable any more. The new oauth1 based
version needs to store both the token (in the flickr_access_token
preference) and the token secret (flickr_access_token_secret). The new
version does not need to store the user's nsid.

The cryptic names of these legacy settings are a result of how dealing
with user preferences was originally implemented.
2017-09-19 14:44:41 +02:00
David Mudrák
d841bbe90d MDL-59645 repository_flickr: Make the Flickr repository work again
The patch makes the Flickr repository use the new oauth1 based client.
Beside that, other improvements include:

* Does not attempt to guess the photo URL any more. Instead uses
  url_sq and url_o extras of the flickr.photos.search call.
* The photos.search does not return the information about the photo size
  so we set it to null (previously was returned as 'unknown' which made
  it be displayed as zero).
* Does not perform additional API request to obtain the manage URL, uses
  https://www.flickr.com/photos/organize instead.
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
Dan Poltawski
6bfd4195be MDL-57886 plagarism: add note about behaviour change 2017-09-19 13:40:16 +01:00
Dan Poltawski
ecf8920afd Merge branch 'master_MDL-57886' of https://github.com/danmarsden/moodle 2017-09-19 13:40:12 +01:00
sam marshall
22ef155087 MDL-53169 Lib: enrol_get_my_courses can list available courses too 2017-09-19 12:19:49 +01:00
Jun Pataleta
66502b8180 Merge branch 'MDL-60048-master' of https://github.com/Kathrin84/moodle 2017-09-19 17:21:40 +08:00
Dan Poltawski
708100cbef Merge branch 'MDL-59277-master' of https://github.com/snake/moodle 2017-09-19 09:48:30 +01:00
Jun Pataleta
00b7632833 Merge branch 'MDL-59922-master-on-int' of git://github.com/ryanwyllie/moodle 2017-09-19 16:38:08 +08:00
Ryan Wyllie
c35613ff28 MDL-59922 mod_choice: allow editing of open and close events 2017-09-19 08:21:53 +00: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
Mark Nelson
866939c3cc MDL-60130 mod_*: removed unused 'tagtitle' string 2017-09-19 14:54:39 +08:00
Ryan Wyllie
39fe5929c6 MDL-59922 calendar: allow editing of activity events 2017-09-19 06:48:57 +00:00
Dan Poltawski
f5cc5b321d Merge branch 'MDL-60018-master' of git://github.com/jleyva/moodle 2017-09-19 07:27:48 +01:00
Dan Poltawski
363d81514e Merge branch 'MDL-60045_master-v2' of git://github.com/markn86/moodle 2017-09-19 07:16:02 +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
Mark Nelson
fe2142952f MDL-60045 core_user: allow roleid to be passed via URL 2017-09-19 11:40:10 +08:00
Eloy Lafuente (stronk7)
db7083c4c4 Merge branch 'MDL-60105_master' of git://github.com/dmonllao/moodle 2017-09-19 01:55:12 +02:00
Eloy Lafuente (stronk7)
3286e94362 Merge branch 'MDL-52131-master' of git://github.com/andrewnicols/moodle 2017-09-19 01:53:07 +02:00
Eloy Lafuente (stronk7)
66286d5768 Merge branch 'MDL-60094-master' of https://github.com/abias/moodle 2017-09-19 01:50:37 +02:00
Eloy Lafuente (stronk7)
dffca49945 Merge branch 'MDL-37810-master' of https://github.com/snake/moodle 2017-09-19 01:45:29 +02:00
Eloy Lafuente (stronk7)
00045100d0 Merge branch 'MDL-53244_master' of git://github.com/Chocolate-lightning/moodle 2017-09-19 01:42:17 +02:00
Eloy Lafuente (stronk7)
0238520084 Merge branch 'MDL-59244-master' of git://github.com/jleyva/moodle 2017-09-19 01:36:56 +02:00
Eloy Lafuente (stronk7)
5c45e6038c Merge branch 'MDL-59245-master' of git://github.com/jleyva/moodle 2017-09-19 01:33:08 +02:00
Jun Pataleta
77b5d07e31 Merge branch 'MDL-59900_master' of git://github.com/markn86/moodle 2017-09-18 16:03:46 +08:00
Jun Pataleta
58cd2bfd82 Merge branch 'MDL-59995_master' of git://github.com/markn86/moodle 2017-09-18 14:39:46 +08:00
Jun Pataleta
bf2742f2f2 Merge branch 'MDL-60065-master' of git://github.com/andrewnicols/moodle 2017-09-18 13:07:45 +08:00
Andrew Nicols
6038d62625 MDL-60065 calendar: Add threemonth view 2017-09-18 12:04:48 +08:00
Andrew Nicols
b014688581 MDL-60065 calendar: Specify optional replacement node 2017-09-18 12:04:48 +08:00
Andrew Nicols
fee025ecbb MDL-60065 calendar: Control navigation on mini 2017-09-18 12:04:48 +08:00