2054 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
d989ee1e03 MDL-58853 versions: bump all versions and requires near release
version = 2017051500 release version
requires= 2017050500 current rc1 version
2017-05-09 02:58:28 +02:00
Helen Foster
06d0aa4432 MDL-58749 lang: Merge English strings from the en_fix language pack
Significant string changes:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23
* cron_help,core_admin - updated recommendation to run cron every minute
* tour1_content_end, tour1_content_welcome, tour2_content_end,
  tour2_content_welcome all in tool_usertours - removing reference to
  3.2
* invalidsesskey,core_error and invalidsesskey,mod_wiki - more
  understandable error message
* pluginname_help and pluginnamesummary in qtype_essay - explaining that
  the question type can be used for file uploads
* formatnoinline, mustattach and mustrequire in qtype_essay - changing
  the word 'inline' to 'online'
2017-05-03 22:05:51 +02:00
Jake Dallimore
4c7dc6af94 Merge branch 'MDL-58659-master' of git://github.com/jleyva/moodle 2017-04-24 12:02:20 +08:00
Juan Leyva
01c26702d3 MDL-58659 enroll: Add start and end date fields required by overview
Those fields are required to display the courses overview for final
users.
2017-04-20 13:00:15 +02:00
David Monllao
ac0553aa64 Merge branch 'MDL-54901' of git://github.com/stronk7/moodle 2017-04-19 11:30:03 +08:00
David Monllao
3fa64904cd Merge branch 'MDL-58116-master' of https://github.com/barrasroger/moodle-1 2017-04-19 00:49:41 +08:00
barrasroger
499d37755c MDL-58116 core_enrol: fix handling of users on different methods 2017-04-18 13:28:08 +02:00
Eloy Lafuente (stronk7)
55946a892a MDL-54901 phpunit: Change phpunit wwwroot to HTTPS and fix tests
This includes:

- Changing PHPUnit's bootstrap to use https://www...
- Modify all existing expectations to the new wwwroot.
- Amend some tests now with different defaults because of is_https()
- Added a note to main upgrade.php about the change.
2017-04-18 03:40:17 +02:00
Damyon Wiese
473d849fd0 MDL-58493 enrol: Update JS to use font-awesome icon 2017-04-11 11:28:01 +08:00
Eloy Lafuente (stronk7)
aa2b5b214d Merge branch 'wip-MDL-57769-master' of https://github.com/marinaglancy/moodle 2017-04-05 01:31:08 +02:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Andrew Nicols
80ece0847e MDL-58333 enrol: Include course progress in course listing WS
Part of MDL-55611 epic.
2017-04-04 11:01:43 +01:00
Andrew Nicols
930cab683d Merge branch 'master' of https://github.com/koennys/moodle 2017-04-04 11:48:50 +08:00
Simey Lameze
fdeeaff954 MDL-58265 core_test: replace I turn editing on steps
Also remove few more unnecessary steps that redirects behat to
site home page to actually get to the course.

Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00
Simey Lameze
93be3f730c MDL-58265 core_test: remove unnecessary steps
This commmit removes steps that take behat to site home page
to actually get to a course page.

Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00
Simey Lameze
c987d1b2ef MDL-58265 core_test: replace all uses of I follow course steps
Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00
Ryan Wyllie
1ef06b4335 MDL-57503 enrol: allow course ids for enrol_get_my_courses
Allow enrol_get_my_courses to be filtered by a set of known course ids
that the user may or may not be enrolled on.

The result will be a subset of the given course ids that the user is
enrolled in.

Part of MDL-55611 epic.
2017-04-03 11:36:34 +08:00
Marina Glancy
89b909f6de MDL-57769 course: prepare to remove numsections option 2017-03-30 08:26:12 +08:00
David Monllao
618336bf88 MDL-58079 enrol: Move new test to existing test case 2017-03-28 17:34:28 +02:00
David Monllao
6d8b31d3c9 Merge branch 'MDL-58079_master' of https://github.com/kiklop74/moodle 2017-03-28 17:30:40 +02:00
Koen Nys
bb9f8451b7 MDL-57686 auth/db: added pdo support. 2017-03-24 17:19:59 +01:00
Dan Poltawski
d9b094a31d Merge branch 'MDL-58273-master-ldapenrol' of git://github.com/mudrd8mz/moodle 2017-03-20 11:09:33 +00:00
Darko Miletic
fa0029b11d MDL-58079 core_enrol: Fixed invalid category tag 2017-03-20 04:09:15 -03:00
Damyon Wiese
b9b409cfc3 MDL-40759 icons: Peer review fixes (all minor) 2017-03-17 15:52:46 +08:00
Damyon Wiese
ad056aa267 MDL-40759 icons: Better mapping of some icons 2017-03-17 15:52:18 +08:00
Damyon Wiese
663640f5b3 MDL-40759 icons: convert uses of pix_url to pix_icon
Also change filepicker to use scaled svgs instead of sets of custom pngs. The svgs are taken from font-awesome.
2017-03-17 15:52:17 +08:00
Damyon Wiese
2b931458ad MDL-40759 plugins: Add font icon mapping to all plugins 2017-03-17 15:51:29 +08:00
Darko Miletic
ed63ffc715 MDL-58079 core_enrol: Implementing fix and unit test 2017-03-16 14:23:34 -03:00
David Mudrák
935f428ac7 MDL-58273 enrol_ldap: Fix the name of the capability
This capability controls who can hide/show the enrolment instance.
2017-03-15 18:30:46 +01:00
David Monllao
e93f74f446 MDL-57631 enrol_ldap: Disable CLI script if task is enabled 2017-03-15 08:49:22 +01:00
gthomas2
958dbe499a MDL-57631 enrol_ldap: Add sheduled task 2017-03-06 13:24:00 +00:00
Marina Glancy
92253b15b7 MDL-40838 backup: restore enrolment methods without users 2017-02-20 12:08:35 +08:00
Rajesh Taneja
9bb156ee75
MDL-57853 phpunit: Remove use of setExpectedException 2017-02-06 11:44:42 +08:00
Ankit Agarwal
2118859218 MDL-57300 lti: Make tool provider page more readable 2017-02-01 11:40:47 +05:30
Dan Poltawski
ac08d4556a Merge branch 'MDL-57300-master' of git://github.com/ankitagarwal/moodle 2017-02-01 13:01:26 +08:00
Marina Glancy
bbf401bec6 MDL-57782 enrol_self: fix check when email needs to be sent
Thanks to Leandro for providing a fix
2017-01-27 14:24:10 +08:00
Eloy Lafuente (stronk7)
ae8e8e6aa1 Merge branch 'MDL-55915_master' of https://github.com/rezaies/moodle 2017-01-24 22:03:48 +01:00
Ankit Agarwal
7f38d8f3ee MDL-57300 lti: Rename lti2 as registration url
AMOS BEGIN
CPY [registrationurl,mod_lti],[registrationurl,enrol_lti]
AMOS END
2017-01-24 16:40:49 +05:30
Ankit Agarwal
c8b5c793a1 MDL-57300 lti: Fix incorrect variable types in docs 2017-01-24 12:18:21 +05:30
Shamim Rezaie
d636015c8a MDL-55915 enrol_manual: let fullname()know if user has viewfullnames cap
fullname() relies on its second parameter to determine wheter it should use fullnamedisplay or alternativefullnameformat.
We need to check for moodle/site:viewfullnames capability and pass true as the second parameter to fullname() whereever
the user has this capability.
2017-01-20 20:30:38 +11:00
Andrew Nicols
59925af580 MDL-57613 enrol_lti: Correct location of upgrade step 2017-01-19 07:56:27 +08:00
John Okely
ab887f8de9 MDL-57613 enrol_lti: Allow longer nonces 2017-01-13 10:52:24 +08:00
Mathew May
a446095f17 MDL-52098 enrol: cohort now looks at instance status 2016-12-16 11:18:52 +13:00
Andrew Nicols
75af0aa680 Merge branch 'MDL-57266' of git://github.com/stronk7/moodle 2016-12-07 09:53:16 +08:00
Andrew Nicols
3e9f3e30b2 Merge branch 'MDL-56240' of git://github.com/stronk7/moodle 2016-12-07 09:50:16 +08:00
Dan Poltawski
8a08d016ff MDL-56778 enrol: add note about legacy css 2016-12-06 12:31:57 +00:00
Dan Poltawski
94d950601c Merge branch 'MDL-56778_master' of https://github.com/nadavkav/moodle 2016-12-06 12:30:28 +00:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Eloy Lafuente (stronk7)
e7a1eed154 MDL-56240 upgrade: delete incorrect lines, manually added
Note that, with MDL-57266, we are changine the comment to be:

// Automatically generated Moodle v3.2.0 release upgrade line

in order to make to make to make it clearer that it's an
automatic (part of the release process) comment and should not
be added manually ever.
2016-12-05 16:47:33 +01:00