mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-19 07:41:02 +01:00
Code Issues Projects Releases Wiki Activity
88,431 Commits 36 Branches 523 Tags
Commit Graph

88431 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
a845d7d387 Merge branch 'MDL-61895-master' of git://github.com/andrewnicols/moodle 2018-04-11 23:57:46 +02:00
Eloy Lafuente (stronk7)
3b8c9ab2b8 Merge branch 'MDL-61896-master' of git://github.com/andrewnicols/moodle 2018-04-11 23:41:21 +02:00
Eloy Lafuente (stronk7)
74e48d168f Merge branch 'MDL-61859-master' of https://github.com/snake/moodle 2018-04-11 22:27:25 +02:00
Eloy Lafuente (stronk7)
0f0d0004bd Merge branch 'MDL-61208-master-fix' of git://github.com/farhan6318/moodle 2018-04-11 20:13:56 +02:00
Eloy Lafuente (stronk7)
d2706c5e58 Merge branch 'MDL-60940-master-forceclean' of git://github.com/mudrd8mz/moodle 2018-04-11 19:39:01 +02:00
Eloy Lafuente (stronk7)
2d42e6e12c Merge branch 'MDL-61743_master' of git://github.com/dmonllao/moodle 2018-04-11 19:23:01 +02:00
David Monllao
e171dc6dbe Merge branch 'MDL-61873-master' of git://github.com/cescobedo/moodle 2018-04-11 18:41:43 +02:00
David Monllao
a5db58f4f2 Merge branch 'MDL-61198-master' of git://github.com/jleyva/moodle 2018-04-11 18:23:59 +02:00
David Monllao
0ca25fe2a9 Merge branch 'MDL-61581-master' of https://github.com/lucaboesch/moodle 2018-04-11 18:07:09 +02:00
David Monllao
27fef51d48 MDL-55491 badges: Add missing format_string call 
Extra version bump + trailing whitespace removal.
 2018-04-11 17:55:45 +02:00
David Monllao
728b851eb5 Merge branch 'MDL-55491-master' of git://github.com/sarjona/moodle 2018-04-11 17:53:37 +02:00
Eloy Lafuente (stronk7)
8c46d204a1 MDL-60548 tests: Get tests passing 
This includes:

- changing all usernames in feature to lowercase, for cross-db passing. Fixes:
  - user/tests/behat/set_email_display.feature
- ensure that course_enrolment_manager::get_potential_users() and
  external always returns user->maildisplay attribute, so email
  visibility can be calculated by user_get_user_details(). Fixes:
  - enrol/tests/behat/enrol_user.feature
  - blocks/news_items/tests/behat/display_news.feature
  - course/tests/behat/course_creation.feature
 2018-04-11 17:15:38 +02:00
Farhan Karmali
351cff7928 MDL-61208 enrol: Fix for issue found while testing 2018-04-11 18:24:14 +05:30
David Mudrák
4b82c15cdb MDL-60940 weblib: Introduce an ability to force cleaning of all content 
The new configuration flag $CFG->forceclean overrides the noclean
option when calling format_text() so that the text is always
and unconditionally cleaned.
 2018-04-11 10:23:45 +02:00
Jake Dallimore
4af7042e6e Merge branch 'MDL-59691-master' of https://github.com/lucisgit/moodle 2018-04-11 16:01:03 +08:00
Andrew Nicols
2b118a941a Merge branch 'MDL-61208-master' of git://github.com/farhan6318/moodle 2018-04-11 10:52:29 +08:00
Andrew Nicols
8badf71325 Merge branch 'MDL-61881-master' of git://github.com/zig-moodle/moodle 2018-04-11 10:14:03 +08:00
Zig Tan
6f77c09777 MDL-61881 report: fix privacy lang strings 2018-04-11 10:06:51 +08:00
Jake Dallimore
da16e3e3dc Merge branch 'MDL-61255_master' of git://github.com/markn86/moodle 2018-04-11 09:53:14 +08:00
Andrew Nicols
46a13e37a8 Merge branch 'MDL-61731-master' of git://github.com/mihailges/moodle 2018-04-11 09:11:36 +08:00
Mihail Geshoski
2f9bd2bf90 MDL-61731 message_email: Add privacy files and unit tests 2018-04-11 09:03:58 +08:00
Andrew Nicols
4ea006e4da Merge branch 'MDL-61867-master' of git://github.com/mihailges/moodle 2018-04-11 08:51:29 +08:00
Eloy Lafuente (stronk7)
bbe8bb0d02 Merge branch 'MDL-61709-scorm-student-fullnamedisplay' of https://github.com/wjroes/moodle 2018-04-11 01:49:54 +02:00
Eloy Lafuente (stronk7)
a2ac42d40c Merge branch 'MDL-61824-master' of https://github.com/sammarshallou/moodle 2018-04-11 01:02:45 +02:00
Eric Merrill
815c44ce07 MDL-61913 restore: Protect against blocks that aren't being created 2018-04-11 00:50:27 +02:00
Eloy Lafuente (stronk7)
66434106ed MDL-60548 test: Change modified lang string to get tests back to pass 
Also modified a template example use, so there aren't courrencies
of the old string in codebase.
 2018-04-10 23:24:17 +02:00
Eloy Lafuente (stronk7)
2f27dca60d Merge branch 'MDL-60548-master-v4' of https://github.com/Dave-B/moodle 2018-04-10 17:14:46 +02:00
Eloy Lafuente (stronk7)
bd0391d284 Merge branch 'wip-MDL-58697-master-assigngrading' of git://github.com/adamann2/moodle 2018-04-10 15:53:37 +02:00
Kathrin Osswald
64448e1ea9 MDL-61298 theme Boost: Nav drawer icon improvements. 2018-04-10 15:31:12 +02:00
David Monllao
5ba5a5e31d Merge branch 'MDL-61838-master' of git://github.com/mihailges/moodle 2018-04-10 13:44:05 +02:00
David Monllao
8373df9687 Merge branch 'MDL-61843-master' of git://github.com/mihailges/moodle 2018-04-10 13:42:43 +02:00
Dan Marsden
fbfd69a865 MDL-32585 mod_scorm: Improve force new attempts setting. 
AMOS BEGIN
 MOV [forcenewattempt,mod_scorm],[forcenewattempts,mod_scorm]
AMOS END
 2018-04-10 13:38:51 +02:00
Eloy Lafuente (stronk7)
a706fd79a5 MDL-61875 tests: Use existing component & support $CFG->admin 2018-04-10 13:14:34 +02:00
Eloy Lafuente (stronk7)
7aeb85770f Merge branch 'MDL-61875-master' of https://github.com/snake/moodle 2018-04-10 13:03:27 +02:00
Mark Nelson
23de6f3a2d MDL-61255 core_message: add warning when notifications not migrated 2018-04-10 17:28:52 +08:00
Mark Nelson
78348dfc4e MDL-61255 core_message: added helper function to detect legacy messages 2018-04-10 17:28:52 +08:00
Mark Nelson
84f6a716b2 MDL-61255 core_message: migrate data from the 'message_popup' table 2018-04-10 17:26:43 +08:00
Mark Nelson
6f0731adc5 MDL-61255 core_message: adjusted upgrade.txt 2018-04-10 15:17:01 +08:00
Mark Nelson
e78523bff8 MDL-61255 message_popup: change API so it uses new table 2018-04-10 15:17:01 +08:00
Mark Nelson
1f64f17429 MDL-61255 message_popup: add table to store notifications 2018-04-10 15:17:01 +08:00
Mark Nelson
7022b8d9e4 MDL-61255 core_message: add notification when data not migrated 2018-04-10 15:17:01 +08:00
Mark Nelson
5cc6b3eeb5 MDL-61255 core_message: added unit test for task 2018-04-10 15:17:01 +08:00
Mark Nelson
41bc5aa587 MDL-61255 core_message: created task to handle migration of data 2018-04-10 15:17:01 +08:00
David Monllao
d25a8e3c69 Merge branch 'MDL-61846-master' of git://github.com/mihailges/moodle 2018-04-10 08:59:25 +02:00
David Monllao
e7d10540d9 Merge branch 'MDL-61343-master' of git://github.com/Kathrin84/moodle 2018-04-10 08:29:39 +02:00
David Monllao
fd91aab1e7 Merge branch 'MDL-61129-fix-accessibility-on-tables-mod_survey_MASTER' of https://github.com/guillalva06/moodle 2018-04-10 07:57:47 +02:00
Farhan Karmali
fe5b5be1dd MDL-61208 enrol: Standard enrol plugins should use tasks instead of cron 2018-04-10 09:16:17 +05:30
Andrew Nicols
0d900be445 Merge branch 'MDL-61837-master' of git://github.com/lameze/moodle 2018-04-10 11:16:12 +08:00
Andrew Nicols
091a2630a7 Merge branch 'MDL-61795-master' of git://github.com/mihailges/moodle 2018-04-10 10:40:01 +08:00
Mihail Geshoski
9b8822d2a6 MDL-61795 block_rss_client: Add privacy files and unit tests 2018-04-10 09:34:38 +08:00