86194 Commits

Author SHA1 Message Date
Simey Lameze
84d6589e1e MDL-60289 libraries: Upgrade Chart.js to 2.7.0 2017-10-02 10:30:48 +08:00
Jake Dallimore
23ab0d7788 weekly release 3.4dev 2017-09-28 14:27:24 +08:00
Eloy Lafuente (stronk7)
591d42b073 Merge branch 'MDL-60243-master' of https://github.com/snake/moodle 2017-09-27 20:38:50 +02:00
Andrew Nicols
839aa86f0d Merge branch 'wip-MDL-59495-master' of git://github.com/marinaglancy/moodle 2017-09-27 15:11:20 +08:00
Marina Glancy
3ec7d2d97f MDL-59495 registration: do not use the word 'hub' in strings
Either say 'server', or 'Moodle.net' or change the wording. Registration is only possible on Moodle.net now
and it should no longer be called 'hub'.
2017-09-27 13:56:50 +08:00
Marina Glancy
53f8047316 MDL-59495 lang_hub: deprecate all unused strings 2017-09-27 13:56:50 +08:00
Marina Glancy
5189f57f38 MDL-59495 block_community: search courses on moodle.net only
Remove support for alternative hubs and hub selector
2017-09-27 13:56:50 +08:00
Marina Glancy
8df792ee8a MDL-59495 course: publish courses on moodle.net only
Remove support for alternative hubs
2017-09-27 13:56:47 +08:00
Jake Dallimore
c248037acb Merge branch 'MDL-59780-master' of git://github.com/ankitagarwal/moodle 2017-09-27 13:34:56 +08:00
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
Jake Dallimore
6fcf5b679d Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle 2017-09-27 12:56:56 +08:00
Andrew Nicols
529e877614 MDL-59940 calendar: Fix random behat fails when changing month 2017-09-27 12:00:33 +08:00
Andrew Nicols
e0946346ca MDL-59940 calendar: Fix behat test for lookahead feature 2017-09-27 12:00:32 +08:00
Ankit Agarwal
5e2e866d97 MDL-59780 mathjax: Make sure mathjax url doesn't become empty 2017-09-27 09:14:20 +05:30
Jake Dallimore
54ec93885c MDL-60243 competencies: fix ordering bug in api_test unit test
list_user_competencies_to_review() orders by shortname, but the test
creates 2 user competencies with the same short name, resulting in
unpredictable results. This patch fixes that.
2017-09-27 09:19:32 +08:00
Eloy Lafuente (stronk7)
4da0f10286 Merge branch 'MDL-59931_master' of https://github.com/ctam/moodle 2017-09-27 01:16:10 +02:00
Eloy Lafuente (stronk7)
0b4eef24c2 Merge branch 'MDL-60005-master' of git://github.com/jleyva/moodle 2017-09-27 00:54:09 +02:00
Eloy Lafuente (stronk7)
25759080d6 Merge branch 'MDL-60156-master' of git://github.com/andrewnicols/moodle 2017-09-26 20:36:25 +02: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
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
Carson Tam
43f122d32c MDL-59931 mod_quiz: Fixing incorrect pagination count. 2017-09-25 12:46:52 -07: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
3fb45f57e4 MDL-60156 calendar: Replace add event button template 2017-09-25 11:47:55 +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