moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
86935 commits 37 branches 540 tags 1.3 GiB
Commit graph

86935 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
7c31ef2a27 Merge branch 'wip-MDL-58915-master' of git://github.com/marinaglancy/moodle 2017-10-19 15:44:07 +02:00
David Monllao
f2732541e8 Merge branch 'MDL-60444-master' of git://github.com/andrewnicols/moodle 2017-10-19 15:41:56 +02:00
David Monllao
43b8618b40 Merge branch 'MDL-60179_master' of git://github.com/markn86/moodle 2017-10-19 15:26:27 +02:00
David Monllao
23892d0843 Merge branch 'MDL-60378-master' of git://github.com/jleyva/moodle 2017-10-19 14:06:26 +02:00
David Monllao
eef0ce917b Merge branch 'MDL-60233-master' of git://github.com/jleyva/moodle 2017-10-19 13:49:23 +02:00
David Monllao
254c19e26f Merge branch 'MDL-60182_master' of https://github.com/nadavkav/moodle 2017-10-19 13:29:52 +02:00
Jun Pataleta
b469834ac9 Merge branch 'MDL-60375_master' of git://github.com/dmonllao/moodle 2017-10-19 22:03:56 +13:00
Jun Pataleta
a0245c6aa0 Merge branch 'MDL-60410_master' of git://github.com/dmonllao/moodle 2017-10-19 22:01:21 +13:00
David Monllao
0a1a56307b Merge branch 'MDL-60469-master' of git://github.com/andrewnicols/moodle 2017-10-19 10:51:59 +02:00
David Monllao
a0b417da49 MDL-60247 block_glossary_random: Skip rendundant value assign 2017-10-19 10:36:25 +02:00
David Monllao
d07a4f9872 Merge branch 'MDL-60247-multilang-html-glossary-block-titles' of https://github.com/lucaboesch/moodle 2017-10-19 10:31:08 +02:00
David Monllao
28a5791db4 Merge branch 'MDL-60153-master' of git://github.com/junpataleta/moodle 2017-10-19 10:18:23 +02:00
Eloy Lafuente (stronk7)
059079e945 MDL-36580 backup: Apply the decrypt() method to lti "secrets" 2017-10-19 10:11:47 +02:00
Eloy Lafuente (stronk7)
00e557a15d MDL-36580 backup: General support for decrypted contents in restore 
- Uses site generated (on backup) key.
- Can be applied potentially everywhere in the restore process.
- Covered with unit tests.
- Authentication / integrity aware so can be used between any 2 servers
  (just requires matching key).
 2017-10-19 10:11:47 +02:00
Eloy Lafuente (stronk7)
4a7afd2bb9 MDL-36580 backup: Use the encrypted_final_element for lti "secrets" 2017-10-19 10:11:47 +02:00
Eloy Lafuente (stronk7)
872e957415 MDL-36580 backup: General support for encrypted contents in backups 
- Built using standard backup custom fields.
- Can be applied potentially everywhere.
- Automatically addded 'encrypted' attribute.
- Defaults to site generated key.
- Enforces key robutness / provides authentication (hmac integrity)
- Covered with unit tests.
 2017-10-19 10:11:39 +02:00
David Monllao
b6b299ddae Merge branch 'wip-MDL-60108-master' of git://github.com/marinaglancy/moodle 2017-10-19 09:12:34 +02:00
David Monllao
c1c7cb9c42 Merge branch 'MDL-60175-master' of git://github.com/andrewnicols/moodle 2017-10-19 09:07:05 +02:00
Damyon Wiese
b233630c93 MDL-52653 scorm: Comment for cms.completion_status 2017-10-19 14:58:07 +08:00
Christian Lawson-Perfect
5d1ad088ea MDL-52653 SCORM: fix scorm_check_mode on v1.3 
SCORM 2004 uses the element 'cmi.completion_status' to store the
completion status of a SCO, not 'cmi.core.lesson_status'.

This amends scorm_check_mode so that the right element is looked up.

When scorm_version_check returns false, SCORM 1.2 is assumed.
 2017-10-19 14:58:07 +08:00
Mark Nelson
af835c24b2 MDL-60179 core: make it clear what enrolment instance is being edited 2017-10-19 14:57:23 +08:00
David Monllao
28c97d1b76 MDL-60375 analytics: Fix incorrect var reference 2017-10-19 08:48:11 +02:00
Andrew Nicols
a0d3a28abb Merge branch 'wip-MDL-60211-master' of https://github.com/Beedell/moodle 2017-10-19 14:22:30 +08:00
Damyon Wiese
ecb9c82b06 MDL-60456 javascript: Rebuild npm-shrinkwrap 
Build npm-shrinkwrap with the latest node version and only test the latest node version on travis.
 2017-10-19 13:16:52 +08:00
Damyon Wiese
022dccf2a7 Merge branch 'MDL-60001_gzopen' of https://github.com/mrmark/moodle 2017-10-19 13:00:13 +08:00
Damyon Wiese
4a21bf89c9 MDL-58388 course: bump version 
Add a version bump for new admin setting
 2017-10-19 12:54:27 +08:00
Damyon Wiese
96f1440b7a Merge branch 'MDL-58388-master' of https://github.com/abias/moodle 2017-10-19 12:47:18 +08:00
Andrew Nicols
f9095b66f2 Merge branch 'MDL-60319-master-google-converter-bug' of https://github.com/mspall/moodle 2017-10-19 11:27:42 +08:00
Adrian Greeve
749af21bd4 MDL-60485 modgrade: Update to mod settings form. 
The message for changing the max grade in the module form
was inaccurate for modules that can not rescale.
 2017-10-19 10:42:02 +08:00
Jun Pataleta
ebc993b8c5 Merge branch 'wip-MDL-60335-master' of git://github.com/marinaglancy/moodle 2017-10-19 15:39:56 +13:00
Andrew Nicols
de316e8e3b MDL-60469 behat: Replace I press with I click on 2017-10-19 10:37:59 +08:00
Andrew Nicols
fd5e793cce Merge branch 'MDL-60468-master' of git://github.com/lameze/moodle 2017-10-19 10:23:57 +08:00
Jun Pataleta
4ee428fbe2 Merge branch 'MDL-60372-master' of git://github.com/lameze/moodle 2017-10-19 15:20:39 +13:00
Simey Lameze
28b77ce6c7 MDL-60372 pix: add new icons for event types 2017-10-19 09:22:41 +08:00
Simey Lameze
cbc6794d02 MDL-60372 calendar: fix font awesome event type icons 2017-10-19 09:06:25 +08:00
Andrew Nicols
ff7081150b Merge branch 'MDL-59063_master' of git://github.com/dmonllao/moodle 2017-10-19 09:01:58 +08:00
Jun Pataleta
2fbb83f6ad Merge branch 'mdl59843-master' of https://github.com/tlock/moodle 2017-10-19 13:22:01 +13:00
Eloy Lafuente (stronk7)
9644c0e87a on-demand release 3.4dev+ 2017-10-19 00:11:40 +02:00
Eloy Lafuente (stronk7)
d56fa02487 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-10-19 00:11:39 +02:00
David Mudrák
91f015171f MDL-46269 tool_httpsreplace: Fix incorrect sorting 2017-10-18 19:46:26 +02:00
Jake Dallimore
bc22db02fb Merge branch 'MDL-57455_master-fix' of https://github.com/markn86/moodle 2017-10-18 16:36:10 +08:00
Mark Nelson
3dfd48ba9c MDL-57455 mod_data: moved export tag checkbox and set default 
Also capitalised string 'tags'.

AMOS BEGIN
 CPY [tags,core],[tags,mod_data]
AMOS END
 2017-10-18 16:03:17 +08:00
Simey Lameze
05187c589d MDL-60468 calendar: fix event type defaults logic 2017-10-18 15:41:05 +08:00
Andrew Nicols
ffbe92bffb Merge branch 'MDL-59988_master-fix' of git://github.com/dmonllao/moodle 2017-10-18 14:16:12 +08:00
David Monllao
0af2421acd MDL-59988 analytics: Reset trained status on clear 2017-10-18 07:02:23 +02:00
Andrew Nicols
f150071901 Merge branch 'MDL-60022_master' of git://github.com/dmonllao/moodle 2017-10-18 12:36:00 +08:00
Andrew Nicols
a1a39eda7d Merge branch 'MDL-59987_master-fix' of git://github.com/dmonllao/moodle 2017-10-18 11:47:45 +08:00
David Monllao
70dc5e0ab7 MDL-59987 analytics: Language string refinements 
All credit goes to Helen Foster.
 2017-10-18 05:37:07 +02:00
Pat Kira
5a97f26be9 MDL-60342 test: Reset user agent after tests 
- Add a test that proves this useragent is not being reset after a test
- Reset user agent
 2017-10-18 14:03:24 +11:00
Juan Leyva
fe7b3e7e51 MDL-60378 mod_workshop: Add missing dimensions info 
We need additional info from the dimensions used like the scale items
(if used).
 2017-10-17 15:40:39 +02:00