mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 09:30:17 +01:00
Code Issues Projects Releases Wiki Activity
86,692 Commits 36 Branches 527 Tags
Commit Graph

86692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Okely
4b501ec96b MDL-42834 admin: Deprecate https_required and verify_https_required 2017-10-23 12:25:35 +08:00
John Okely
b58764ff99 MDL-42834 admin: Remove loginhttps 2017-10-23 12:25:35 +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
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
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