Eloy Lafuente (stronk7)
536572cf0b
Merge branch 'MDL-59645-master-flickr' of git://github.com/mudrd8mz/moodle
2017-09-26 19:29:40 +02:00
Andrew Nicols
6d7953f2fe
Merge branch 'MDL-60141-master' of git://github.com/jleyva/moodle
2017-09-26 15:47:56 +08:00
Jake Dallimore
50f6574b67
Merge branch 'MDL-60121-multi-enrol-backup' of https://github.com/mpetrowi/moodle
2017-09-26 15:22:33 +08:00
Andrew Nicols
2d79d62249
Merge branch 'MDL-60197_master' of git://github.com/markn86/moodle
2017-09-26 09:56:54 +08:00
Andrew Nicols
9eeb4a55f4
Merge branch 'master' of https://github.com/ConnorSheremeta/moodle
2017-09-26 08:16:08 +08:00
Eloy Lafuente (stronk7)
c9d9acb289
Merge branch 'MDL-59505-master-gdrive' of git://github.com/mudrd8mz/moodle
2017-09-26 01:29:35 +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
Eloy Lafuente (stronk7)
e03484eec5
Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle
2017-09-25 23:07:05 +02:00
Eloy Lafuente (stronk7)
3f96ff0505
Merge branch 'MDL-60158-master' of git://github.com/andrewnicols/moodle
2017-09-25 22:06:00 +02:00
Eloy Lafuente (stronk7)
c01beb0cdf
Merge branch 'wip-MDL-60167-master' of git://github.com/marinaglancy/moodle
2017-09-25 19:53:48 +02:00
Andrew Nicols
abf00dad41
MDL-59940 calendar: Fix eslint errors
2017-09-25 11:52:39 +08:00
Andrew Nicols
bc2cca3a0d
MDL-59940 calendar: Improve event start time default
...
Create events on the first day of the month when not in the current
month.
2017-09-25 11:52:08 +08:00
Andrew Nicols
39ad9cf333
MDL-60158 calendar: Fix footer options when viewing as guest
2017-09-25 11:44:32 +08:00
Marina Glancy
9d18cfd0e8
MDL-60167 upgrade: Fix duplicate site registrations
2017-09-24 18:46:41 +08:00
Dan Poltawski
22e99d61ca
weekly release 3.4dev
...
"Parting is such sweet sorrow."
xxx
2017-09-22 12:47:58 +01:00
Dan Poltawski
d501d4a246
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-09-22 12:43:10 +01:00
Jun Pataleta
d38bb774ef
Merge branch 'MDL-37810-master-fix' of https://github.com/snake/moodle
2017-09-22 10:54:40 +08:00
David Mudrák
e0a903243b
MDL-59505 oauth2: Fix storage of access controlled links
...
When files are copied into the system account's drive, they are put into
folders respecting the structure of contexts. Folder names were based on
context names only and so were likely to collide (such as with users
with the same name).
The patch ads context instance identifiers to the name so that they can
be identified more reliably.
2017-09-21 22:17:03 +02:00
Dan Poltawski
07cadbd794
Merge branch 'MDL-53169' of https://github.com/stronk7/moodle
2017-09-21 19:03:55 +01:00
Eloy Lafuente (stronk7)
7ab0993265
MDL-53169 database: use bound empty strings for cross-db
2017-09-21 19:27:59 +02:00
AMOS bot
b180ff1a5a
Automatically generated installer lang files
2017-09-22 00:07:52 +08:00
AMOS bot
f5b892000e
Automatically generated installer lang files
2017-09-22 00:07:51 +08: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
Mark Nelson
141530b9dd
MDL-60197 mod_data: not always necessary to show 'select all/none' link
2017-09-21 17:51:23 +08:00
AMOS bot
26a0d8a13b
Automatically generated installer lang files
2017-09-21 00:05:52 +08:00
Jun Pataleta
0e57965154
Merge branch 'MDL-59750-master' of git://github.com/lameze/moodle
2017-09-20 18:45:37 +08:00
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
