114bcbe0ba
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-04-18 12:34:49 +01:00
499d37755c
MDL-58116 core_enrol: fix handling of users on different methods
2017-04-18 13:28:08 +02:00
fea4557cc0
MDL-58629 install: update the list of stale files for 3.3
2017-04-18 13:19:37 +02:00
bdc70bbffd
MDL-58625 competency restore: avoid use of magic gettter
...
These were deprecated when persistents moved to core.
2017-04-18 10:43:05 +01:00
f939ae13f9
MDL-58624 persistent: Use correct namespace for exception
2017-04-18 13:54:45 +05:30
38a941990e
Merge branch 'MDL-58464-int-fix-2' of git://github.com/ryanwyllie/moodle
2017-04-18 09:03:58 +01:00
1036b86819
MDL-58464 block_myoverview: remove additional placeholder in timeline
...
Remove the additional placeholder image when the user is not enrolled in
any courses from the sort by courses view in the timeline because there
is already a check for no in progress courses.
2017-04-18 07:50:41 +00:00
0680dcac83
Merge branch 'MDL-58464-int-fix-1' of git://github.com/ryanwyllie/moodle
2017-04-18 08:15:57 +01:00
318d1f56de
MDL-58464 block_myoverview: fix js error in timeline view courses
2017-04-18 07:03:13 +00:00
762550d7d2
Merge branch 'MDL-58574-master' of git://github.com/lameze/moodle
2017-04-18 14:43:57 +08:00
82db704eb0
MDL-58603 glossary: Fix fontawesome api name
2017-04-18 11:58:30 +05:30
666b7b5644
MDL-58574 templates: remove unnecessary imageurl check
2017-04-18 14:01:01 +08:00
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
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
c17d949c8d
MDL-58618 auth: Fix idp icon urls
2017-04-18 13:35:59 +08:00
bb3fc8d6b1
MDL-58463 mod_assign: Improve coverage of test_assign_refresh_events()
2017-04-18 13:26:23 +08:00
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
a1b98c934c
Merge branch 'MDL-58551-master' of git://github.com/lameze/moodle
2017-04-18 10:23:03 +08:00
e6a1843efb
MDL-58551 config: add alternative_file_system_class description
2017-04-18 10:13:48 +08:00
2660f7dabe
Merge branch 'MDL-58559-master' of git://github.com/lameze/moodle
2017-04-18 09:42:36 +08:00
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
80483bf3cc
Merge branch 'MDL-58582-master' of https://github.com/Dagefoerde/moodle
2017-04-18 09:20:10 +08:00
4e785511b7
MDL-58559 block_community: check if the course has subject
2017-04-18 08:56:07 +08:00
d4be750a7c
Merge branch 'MDL-58539_master' of https://github.com/dmonllao/moodle
2017-04-18 08:41:59 +08:00
6e6a768c15
MDL-54901 travis: ensure pg93 is available and https served
2017-04-18 02:12:53 +02:00
9d2112e88d
MDL-54901 environment: pg93, openssl, https & utf8mb4
2017-04-18 02:12:45 +02:00
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
e082fbd978
MDL-58515 assignfeedback_editpdf: Fix comment tabbing and focus outline
2017-04-17 15:40:27 +01:00
62306cdf3d
MDL-58582 theme: Improve PHPDoc comment on SVG image resolution
2017-04-17 15:23:13 +02:00
bb17eafab0
Merge branch 'MDL-58478-master' of git://github.com/damyon/moodle
2017-04-17 14:44:39 +02:00
4ba4ecfa96
MDL-58486 userprefs: clarifying comment
2017-04-17 12:17:18 +01:00
48411a8843
Merge branch 'MDL-58486' of git://github.com/timhunt/moodle
2017-04-17 12:15:40 +01:00
ae86b0879a
Merge branch 'MDL-58499-master' of git://github.com/barbararamiro/moodle
2017-04-17 11:23:52 +01:00
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
2d48a763f5
Merge branch 'MDL-58549-master' of https://github.com/xow/moodle
2017-04-17 11:07:43 +01:00
e526e43269
Merge branch 'MDL-58479-33-weblib-notice-phpdoc' of git://github.com/roperto/moodle
2017-04-17 10:59:47 +01:00
9556d5ec52
Merge branch 'MDL-46929' of https://github.com/stronk7/moodle
2017-04-17 10:53:42 +01:00
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
6a346ab440
Merge branch 'MDL-58507_master' of git://github.com/markn86/moodle
2017-04-17 10:42:48 +01:00
a9d3bf7666
Merge branch 'MDL-58465-master' of git://github.com/ankitagarwal/moodle
2017-04-17 10:41:16 +01:00
0bb4ee0fe3
Merge branch 'MDL-58393-33_filter-order' of https://github.com/roperto/moodle
2017-04-17 10:30:32 +01:00
6e45cfc0c0
Merge branch 'MDL-58593-master' of git://github.com/merrill-oakland/moodle
2017-04-17 10:03:07 +01:00
cd729dc905
MDL-58593 database: More efficiently track issued key names
2017-04-13 12:21:13 -04:00
0c290ad191
Merge branch 'MDL-32596_master' of https://github.com/rezaies/moodle
2017-04-13 15:58:00 +01:00
ca7de06cf3
Merge branch 'MDL-58085-master' of git://github.com/cameron1729/moodle
2017-04-13 15:33:43 +01:00
b9ce916ac9
MDL-58464 block_myoverview: paginate timeline sort by courses view
2017-04-13 15:24:14 +01:00
32c249621b
Merge branch 'MDL-58244-master' of https://github.com/MartinGauk/moodle
2017-04-13 12:58:23 +02:00
faf661cb4c
Merge branch 'MDL-58171-report-role-format_text' of https://github.com/lucaboesch/moodle
2017-04-13 12:39:44 +02:00
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
d0d0a7b482
Merge branch 'MDL-58560-master' of https://github.com/xow/moodle
2017-04-13 11:38:37 +02:00
Dan Poltawski