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,721 Commits 36 Branches 519 Tags
Commit Graph

84721 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
b1846b8a17 Merge branch 'MDL-50632-master' of git://github.com/ankitagarwal/moodle 2017-05-30 09:55:34 +01:00
Jun Pataleta
e083ac1cde MDL-54887 calendar: PR fixes 
* Use the calendar_event::description property and format it using
format_text() on it in order to apply the appropriate filters.
* Then use html_to_text() on it to strip the tags and convert the
description to plain text while converting <br> and <p> tags to
line breaks.
 2017-05-30 16:52:12 +08:00
Soon-Systems
231ddd5a8d MDL-54887 calendar: Format summary + description of an event for export 2017-05-30 16:32:36 +08:00
Eloy Lafuente (stronk7)
6308dad828 MDL-59075 behat: Update master to use 3.34.0 behat extension tag 2017-05-30 09:45:40 +02:00
Dan Poltawski
c744efe5bc Merge branch 'MDL-59014-master' of git://github.com/junpataleta/moodle 2017-05-30 08:31:47 +01:00
Mark Nelson
9bd705e3dd MDL-59086 gradereport_grader: style 'Save changes' button 2017-05-30 13:43:37 +08:00
Jake Dallimore
a142f6dc59 Merge branch 'MDL-44905' of https://github.com/anieminen/moodle 2017-05-30 09:32:03 +08:00
Arto Nieminen
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
David Mudrák
017d0bc199 MDL-57313 boost: Fix the CLI utility import-bootswatch.php 2017-05-26 09:52:18 +02:00
Dan Poltawski
9e7afbbc6c weekly release 3.4dev 2017-05-24 19:14:39 +01:00
Dan Poltawski
e543846602 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-24 19:14:37 +01:00
Ankit Agarwal
8130352f5a MDL-50632 filters: Final deprecation of apis deprecated in 3.0 2017-05-24 12:44:27 +05:30
Andrew Nicols
44dd6d95e2 Merge branch 'MDL-59011-master' of git://github.com/ankitagarwal/moodle 2017-05-24 14:18:34 +08:00
Damyon Wiese
d4d414694a MDL-58318 setuplib: Redirect on https mismatch 
When the wwwroot indicates https support and a page is accessed over http,
redirect to the wwwroot. This is a better experience than displaying an error.
 2017-05-24 13:42:34 +08:00
Ankit Agarwal
23cef8753b MDL-59011 restore: Check for userride only for activity events 2017-05-24 09:58:46 +05:30
Andrew Nicols
4680221da4 MDL-58577 stats: Correct groupby when getting report options 2017-05-23 19:40:37 +08:00
Andrew Nicols
1c74ec835b Merge branch 'MDL-58577-statistics-report-header-multilang' of https://github.com/lucaboesch/moodle 2017-05-23 19:36:05 +08:00
David Mudrák
97cc7e0969 MDL-59012 auth_oauth2: Do not escape URL in plain text emails 2017-05-23 13:28:27 +02:00
Jun Pataleta
382ac14d1d MDL-59014 calendar: Unescape event URL for the mini calendar 2017-05-23 17:20:31 +08:00
Luca Bösch
2ee4c6cd73 MDL-58577 stats: Use multilang with role in header 2017-05-23 11:07:51 +02:00
Jun Pataleta
986e5eb7ee Merge branch 'MDL-58895-master' of git://github.com/ankitagarwal/moodle 2017-05-23 16:53:00 +08:00
Jake Dallimore
e013a69fde Merge branch 'MDL-58921-calculated-question-name-multilang' of https://github.com/lucaboesch/moodle 2017-05-23 16:25:27 +08:00
Jun Pataleta
5d13738a82 Merge branch 'MDL-58165-master' of https://github.com/abias/moodle 2017-05-23 14:41:42 +08:00
Alexander Bias
27456a6422 MDL-58165 navigation: Add node key to private files navigation node 2017-05-23 07:20:27 +02:00
Ankit Agarwal
09028f32c8 MDL-58895 groups: Add bootstrap classes to buttons 2017-05-23 10:47:42 +05:30
Josh Ebarvia
f0242b4d95 MDL-49040 gradereport_grader: Fix feedback truncation after & char 2017-05-23 13:05:00 +09:30
AMOS bot
32124b0010 Automatically generated installer lang files 2017-05-23 00:05:26 +08:00
Dan Poltawski
976e29a17d Merge branch 'MDL-58922-calculatedmulti-question-name-multilang' of https://github.com/lucaboesch/moodle 2017-05-22 10:46:47 +01:00
Luca Bösch
f378fafd3b MDL-58921 questions: Calculated question name passing multilang. 
In edit calculated question the question name does pass format_string to process multilang tags.
 2017-05-22 11:36:23 +02:00
Luca Bösch
11252bde86 MDL-58922 questions: Calculatedmulti question name passing multilang. 
In edit calculatedmulti question the question name does pass format_string to process multilang tags.
 2017-05-22 11:31:49 +02:00
David Monllao
13a1e8b50c Merge branch 'master-MDL-56973' of https://github.com/fwsl/moodle 2017-05-22 15:13:58 +08:00
Jake Dallimore
da2959fe9c Merge branch 'MDL-56617-course-cbm-grade-to-pass' of https://github.com/lucaboesch/moodle 2017-05-22 14:31:37 +08:00
Jun Pataleta
aec421153e Merge branch 'MDL-58933' of git://github.com/stronk7/moodle 2017-05-22 14:12:36 +08:00
David Monllao
52ab8b2c16 Merge branch 'MDL-58986_master' of git://github.com/markn86/moodle 2017-05-22 12:21:11 +08:00
Jun Pataleta
905ceff28a Merge branch 'MDL-58966-master' of git://github.com/danpoltawski/moodle 2017-05-22 10:47:31 +08:00
David Monllao
a5906ac944 Merge branch 'MDL-57957' of https://github.com/bostelm/moodle 2017-05-22 10:41:46 +08:00
AMOS bot
a607c1fcb0 Automatically generated installer lang files 2017-05-21 00:04:03 +08: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
Luca Bösch
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
Grzegorz Ziółek
2e241fea56 MDL-56973 wiki: New page title readonly after changing course language 2017-05-19 11:12:55 +02:00
Cameron Ball
919b5c95e6
MDL-58994 core_calendar: Coalesce event sort field 
There are situations where we need to sort events on a field called
"timesort", but sometimes it is not set. So we can fall back to
"timestart" in this case.
 2017-05-19 15:08:05 +08:00
David Monllao
590292d48e weekly on-sync release 3.4dev 2017-05-19 13:11:14 +08:00
David Monllao
ead7725c8e Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-05-19 13:11:12 +08:00
Andres
373d7d3f28 MDL-46322 mod_assign: Only list enrolled graders as potential markers 2017-05-18 21:58:24 -05:00
Dan Poltawski
b7d26eb3d2 MDL-58966 completion: improve dashboard string 2017-05-18 10:15:08 +01:00
Mark Nelson
f3dc7a171a MDL-58986 mod_quiz: add CSS classes to buttons on comment page 2017-05-18 16:49:25 +08:00
Ankit Agarwal
fce1d7deb8 MDL-50266 mod_forum: Remove strings deprecated in 3.0 2017-05-18 11:17:13 +05:30
Ankit Agarwal
420617061d MDL-50266 block_tags: Remove strings deprecated in 3.0 2017-05-18 11:17:13 +05:30
Ankit Agarwal
715d6ba5f7 MDL-50266 core: Remove strings deprecated in 3.0 2017-05-18 11:17:13 +05:30
Ankit Agarwal
aa951785e0 MDL-50266 lesson: Remove strings deprecated in 3.0 2017-05-18 08:34:33 +05:30