Commit graph

84585 commits

Author SHA1 Message Date
Simey Lameze
666b7b5644 MDL-58574 templates: remove unnecessary imageurl check 2017-04-18 14:01:01 +08:00
Jun Pataleta
6d5661a9b3 MDL-57793 calendar: Additional edge-case tests
* Added leap year and 31th day of the month tests.
2017-04-18 13:55:25 +08:00
Jun Pataleta
dbb49e8d48 MDL-57793 calendar: Add recursion to satisfy COUNT rule
* Add recursion to the creation of recurring calendar events to satisfy
  the COUNT rule, if necessary.
2017-04-18 13:55:25 +08:00
John Okely
c17d949c8d MDL-58618 auth: Fix idp icon urls 2017-04-18 13:35:59 +08:00
Jun Pataleta
bb3fc8d6b1 MDL-58463 mod_assign: Improve coverage of test_assign_refresh_events() 2017-04-18 13:26:23 +08:00
Jun Pataleta
22753c8c5c MDL-58566 calendar: Move \core_calendar\local\api::get_legacy_events()
* Move and rename \core_calendar\local\api::get_legacy_events() to
  calendar_get_legacy_events() in calendar/lib.php.
* Fix the parameter-normalising callback function in
  calendar_get_legacy_events() so that it correctly handles false values
  by returning an empty array instead of it returning a non-empty array
  that contains an empty element.
2017-04-18 10:32:09 +08:00
Andrew Nicols
a1b98c934c Merge branch 'MDL-58551-master' of git://github.com/lameze/moodle 2017-04-18 10:23:03 +08:00
Simey Lameze
e6a1843efb MDL-58551 config: add alternative_file_system_class description 2017-04-18 10:13:48 +08:00
Andrew Nicols
2660f7dabe Merge branch 'MDL-58559-master' of git://github.com/lameze/moodle 2017-04-18 09:42:36 +08: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
Andrew Nicols
80483bf3cc Merge branch 'MDL-58582-master' of https://github.com/Dagefoerde/moodle 2017-04-18 09:20:10 +08:00
Simey Lameze
4e785511b7 MDL-58559 block_community: check if the course has subject 2017-04-18 08:56:07 +08:00
Andrew Nicols
d4be750a7c Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle 2017-04-18 08:41:59 +08:00
Eloy Lafuente (stronk7)
6e6a768c15 MDL-54901 travis: ensure pg93 is available and https served 2017-04-18 02:12:53 +02:00
Eloy Lafuente (stronk7)
9d2112e88d MDL-54901 environment: pg93, openssl, https & utf8mb4 2017-04-18 02:12:45 +02:00
Ruslan Kabalin
fc9bc65863 MDL-58539 assignfeedback_editpdf: Fix group assignment fatal error.
This makes sure that $grade->attemptnumber is not NULL before using its
value.
2017-04-17 17:00:47 +02:00
Tony Butler
e082fbd978 MDL-58515 assignfeedback_editpdf: Fix comment tabbing and focus outline 2017-04-17 15:40:27 +01:00
Jan Dageförde
62306cdf3d
MDL-58582 theme: Improve PHPDoc comment on SVG image resolution 2017-04-17 15:23:13 +02:00
David Monllao
bb17eafab0 Merge branch 'MDL-58478-master' of git://github.com/damyon/moodle 2017-04-17 14:44:39 +02:00
Dan Poltawski
4ba4ecfa96 MDL-58486 userprefs: clarifying comment 2017-04-17 12:17:18 +01:00
Dan Poltawski
48411a8843 Merge branch 'MDL-58486' of git://github.com/timhunt/moodle 2017-04-17 12:15:40 +01:00
Dan Poltawski
ae86b0879a Merge branch 'MDL-58499-master' of git://github.com/barbararamiro/moodle 2017-04-17 11:23:52 +01:00
Eloy Lafuente (stronk7)
71318407ef MDL-54901 environment: 3.3 base information
This is a direct copy of the 3.2 branch to
have changes under control easier in next commits.
2017-04-17 12:22:10 +02:00
Dan Poltawski
2d48a763f5 Merge branch 'MDL-58549-master' of https://github.com/xow/moodle 2017-04-17 11:07:43 +01:00
Dan Poltawski
e526e43269 Merge branch 'MDL-58479-33-weblib-notice-phpdoc' of git://github.com/roperto/moodle 2017-04-17 10:59:47 +01:00
Dan Poltawski
9556d5ec52 Merge branch 'MDL-46929' of https://github.com/stronk7/moodle 2017-04-17 10:53:42 +01:00
Eloy Lafuente (stronk7)
43bb3b77a5 MDL-46929 mod_forum: behat fixes
- Keep old scenarios being non-javascript.
- Move the tags stuff to recently added scenario.
- Change some "my" by "your" to avoid problems detecting results
  while keeping previous tests (based on "subject") working.
2017-04-17 11:44:00 +02:00
Dan Poltawski
6a346ab440 Merge branch 'MDL-58507_master' of git://github.com/markn86/moodle 2017-04-17 10:42:48 +01:00
Dan Poltawski
a9d3bf7666 Merge branch 'MDL-58465-master' of git://github.com/ankitagarwal/moodle 2017-04-17 10:41:16 +01:00
Dan Poltawski
0bb4ee0fe3 Merge branch 'MDL-58393-33_filter-order' of https://github.com/roperto/moodle 2017-04-17 10:30:32 +01:00
Dan Poltawski
6e45cfc0c0 Merge branch 'MDL-58593-master' of git://github.com/merrill-oakland/moodle 2017-04-17 10:03:07 +01:00
Eric Merrill
cd729dc905 MDL-58593 database: More efficiently track issued key names 2017-04-13 12:21:13 -04:00
Dan Poltawski
0c290ad191 Merge branch 'MDL-32596_master' of https://github.com/rezaies/moodle 2017-04-13 15:58:00 +01:00
Dan Poltawski
ca7de06cf3 Merge branch 'MDL-58085-master' of git://github.com/cameron1729/moodle 2017-04-13 15:33:43 +01:00
Ryan Wyllie
b9ce916ac9 MDL-58464 block_myoverview: paginate timeline sort by courses view 2017-04-13 15:24:14 +01:00
David Monllao
32c249621b Merge branch 'MDL-58244-master' of https://github.com/MartinGauk/moodle 2017-04-13 12:58:23 +02:00
David Monllao
faf661cb4c Merge branch 'MDL-58171-report-role-format_text' of https://github.com/lucaboesch/moodle 2017-04-13 12:39:44 +02:00
Martin Gauk
8abec10d55 MDL-58244 shibboleth: handle users who are logged out
If the user is (already) logged out, do not access $USER->auth and redirect him to the return URL.
2017-04-13 10:05:39 +00:00
David Monllao
d0d0a7b482 Merge branch 'MDL-58560-master' of https://github.com/xow/moodle 2017-04-13 11:38:37 +02:00
David Monllao
378936ea20 Merge branch 'MDL-58493-master' of git://github.com/damyon/moodle 2017-04-13 11:36:54 +02:00
Andrew Nicols
e4a090c105 Merge branch 'MDL-58501_master' of git://github.com/markn86/moodle 2017-04-13 13:21:42 +08:00
Andrew Nicols
20026ab3c1 Merge branch 'MDL-58356-master' of git://github.com/damyon/moodle 2017-04-13 12:10:45 +08:00
Andrew Nicols
270d5c1cc5 Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle 2017-04-13 10:00:58 +08:00
Andrew Nicols
28b966a5f9 Merge branch 'MDL-39913-master-new-validation' of https://github.com/xow/moodle 2017-04-13 08:44:15 +08:00
Andrew Nicols
4041ac0c4d Merge branch 'MDL-58537-master' of git://github.com/damyon/moodle 2017-04-13 08:36:20 +08:00
AMOS bot
a7e60c1291 Automatically generated installer lang files 2017-04-13 00:03:51 +08:00
David Monllao
cd249c747f MDL-58235 myoverview: Remove trailing whitespace 2017-04-12 16:39:15 +02:00
David Monllao
c94e64fad1 Merge branch 'MDL57475-master' of https://github.com/mmafrar/moodle 2017-04-12 16:18:53 +02:00
David Monllao
10a6361e1c Merge branch 'MDL-58235-master-3' of git://github.com/ryanwyllie/moodle 2017-04-12 15:46:01 +02:00
Luca Bösch
99c0ad51b4 MDL-58171 report: role name passing format_text
Have the role name in h2 of the participation report passing filters
like multilang2 by having it call format_text.

Signed-off-by: Luca Bösch <luca.boesch@bfh.ch>
2017-04-12 15:31:43 +02:00