Commit Graph

4861 Commits

Author SHA1 Message Date
David Monllao 3f62f69d32 MDL-59411 course: Fix unavailable typo 2017-07-17 16:40:36 +02:00
David Monllao 8765200f2c Merge branch 'wip-MDL-59411-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-07-17 15:48:22 +02:00
Dan Poltawski 4bca803817 Merge branch 'MDL-59442-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE 2017-07-17 09:16:23 +01:00
Simey Lameze 96ce433fc4 MDL-59442 core_course: apply css classes to activity icons 2017-07-13 15:24:56 +08:00
Dan Poltawski cc5590d73a Merge branch 'wip-MDL-59287-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE 2017-07-11 11:29:42 +01:00
Dan Poltawski 12dce9c9c3 Merge branch 'wip-MDL-59262-33-2' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-07-10 14:31:07 +01:00
Adrian Greeve 73d2d21d4c MDL-59287 course_module: switching to new function.
Instead of using *_refresh_events directly
course_module_update_calendar_events is called so
that all types of calendar events can be updated.
2017-07-10 09:41:21 +08:00
Adrian Greeve abbc76c9e5 MDL-59287 course_module: Create calendar event update function. 2017-07-10 09:41:21 +08:00
Adrian Greeve 2109b32984 MDL-59287 core_completion: Update to unit tests. 2017-07-10 09:41:21 +08:00
Marina Glancy dc30c8fa2f MDL-59412 course: do not display completion icon for unavailable mod 2017-07-05 09:58:35 +08:00
Marina Glancy a7db632a5d MDL-59262 course: bug - requested course is created without sections 2017-07-04 10:28:45 +08:00
Marina Glancy ecd7665605 MDL-59411 course: display access restriction in access error message 2017-06-29 13:47:08 +08:00
Eloy Lafuente (stronk7) 65e5e9f454 Merge branch 'MDL-57809-33-progressbar' of https://github.com/roperto/moodle into MOODLE_33_STABLE 2017-06-27 20:17:34 +02:00
Eloy Lafuente (stronk7) 7984ae3581 Merge branch 'wip-MDL-59136-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-06-27 18:09:43 +02:00
David Monllao 61812e3dd8 Merge branch 'wip-MDL-59308-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE 2017-06-27 16:42:33 +02:00
Eloy Lafuente (stronk7) 5341d76031 MDL-58813 phpunit: pick test from 32_STABLE to fix expected behavior 2017-06-26 19:45:05 +02:00
Marina Glancy 56855a2842 MDL-59136 roles: avoid double escaping in role names 2017-06-26 11:57:37 +08:00
Daniel Thee Roperto e318be3772 MDL-57809 weblib: Added missing NO_OUTPUT_BUFFERING directive. 2017-06-23 09:43:32 +10:00
Daniel Thee Roperto a67ff779d5 MDL-57809 weblib: Added opening disclaimer and file-level phpdocs. 2017-06-23 09:43:32 +10:00
Marina Glancy 3d8a2c5cd9 MDL-59308 calendar: pass module context when known
this will protect us from exceptions when context for removed instance can not be retrieved
2017-06-22 16:01:33 +08:00
Eloy Lafuente (stronk7) f6736dedd1 Merge branch 'MDL-58985-33-bluebubbles' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE 2017-06-21 00:43:53 +02:00
Damyon Wiese 3709386ed5 MDL-58136 course: Remove lines from unit test
Remove unused vars and logic from the unit test for classifying a course.
2017-06-13 15:07:50 +08:00
Damyon Wiese e1d15194bc MDL-58136 boost: Limit courses in flatnav
Only show "in-progress" courses in the boost flat navigation (as per the myoverview block).
2017-06-12 16:08:18 +08:00
David Mudrák 5b2f32ca92 MDL-58985 course: Fix display of availability information
The availability info text can be either a one line short text such as
"Hidden from students" but it can also be a long HTML formatted text
with the list of all restricted access conditions. For the latter, using
bootstrap labels was not appropriate.

This extends the template context data with some boolean flags that
allow to better distinguish the source and meaning of the availability
information and display it accordingly.

Credit goes to Marina Glancy for the solution idea.
2017-06-12 09:30:57 +02:00
Mark Nelson 6e34867b93 MDL-59076 format_weeks: if 'enddate' does not exist in backup then use 0 2017-06-06 12:42:36 +08:00
Eloy Lafuente (stronk7) 906b385784 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:23:55 +02:00
Marina Glancy 88a7f77525 MDL-58837 course: do not confirm deleting empty sections 2017-05-11 18:48:08 +08:00
Marina Glancy f24e17c93e MDL-58837 course: allow to add multiple sections 2017-05-11 18:48:04 +08:00
Dan Poltawski cd501e12c6 Merge branch 'MDL-58853' of git://github.com/stronk7/moodle 2017-05-09 09:17:47 +01:00
Mark Nelson 6bee596079 MDL-56251 format_weeks: do not overwrite end date for pre 3.3 backups 2017-05-09 12:44:48 +08:00
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
Marina Glancy cee8c18b42 MDL-56251 format_weeks: ensure we use 'automaticenddate' default 2017-05-08 13:28:02 +08:00
Eloy Lafuente (stronk7) b7b97f1d72 MDL-56251 format_weeks: Cannot group by TEXT in Oracle
Perform the grouping in subquery and later
simply join with the table containing the TEXT col.
2017-05-08 13:27:50 +08:00
Marina Glancy aef5c363d0 MDL-50670 course: apply defaults when format was switched 2017-05-05 14:47:27 +08:00
Mark Nelson 50bbb5b254 MDL-56251 format_weeks: fixed broken upgrade when using CLI 2017-05-05 12:55:06 +08:00
Jake Dallimore 7a37f761bc Merge branch 'MDL-56251_master' of git://github.com/markn86/moodle 2017-05-05 12:29:44 +08:00
Mark Nelson a526c706f4 MDL-56251 core: fixed failing unit tests 2017-05-05 12:14:56 +08:00
Mark Nelson 18557be2c2 MDL-56251 format_weeks: handle restore of < 3.3 backups 2017-05-05 12:14:56 +08:00
Mark Nelson 9f8a15b461 MDL-56251 format_weeks: add upgrade for new 'automaticenddate' setting 2017-05-05 12:14:56 +08:00
Marina Glancy 7aa3925c9a MDL-56251 format_weeks: do not use caches in event observers 2017-05-05 12:14:55 +08:00
Dan Poltawski 97b93cafef Merge branch 'MDL-58725_master' of git://github.com/markn86/moodle 2017-05-04 15:15:35 +01:00
Mark Nelson dbcc8b3153 MDL-58725 course: include selector change notes in format/upgrade.txt 2017-05-04 15:40:55 +08:00
Mark Nelson c61b3b4a70 MDL-56251 format_weeks: added observers for updating the course end date 2017-05-04 13:08:50 +08:00
Damyon Wiese 039ff55129 MDL-56251 format_weeks: add new 'automaticenddate' setting 2017-05-04 09:56:51 +08:00
Dan Poltawski a1646c1869 Merge branch 'MDL-50670_master' of git://github.com/markn86/moodle 2017-05-03 13:30:43 +01:00
Jun Pataleta 428f7864a1 MDL-58794 core_course: Use a simpler future timestamp for test 2017-05-03 14:52:38 +08:00
Marina Glancy 98b3fa4c63 MDL-50670 course: correctly apply defaults for format options 2017-05-02 16:06:46 +08:00
Jun Pataleta 8011a2bf47 Merge branch 'MDL-58720-master' of git://github.com/jleyva/moodle 2017-05-01 10:47:52 +08:00
Juan Leyva 935429e2a5 MDL-58720 course: Return restricted sections and modules in get_contents
core_course_get_contents was only checking for modules visible by the
user (via uservisible).
It was not checking for modules that are not visible for the user but
should be displayed in the course because they have access restrictions
configured.
2017-04-27 10:53:17 +02:00
Ankit Agarwal 47820478b0 MDL-58644 myoverview: Filter course summary before displaying. 2017-04-27 11:22:03 +05:30