e7294cf68e
Merge branch 'MDL-57412-33' of https://github.com/xow/moodle into MOODLE_33_STABLE
2017-08-23 16:56:54 +08:00
1a451df26c
Merge branch 'MDL-59797-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE
2017-08-23 10:06:21 +08:00
883755af77
MDL-59797 core_course: dont escape module and section names
2017-08-23 09:21:04 +08:00
22efbe807d
MDL-57412 course: Unit test get_view_url for course formats
2017-08-21 12:55:31 +08:00
6f3e403a28
MDL-57412 navigationlib: Respect linkcoursesections again
2017-08-21 12:55:30 +08:00
b24ffdb774
MDL-59663 course: Render the appropriate course-category tree action
2017-08-21 10:02:13 +08:00
a462338e1b
Merge branch 'MDL-58435-m33' of https://github.com/NeillM/moodle into MOODLE_33_STABLE
2017-08-15 16:35:35 +02:00
72d8a09e09
MDL-58435 behat: Update existing tests to use section editing steps
2017-08-15 09:29:30 +01:00
9adeff603a
Merge branch 'wip-MDL-57188-33-2' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-08-14 13:15:58 +08:00
2ba469aaa3
MDL-58435 behat: Behat section editing step should work on section 0
2017-08-09 15:22:59 +01:00
5568ad4923
MDL-57188 course: correct return url to manage page
2017-08-08 14:49:16 +08:00
5d407594f2
Merge branch 'wip-MDL-59655-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-08-07 09:27:52 +02:00
2ecaa395b8
Merge branch 'wip-MDL-59311-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-07-31 14:47:28 +02:00
454bf4c2f0
MDL-59655 course: visibleoncoursepage is not mandatory
2017-07-31 14:16:07 +08:00
44dc52f266
MDL-59311 course: duplicate module rebuilds cache twice
...
slightly refactor duplicate_module() code so it does not rebuild course cache
twice and also we do not need to move module if it is already the last module in a section
2017-07-27 08:17:17 +08:00
6dc120fb5e
MDL-59499 admin: class fix for course category expansion icons
2017-07-26 11:24:19 +08:00
47125f1da3
MDL-59499 coursemanagement: Rewitten expand and collapse
...
Also replace M.util.get_string() calls with core/str module
2017-07-24 13:56:52 +02:00
93ab68385d
MDL-59499 - Fixed collapsing category javascript to use template rendering
2017-07-24 13:56:37 +02:00
3f62f69d32
MDL-59411 course: Fix unavailable typo
2017-07-17 16:40:36 +02:00
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
4bca803817
Merge branch 'MDL-59442-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE
2017-07-17 09:16:23 +01:00
96ce433fc4
MDL-59442 core_course: apply css classes to activity icons
2017-07-13 15:24:56 +08:00
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
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
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
abbc76c9e5
MDL-59287 course_module: Create calendar event update function.
2017-07-10 09:41:21 +08:00
2109b32984
MDL-59287 core_completion: Update to unit tests.
2017-07-10 09:41:21 +08:00
dc30c8fa2f
MDL-59412 course: do not display completion icon for unavailable mod
2017-07-05 09:58:35 +08:00
a7db632a5d
MDL-59262 course: bug - requested course is created without sections
2017-07-04 10:28:45 +08:00
ecd7665605
MDL-59411 course: display access restriction in access error message
2017-06-29 13:47:08 +08:00
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
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
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
5341d76031
MDL-58813 phpunit: pick test from 32_STABLE to fix expected behavior
2017-06-26 19:45:05 +02:00
56855a2842
MDL-59136 roles: avoid double escaping in role names
2017-06-26 11:57:37 +08:00
e318be3772
MDL-57809 weblib: Added missing NO_OUTPUT_BUFFERING directive.
2017-06-23 09:43:32 +10:00
a67ff779d5
MDL-57809 weblib: Added opening disclaimer and file-level phpdocs.
2017-06-23 09:43:32 +10:00
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
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
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
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
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
6e34867b93
MDL-59076 format_weeks: if 'enddate' does not exist in backup then use 0
2017-06-06 12:42:36 +08:00
906b385784
MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts
2017-05-19 19:23:55 +02:00
88a7f77525
MDL-58837 course: do not confirm deleting empty sections
2017-05-11 18:48:08 +08:00
f24e17c93e
MDL-58837 course: allow to add multiple sections
2017-05-11 18:48:04 +08:00
cd501e12c6
Merge branch 'MDL-58853' of git://github.com/stronk7/moodle
2017-05-09 09:17:47 +01:00
6bee596079
MDL-56251 format_weeks: do not overwrite end date for pre 3.3 backups
2017-05-09 12:44:48 +08:00
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
cee8c18b42
MDL-56251 format_weeks: ensure we use 'automaticenddate' default
2017-05-08 13:28:02 +08:00
Andrew Nicols