mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
84,873 Commits 36 Branches 519 Tags
Commit Graph

4855 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
1555f25b24 Merge branch 'MDL-57809-34-progressbar' of https://github.com/roperto/moodle 2017-06-28 18:24:47 +02:00
Eloy Lafuente (stronk7)
d4bd3dbb69 Merge branch 'wip-MDL-59136-master' of git://github.com/marinaglancy/moodle 2017-06-28 18:24:46 +02:00
David Monllao
1243fce158 Merge branch 'wip-MDL-59308-master' of git://github.com/marinaglancy/moodle 2017-06-27 16:41:26 +02:00
Eloy Lafuente (stronk7)
1dac440f55 MDL-58813 phpunit: pick test from 32_STABLE to fix expected behavior 2017-06-26 19:46:05 +02:00
Marina Glancy
1c4a0506e5 MDL-59136 roles: avoid double escaping in role names 2017-06-26 11:57:09 +08:00
Daniel Thee Roperto
ef8ceb2fc2 MDL-57809 weblib: Added missing NO_OUTPUT_BUFFERING directive. 2017-06-23 09:43:07 +10:00
Daniel Thee Roperto
6eaa9d2ffb MDL-57809 weblib: Added opening disclaimer and file-level phpdocs. 2017-06-23 09:43:07 +10:00
Marina Glancy
70b6230829 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 13:42:22 +08:00
Eloy Lafuente (stronk7)
46e9afecf3 Merge branch 'MDL-58985-master-bluebubbles' of git://github.com/mudrd8mz/moodle 2017-06-21 00:45:07 +02:00
Jake Dallimore
63aa8c27be Merge branch 'MDL-58136-master' of git://github.com/damyon/moodle 2017-06-14 12:31:56 +01:00
Damyon Wiese
4c735661ad 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:06:20 +08:00
Damyon Wiese
d07373f289 MDL-58136 boost: Limit courses in flatnav 
Only show "in-progress" courses in the boost flat navigation (as per the myoverview block).
 2017-06-13 10:02:14 +08:00
Dan Poltawski
fc4e3b3cf0 MDL-55548 course: update test to use waitForSecond() 2017-06-12 10:04:01 +01:00
Devang Gaur
4ddf7c6025 MDL-55548 course: added timemodified field to course_sections table 2017-06-12 15:52:53 +08:00
David Mudrák
7352805df1 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:38:56 +02:00
Jake Dallimore
3a0bd9d95a Merge branch 'MDL-59076_master' of git://github.com/markn86/moodle 2017-06-07 09:24:07 +08:00
Mark Nelson
0a5d493c70 MDL-59076 format_weeks: if 'enddate' does not exist in backup then use 0 2017-06-06 12:39:38 +08:00
Dan Poltawski
50c277a5d8 MDL-57139 js: built 2017-06-01 14:54:40 +01:00
Dan Poltawski
a1ce326669 MDL-57139 course: update menu action promises to best practices 2017-06-01 14:54:38 +01:00
Eloy Lafuente (stronk7)
5e27228335 MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts 2017-05-19 19:22:07 +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
Jake Dallimore
4c7dc6af94 Merge branch 'MDL-58659-master' of git://github.com/jleyva/moodle 2017-04-24 12:02:20 +08:00
Ankit Agarwal
266d033896 MDL-58600 competencies: Use correct formating api in exporter 2017-04-24 08:31:13 +05:30
David Mudrák
4088416c14 MDL-58138 completion: Fix capability required for setting defaults 
As per core_completion\manager::get_available_completion_tabs() the
required capability for this feature is moodle/course:manageactivities,
not moodle/course:update.
 2017-04-21 16:22:50 +02:00
Jun Pataleta
6d65f190f0 Merge branch 'MDL-58636-master' of git://github.com/andrewnicols/moodle 2017-04-21 11:37:57 +08:00
Andrew Nicols
a496497c57 MDL-58636 course: Ensure that the drag constraint has height 2017-04-21 10:45:53 +08:00
Juan Leyva
ef83fc2a33 MDL-58659 course: Add missing enddate field in get_courses_by_field 2017-04-20 12:53:10 +02:00