Eloy Lafuente (stronk7)
245227fdcd
Merge branch 'MDL-59667-master-2' of git://github.com/ryanwyllie/moodle
2017-08-15 13:12:45 +02:00
Andrew Nicols
9729cd2fcc
Merge branch 'MDL-59746-master' of git://github.com/Dagefoerde/moodle
2017-08-15 13:17:37 +08:00
Andrew Nicols
b66c2f561b
Merge branch 'MDL-59810-master' of git://github.com/lameze/moodle
2017-08-15 13:05:33 +08:00
Simey Lameze
5d942f5a53
MDL-59810 core_calendar: test action events cannot be deleted
2017-08-15 12:05:10 +08:00
Jun Pataleta
fa435675ec
Merge branch 'MDL-57611-master' of https://github.com/jebarviabb/moodle
2017-08-15 11:49:38 +08:00
Andrew Nicols
69e0850292
Merge branch 'MDL-59370-master' of git://github.com/damyon/moodle
2017-08-15 10:16:42 +08:00
Ryan Wyllie
ecc88f3379
MDL-59667 form: stop datepicker from rendering outside viewport
...
Stop the date picker panel from being rendered outside of the
viewport, for example when being displayed in a modal.
2017-08-15 01:24:52 +00:00
Eloy Lafuente (stronk7)
0982255fa8
Merge branch 'wip-MDL-59736-master' of git://github.com/marinaglancy/moodle
2017-08-14 12:10:36 +02:00
Eloy Lafuente (stronk7)
104ae3efdf
Merge branch 'MDL-59774_master' of git://github.com/dmonllao/moodle
2017-08-14 11:58:00 +02:00
Jun Pataleta
993ccc7268
Merge branch 'MDL-59785-master' of git://github.com/lameze/moodle
2017-08-14 16:56:08 +08:00
David Monllao
88777c570c
MDL-59774 analytics: Fix sql_compare_text usage
...
Replace a distinct + join by an exists, which suits better what we need to do.
2017-08-14 07:56:06 +02:00
Jun Pataleta
28368da794
Merge branch 'MDL-59740_master' of git://github.com/markn86/moodle
2017-08-14 13:48:01 +08:00
Andrew Nicols
8fa7961d20
Merge branch 'wip-MDL-57188-master-2' of git://github.com/marinaglancy/moodle
2017-08-14 13:13:47 +08:00
Andrew Nicols
d9d1e6cb4d
Merge branch 'MDL-59737_master' of git://github.com/markn86/moodle
2017-08-14 12:25:33 +08:00
Jun Pataleta
cc012017ad
Merge branch 'MDL-59492-master' of git://github.com/lameze/moodle
2017-08-14 12:16:08 +08:00
Simey Lameze
1f9f277d3e
MDL-59492 block_myoverview: make view course buttons consistent
2017-08-14 11:58:18 +08:00
Simey Lameze
54798b5fbb
MDL-59492 block_myoverview: fix remaining course links visibility
2017-08-14 11:58:18 +08:00
Charles Fulton
6dede51557
MDL-59492 block_myoverview: handle course visibility style
2017-08-14 11:58:18 +08:00
Damyon Wiese
5dd94c811d
MDL-59370 behat: Behat fixes for enrolled users
...
We removed the enrolled users page, so we need to update the behats that were using it.
2017-08-14 11:06:22 +08:00
Damyon Wiese
4b50765bd5
MDL-59370 enrol: Kill the enrol/users page.
2017-08-14 11:06:16 +08:00
Eloy Lafuente (stronk7)
eb74752523
Merge branch 'MDL-59741-master' of git://github.com/jleyva/moodle
2017-08-14 02:34:11 +02:00
Josh Ebarvia
93e071c8ec
MDL-57611 report_log: Fix capability checks for viewing logs
2017-08-11 13:01:50 +09:30
Simey Lameze
1c729ff624
MDL-59785 mod_book: all navigation styles must mark as completed
2017-08-10 16:11:33 +08:00
David Monllao
f3625f47c5
weekly release 3.4dev
2017-08-10 09:11:29 +02:00
Andrew Nicols
ffd1747b11
Merge branch 'MDL-59671-master-fix' of git://github.com/lameze/moodle
2017-08-09 15:09:08 +08:00
Simey Lameze
436d39ba85
MDL-59671 core_calendar: replace current delete permission checks
2017-08-09 14:51:22 +08:00
Simey Lameze
dadd6f9fcc
MDL-59671 core_calendar: create calendar_delete_event_allowed function
2017-08-09 14:47:35 +08:00
Andrew Nicols
ba07a8e7da
Merge branch 'MDL-59638_master-fix' of git://github.com/dmonllao/moodle
2017-08-09 13:41:29 +08:00
David Monllao
42d67f95cd
MDL-59638 analytics: Prevent start time to be higher than end time
...
Other related changes:
- core_analytics\site get_start and get_end returning always integer values
- Defer intval call in define_ranges to refine some seconds
2017-08-08 14:38:11 +02:00
Dan Poltawski
2defbefe8c
Merge branch 'MDL-59116_master-fix2' of git://github.com/dmonllao/moodle
2017-08-08 13:19:49 +01:00
David Monllao
e4584b8110
MDL-59116 analytics: Replace wrong sorting
2017-08-08 14:04:52 +02:00
Eloy Lafuente (stronk7)
455974b395
Merge branch 'MDL-59748-master-2' of git://github.com/andrewnicols/moodle
2017-08-08 11:49:05 +02:00
Marina Glancy
9dd0fe18a8
MDL-57188 course: correct return url to manage page
2017-08-08 14:48:44 +08:00
Andrew Nicols
c036256d86
Merge branch 'MDL-59749-master' of git://github.com/ryanwyllie/moodle
2017-08-08 14:33:43 +08:00
Andrew Nicols
ca84ba0ed2
Merge branch 'MDL-59666-master-fix' of git://github.com/junpataleta/moodle
2017-08-08 12:54:27 +08:00
Jun Pataleta
10994cbc4a
MDL-59666 mod_assign: Disable remind to grade by field in override tests
2017-08-08 12:28:39 +08:00
Andrew Nicols
f4cc24ca64
Merge branch 'MDL-59671-master' of git://github.com/lameze/moodle
2017-08-08 11:46:51 +08:00
Simey Lameze
c34e200241
MDL-59671 core_calendar: action events edition needs to be on module
2017-08-08 11:44:27 +08:00
Simey Lameze
1106040a4d
MDL-59671 core_calendar: add visibility logic to template
2017-08-08 11:44:19 +08:00
Simey Lameze
4df03a279a
MDL-59671 core_calendar: check if the event can be deleted
2017-08-08 11:44:11 +08:00
Simey Lameze
6fb751562a
MDL-59671 core_calendar: move logic to calendar event exporter
2017-08-08 11:44:03 +08:00
Ryan Wyllie
0a501e1b2e
MDL-59749 form: revert setting id on inline form elements
...
Revert the change I made in MDL-59382 to correctly set the id for inline
form elements because it's breaking a bunch of different places that had
already worked around the problem.
2017-08-08 03:28:36 +00:00
David Monllao
9eebb3c38b
Merge branch 'MDL-59448-master' of https://github.com/xow/moodle
2017-08-08 04:25:06 +02:00
David Monllao
e8e53efba8
Merge branch 'MDL-58889-master' of https://github.com/xow/moodle
2017-08-08 04:23:31 +02:00
Andrew Nicols
286a38eeaa
Merge branch 'MDL-59700-master' of git://github.com/cameron1729/moodle
2017-08-08 10:12:35 +08:00
Andrew Nicols
63ce49df9b
MDL-59748 groupslib: Fix time issue in unit test
2017-08-08 10:07:46 +08:00
John Okely
8b0e965d30
MDL-59448 boost: Make info colour accessible and match default primary
2017-08-08 08:37:46 +08:00
John Okely
2fd7cdbe83
MDL-58889 boost: Use underline links in footer
...
It's impossible to gain the right colour contrast against a dark footer
using the same primary colour that gets 4.5 against white.
2017-08-08 08:34:15 +08:00
Andrew Nicols
a72e7d4974
Merge branch 'MDL-59725-master' of https://github.com/xow/moodle
2017-08-08 08:30:33 +08:00
Eloy Lafuente (stronk7)
9af66ed103
Merge branch 'MDL-59614-master' of git://github.com/junpataleta/moodle
2017-08-08 01:48:35 +02:00