31245d8746
Merge branch 'MDL-50266-master' of git://github.com/ankitagarwal/moodle
2017-05-30 10:38:14 +01:00
81d7b77d6f
MDL-44905 mod_scorm: Skip view page on a Single activity course
...
Allow 'Student skip content structure page: Always' option with 'Single
activity' course format, and redirect 'Exit activity' back to site home
if user has no report access.
2017-05-29 20:32:40 +03:00
13a1e8b50c
Merge branch 'master-MDL-56973' of https://github.com/fwsl/moodle
2017-05-22 15:13:58 +08:00
da2959fe9c
Merge branch 'MDL-56617-course-cbm-grade-to-pass' of https://github.com/lucaboesch/moodle
2017-05-22 14:31:37 +08:00
aec421153e
Merge branch 'MDL-58933' of git://github.com/stronk7/moodle
2017-05-22 14:12:36 +08:00
52ab8b2c16
Merge branch 'MDL-58986_master' of git://github.com/markn86/moodle
2017-05-22 12:21:11 +08:00
a5906ac944
Merge branch 'MDL-57957' of https://github.com/bostelm/moodle
2017-05-22 10:41:46 +08:00
5e27228335
MDL-58933 upgrade: add 3.3.0 separation line to all upgrade scripts
2017-05-19 19:22:07 +02:00
16302f85ec
MDL-56617 mod_quiz: No grade to pass check if CBM used
...
When certainty-based marking is used, grades can 'exceed' the maximum grade
(because they are multiplied by factors). Therefore, in such cases, don't show
no warning.
2017-05-19 12:30:38 +02:00
2e241fea56
MDL-56973 wiki: New page title readonly after changing course language
2017-05-19 11:12:55 +02:00
373d7d3f28
MDL-46322 mod_assign: Only list enrolled graders as potential markers
2017-05-18 21:58:24 -05:00
f3dc7a171a
MDL-58986 mod_quiz: add CSS classes to buttons on comment page
2017-05-18 16:49:25 +08:00
fce1d7deb8
MDL-50266 mod_forum: Remove strings deprecated in 3.0
2017-05-18 11:17:13 +05:30
aa951785e0
MDL-50266 lesson: Remove strings deprecated in 3.0
2017-05-18 08:34:33 +05:30
3ffd13827e
MDL-46322 mod_assign: Only list enrolled graders as potential markers
2017-05-17 16:12:54 -05:00
1f36a0796f
Merge branch 'MDL-58947-master' of https://github.com/sammarshallou/moodle
2017-05-17 09:15:09 +08:00
5058a4d199
MDL-49988 wiki: fix broken page layout if html contains line breaks
2017-05-16 19:23:00 +01:00
b2e76ba7d8
MDL-57957 mod_assign: show feedback file in absence of grade item
2017-05-16 11:58:05 +01:00
9f13573c43
Merge branch 'MDL-58770' of https://github.com/IMSGlobal/moodle
2017-05-16 09:57:05 +08:00
ec5ec9bce5
MDL-58947 Search: Label URLs not correctly calculated
2017-05-15 17:45:45 +01:00
ca4f5a68bc
Merge branch 'MDL-58496-master' of git://github.com/cameron1729/moodle
2017-05-15 11:14:19 +01:00
4010466614
Merge branch 'MDL-58841-master' of git://github.com/cameron1729/moodle
2017-05-15 10:46:00 +01:00
46470ad02c
MDL-58852 choice: Use multilang for choice options in charts
2017-05-14 21:31:10 +02:00
e84fefdb09
Merge branch 'MDL-58777-master' of git://github.com/cameron1729/moodle
2017-05-11 11:41:48 +08:00
e838654b4e
Merge branch 'MDL-58877-master-enfix' of git://github.com/mudrd8mz/moodle
2017-05-10 12:01:08 +01:00
0d86195e8d
MDL-58877 lang: Merge English strings from the en_fix language pack
...
Significant string changes:
* loginerror_cannotcreateaccounts in auth_oauth2 - more understandable
error message
* config_keep_groups_and_groupings and config_keep_roles_and_enrolments
in core_backup - switch fix
2017-05-10 12:24:36 +02:00
a5ea94d85f
Merge branch 'MDL-58843-master-exchandler' of git://github.com/mudrd8mz/moodle
2017-05-10 14:05:51 +08:00
9eb5a0417c
MDL-58777 mod_assign: Remove unnecessary upgrade step
...
This upgrade step was setting the priority field for assign events
in the events table. This is redundant since we queue a task to
refresh all events.
This patch also removes a redundant refresh_events task that is
queued from assign.
2017-05-10 13:41:18 +08:00
56d1ddd775
MDL-58777 mod_assign: Explicitly sort records and set event priority
...
The assign update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.
There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
2017-05-10 13:41:18 +08:00
8dada7e334
MDL-58777 mod_lesson: Explicitly sort records and set event priority
...
The lesson update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.
There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
2017-05-10 13:41:18 +08:00
4133df6fd6
MDL-58777 mod_quiz: Explicitly sort records and set event priority
...
The quiz update events code depends on the "old" events in the
DB being returned in the same order as they were originally made,
however there was no guarantee that this would be the case.
There were also situations where the priority would not be explicitly
set (e.g., when creating the "original" event).
2017-05-10 13:41:18 +08:00
865e2bc7dc
Merge branch 'MDL-58780-master' of git://github.com/junpataleta/moodle
2017-05-10 11:48:40 +08:00
834da9a30f
Merge branch 'MDL-58860-master' of git://github.com/jleyva/moodle
2017-05-09 17:05:39 +08:00
cd501e12c6
Merge branch 'MDL-58853' of git://github.com/stronk7/moodle
2017-05-09 09:17:47 +01:00
b50ff71052
MDL-58860 mod_lesson: Fix get_attempts_overview for no attempts
...
WS get_attempts_overview was failing when there weren’t attempts in the
given assignment.
2017-05-09 10:03:39 +02:00
15fbd9057e
MDL-58841 mod_assign: Style "view all" link on grading summary
2017-05-09 15:04:55 +08:00
8a9785a036
MDL-58843 core: Do not expect a particular class of the thrown exception
...
Since PHP 7, the custom exception handlers are also called to handle
thrown Errors which are not Exceptions.
2017-05-09 08:41:41 +02:00
381db2fe8d
Merge branch 'MDL-58822-master' of git://github.com/ryanwyllie/moodle
2017-05-09 13:55:20 +08:00
9e452e35d0
MDL-58822 backup: backup and restore user override events
2017-05-09 05:48:40 +00:00
b5c24c99a0
MDL-58780 mod_assign: Remove AS keyword in table alias
...
* The AS keyword is not recognised by Oracle for table aliases.
This is okay with other databases, but optional, so better to
remove it.
2017-05-09 11:58:00 +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
7b14c50bb0
MDL-58784 mod_glossary: student can see his entries before approval
2017-05-08 11:35:29 +08:00
42a123b1b7
Merge branch 'MDL-58796-master' of git://github.com/lameze/moodle
2017-05-05 12:01:06 +08:00
609a10739d
MDL-58259 mod_forum: Check create attachment cap in forum_add_attachment
...
We should add the permission check there because this function is used
indirectly by the external API that is not checking for this capability.
2017-05-05 10:28:11 +08:00
fbc15bb977
Merge branch 'MDL-55371-master' of git://github.com/jleyva/moodle
2017-05-05 09:57:40 +08:00
da60573291
MDL-58772 behat: change step to 3.2 and up alternative
2017-05-05 00:14:31 +02:00
396395b8d3
MDL-55371 mod_assign: Do not return empty users in get_participant WS
...
The WS was returning null users making the WS to fail.
2017-05-04 10:09:35 +02:00
1e324a4a88
Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle
2017-05-04 14:45:08 +08:00
84d4411b01
MDL-58796 mod_quiz: add handling for fontawesome icons
2017-05-04 13:51:14 +08:00
2e3c23b25f
Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle
2017-05-04 11:42:38 +08:00
Dan Poltawski