mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 07:22:39 +02:00
Code Issues Projects Releases Wiki Activity
86,815 Commits 36 Branches 528 Tags
Commit Graph

86815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
01df2313c0 Merge branch 'MDL-60517_master' of git://github.com/dmonllao/moodle 2017-10-23 12:10:04 +08:00
Damyon Wiese
65db838650 Merge branch 'MDL-58605-master' of git://github.com/andrewnicols/moodle 2017-10-23 11:13:32 +08:00
Damyon Wiese
e93112a7ca Merge branch 'wip-MDL-60390-master-full' of git://github.com/marinaglancy/moodle 2017-10-23 11:11:14 +08:00
Marina Glancy
0b821239ea MDL-60390 libraries: annonate horde upgrade to 2.30.2 2017-10-23 10:22:49 +08:00
Marina Glancy
22793af105 MDL-60390 libraries: upgrade horde to 2.30.2 2017-10-23 10:16:54 +08:00
Andrew Nicols
b01232671e Merge branch 'MDL-60388_master' of git://github.com/dmonllao/moodle 2017-10-23 10:00:41 +08:00
Andrew Nicols
345f23c984 MDL-60537 calendar: Fix behat following string changes 2017-10-23 08:26:24 +08:00
Andrew Nicols
d743dd70cc MDL-60537 tool_httpsreplace: Fix behat following langstring 2017-10-23 08:25:55 +08:00
Andrew Nicols
455b2c4b9f MDL-58605 mod_scorm: Simplify feature 
The singlescobasic_missingorg.zip file includes a modified version of
the javascript which deliberately breaks content.

We need it to have different file names to not break other similar copies
of the file.
 2017-10-23 07:56:10 +08:00
Luca Bösch
09dd58a504 MDL-60527 templates: missing spaces round attribute and aria-labelledby 2017-10-22 22:08:10 +01:00
Matteo Scaramuccia
500d8650d2 MDL-59100 dml: Lower the case of INFORMATION_SCHEMA.* fields. 2017-10-21 14:30:38 +02:00
Eloy Lafuente (stronk7)
849405177f on-demand release 3.4dev+ 2017-10-20 23:55:42 +02:00
Eloy Lafuente (stronk7)
b3f41c084d MDL-60485 modgrade: Change string expectation in related test 2017-10-20 18:57:31 +02:00
David Monllao
6e98bca0ba MDL-60388 analytics: Any write action looking at all contexts below course 2017-10-20 13:20:46 +02:00
David Monllao
c17fae4bf8 MDL-60517 mlbackend_python: Use 0.0.4 moodlemlbackend package 
0.0.4 update fixes an incorrectly specified tensorflow dependency
 2017-10-20 11:22:35 +02:00
Marina Glancy
690168cb4a MDL-60108 registration: do not offer registration in behat tests 2017-10-20 14:35:31 +08:00
Jun Pataleta
eed0bc36e1 Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle 2017-10-20 16:49:54 +13:00
Andrew Nicols
fac5051624 MDL-60072 mod_lesson: Add missing name attribute 2017-10-20 11:43:15 +08:00
David Monllao
12514bd573 Merge branch 'wip-MDL-60485-master' of git://github.com/abgreeve/moodle 2017-10-20 04:43:19 +02:00
David Monllao
50a5feff05 Merge branch 'MDL-60406-master' of git://github.com/lameze/moodle 2017-10-20 04:38:06 +02:00
Simey Lameze
5a11e7f5f3 MDL-60406 core_calendar: proper calendar dates calculation 2017-10-20 10:32:41 +08:00
Andrew Nicols
d9b6f810ea Merge branch 'MDL-60456-master' of git://github.com/damyon/moodle 2017-10-20 10:27:20 +08:00
David Monllao
202221f934 Merge branch 'MDL-60123-master' of https://github.com/snake/moodle 2017-10-20 02:22:11 +02:00
Jun Pataleta
f04825d2b1 MDL-60072 course: Apply correct event name for assign due date 2017-10-20 11:35:17 +13:00
Eloy Lafuente (stronk7)
df4095ca6c Merge branch 'MDL-60342-master' of https://github.com/patkira/moodle 2017-10-19 23:23:49 +02:00
Eloy Lafuente (stronk7)
c1321a9a02 Merge branch 'wip-MDL-60314-master' of git://github.com/marinaglancy/moodle 2017-10-19 23:17:26 +02:00
Eloy Lafuente (stronk7)
9b46afd7c3 Merge branch 'wip-MDL-60313-master' of git://github.com/marinaglancy/moodle 2017-10-19 22:48:40 +02:00
Eloy Lafuente (stronk7)
6b7194a7cf Merge branch 'MDL-60072-master' of git://github.com/andrewnicols/moodle 2017-10-19 22:30:08 +02:00
Eloy Lafuente (stronk7)
ecb4a05cc2 Merge branch 'MDL-60449-master-enfix' of git://github.com/mudrd8mz/moodle 2017-10-19 22:20:01 +02:00
David Mudrák
2e86fdb0a2 MDL-60449 lang: Properly replace the generic string with a specific one 
The general string 'Publish' has been used in sense of publishing a
course on a hub - as such, it is better to keep that string together
with other related strings in the core_hub component. All these are
being reworded to 'Share'.

As this has been the only meaning of the string in the core, I am
deprecating it now. Third party plugins should better come with their
own variant of the string, should they need it.
 2017-10-19 17:35:06 +02:00
Helen Foster
89db57ca6d MDL-60449 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* multiple strings in core_hub - 'Publish' changed to 'Share' plus other
  wording improvements to avoid misunderstandings
* errorretrievingkey in message_airnotifier - improved wording and
  removing reference to Moodle.org
* enddate_help and courseduration_desc in core - clearer wording
  explaining what the date actually does
* restore:viewautomatedfilearea in core_role - changing wording to match
  the behaviour
* dropzones_help in qtype_ddmarker - improved wording
* autologinkeygenerationlockout in tool_mobile - updated error message
* configallowemailaddresses in core_admin - clearer description
* subscriptionmode_helpin mod_forum - removing misleading sentence about
  subscription mode changes not affecting existing users
 2017-10-19 17:19:08 +02:00
David Monllao
3c0805b7c0 Merge branch 'master-MDL-60116' of https://github.com/fwsl/moodle 2017-10-19 15:54:23 +02:00
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