mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
76,865 Commits 36 Branches 519 Tags
Commit Graph

76865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
cdc5f9785b MDL-51802 core: new template for quick editing a title 
convert editing tag name to use new template
 2016-02-13 11:07:42 +08:00
David Monllao
2f45a11ac4 weekly release 3.1dev 2016-02-11 13:58:46 +08:00
David Monllao
0e1c750c56 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-02-11 13:58:42 +08:00
Rajesh Taneja
cd6e7e0da0 MDL-51306 mod_folder: Use context_module to find details 
renderable should not be used for extracting
details. Use cm to get context and dir information
 2016-02-10 15:51:31 +08:00
Andrew Nicols
985dca606f MDL-52930 forum: Fix random test failure caused by passing of time 2016-02-10 12:24:09 +08:00
David Monllao
c63801675a Merge branch 'MDL-52766-master-mnet-url-length' of git://github.com/mudrd8mz/moodle 2016-02-10 08:55:04 +08:00
AMOS bot
11a003967e Automatically generated installer lang files 2016-02-10 00:03:56 +08:00
Eloy Lafuente (stronk7)
d9b3898e5d Merge branch 'MDL-52896-master-apd' of git://github.com/mudrd8mz/moodle 2016-02-09 12:08:40 +01:00
Dan Poltawski
e1a478c5f4 Merge branch 'MDL-49620_availability_settings' of git://github.com/synergylearning/moodle 2016-02-09 10:34:14 +00:00
David Monllao
098650d8e2 Merge branch 'MDL-52930-master' of git://github.com/andrewnicols/moodle 2016-02-09 18:06:10 +08:00
Brendan Heywood
eca8cf67dc MDL-52818 core: Added CFG->divertallemailsexcept config option 
When $CFG->divertallemailsto is specified, this allows a list of email
or domain exceptions to be whitelisted enabling easier testing by groups
of testers who don't share a single email address.
 2016-02-09 09:59:20 +00:00
Dan Poltawski
37f77a1b37 Merge branch 'MDL-52895-master' of git://github.com/jleyva/moodle 2016-02-09 09:43:21 +00:00
David Monllao
ba4fd381e0 Merge branch 'MDL-52902-master' of git://github.com/jleyva/moodle 2016-02-09 16:36:57 +08:00
David Monllao
f79dd94b59 Merge branch 'MDL-52927' of https://github.com/mkassaei/moodle 2016-02-09 16:36:57 +08:00
David Monllao
332fb30a8d Merge branch 'MDL-51818_M30' of git://github.com/lazydaisy/moodle 2016-02-09 12:24:24 +08:00
Eloy Lafuente (stronk7)
ba4eaf0a34 Merge branch 'wip-mdl-52949' of https://github.com/rajeshtaneja/moodle 2016-02-09 02:30:07 +01:00
Eloy Lafuente (stronk7)
53c19e0022 Merge branch 'MDL-52339-master' of git://github.com/andrewnicols/moodle 2016-02-09 00:45:19 +01:00
Eloy Lafuente (stronk7)
de0a98f8ef Merge branch 'MDL-52938-master' of git://github.com/marinaglancy/moodle 2016-02-09 00:30:02 +01:00
Eloy Lafuente (stronk7)
f5e0cb117a Merge branch 'MDL-52975-master-mnet-context' of git://github.com/mudrd8mz/moodle 2016-02-08 22:57:45 +01:00
Eloy Lafuente (stronk7)
40e85f3cd8 Merge branch 'MDL-52981-master' of https://github.com/sammarshallou/moodle 2016-02-08 22:55:07 +01:00
Eloy Lafuente (stronk7)
1274fd8316 Merge branch 'MDL-51075_master' of git://github.com/dmonllao/moodle 2016-02-08 22:44:47 +01:00
Eloy Lafuente (stronk7)
9d128ebda1 Merge branch 'MDL-50310-master-random-glossary' of git://github.com/mudrd8mz/moodle 2016-02-08 22:34:07 +01:00
Dan Poltawski
a4391b76ee Merge branch 'MDL-48778-master' of git://github.com/lameze/moodle 2016-02-08 17:13:02 +00:00
Eloy Lafuente (stronk7)
ba8491ae3f Merge branch 'MDL-52983' of git://github.com/aolley/moodle 2016-02-08 13:05:30 +01:00
David Monllao
04b3c78da4 Merge branch 'MDL-50115-master' of git://github.com/danpoltawski/moodle 2016-02-08 14:10:39 +08:00
David Monllao
4af9a8bfd3 Merge branch 'm31_MDL-52637_Disable_Automatically_Enabling_TLS_Encryption' of https://github.com/scara/moodle 2016-02-08 13:47:06 +08:00
Simey Lameze
2b10cf43d1 MDL-48778 mod_assign: behat tests for group submission 2016-02-08 12:58:41 +08:00
Adam Olley
15c9a9d726 MDL-52983 excel output: avoid single quote on end of sheet name 
This change resolves a problem where a long sheet name, which gets
trimmed down with substr($name, 0, 31), could result in a sheet name
with a single quote on the end because the quote removal was done before
the substr.
 2016-02-08 15:17:02 +10:30
David Monllao
502648e3a6 Merge branch 'MDL-51306' of https://github.com/andrewhancox/moodle 2016-02-08 11:23:34 +08:00
Eric Merrill
002864cc37 MDL-48778 assign: Use proper latest attempt for quickgrading prechecks 
The code that stored lastmodified in gradingtable used a different
method to produce it than the processor used to generate the check
value. Fix that and also check that the attempt number has not changed.
 2016-02-08 10:34:24 +08:00
David Monllao
7a662077f1 Merge branch 'MDL-51723-master' of git://github.com/andrewnicols/moodle 2016-02-08 09:02:41 +08:00
Andrew Nicols
0099960560 MDL-44087 mod_forum: Move forum digest to new processor 2016-02-08 07:54:14 +08:00
AMOS bot
d821e79f87 Automatically generated installer lang files 2016-02-06 00:03:58 +08:00
Andrew Nicols
d6ffb0277a MDL-52930 mod_forum: Add get_unmailed_posts tests 2016-02-05 14:33:17 +08:00
Josh Marshall
86a77c9195 MDL-52930 forum: Correct get_unmailed_posts logic 2016-02-05 14:33:17 +08:00
David Monllao
d1fba0f4f5 MDL-51075 filter_glossary: Fix popup position when no popups 
Thanks to Andrew Nicols for cleaning my eyes.
 2016-02-05 09:18:06 +08:00
Andrew Nicols
650c0086f9 MDL-52339 question: Fix question attempt removal for MySQL 
Derived table support was altered in MySQL 5.7 changing the way in which
DELETE FROM works in some cases.

This change modifies the way in which deletion occurs by selecting all IDs
and batching them into groups of 1000.
 2016-02-05 09:10:09 +08:00
David Mudrák
32fc1a69a5 MDL-50310 glossary: Fix restore of random glossary entry block 
When restoring the random glossary entry block, we need to check that
the associated glossary has also been included in the backup and is
being restored. If not, we must invalidate the block configuration.

Before this patch, the block configuration was not invalidated.

Additionally, as a result of MDL-20131, the block configuration also
contains the course id of the associated glossary (which by the way does
not seem to be a wise choice, but I may be missing something). So we
need to remap this course id as well to avoid mismatch.
 2016-02-05 00:08:39 +01:00
Matteo Scaramuccia
074b3dcecc MDL-52637 mail: Disabled automatic TLS encryption. 2016-02-04 21:16:23 +01:00
David Mudrák
1ef135e773 MDL-52975 mnet: Set system context on the MNet SSO landing page 
Without the context being explicitly set, debugging warning can be
displayed in certain rare situations.
 2016-02-04 17:14:30 +01:00
David Mudrák
511f8c46b7 MDL-52766 mnet: Support MNet peer URLs longer than 64 characters 
The commonName in SSL certificate is limited to 64 characters as per
RFC 5280 (https://www.ietf.org/rfc/rfc5280.txt). We respect that limit
when generating the CN attribute from the site's $CFG->wwwroot. But then
we did not respect it when comparing the common name with the peer's
URL so the certificate was not considered valid.
 2016-02-04 17:08:21 +01:00
Davo Smith
6badbf0135 MDL-49620 availability: plugins can have global settings 2016-02-04 15:21:02 +00:00
Dan Poltawski
00cceb7fba MDL-50115 grunt: provide a --root option to set base path 
Windows users are not able to run grunt on a subpath due to platform
restrictions. So we provide this option to provide a workaround for that.

Thanks to Ty Delean who proposed this idea.
 2016-02-04 12:03:53 +00:00
M Kassaei
a752c61cb4 MDL-52927 qtype ddwtos and ddimageortext focus using keyboard 2016-02-04 10:30:50 +00:00
David Monllao
9d5d9c64ff weekly release 3.1dev 2016-02-04 14:30:03 +08:00
David Monllao
e8074790d9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-02-04 14:30:00 +08:00
AMOS bot
37f0cb879e Automatically generated installer lang files 2016-02-04 00:04:08 +08:00
sam marshall
6bd871d3dd MDL-52981 Unit tests: Reset global after test 2016-02-03 10:25:27 +00:00
Juan Leyva
0bf6c0bebe MDL-52895 webservice: Fix capability checks 2016-02-03 10:57:07 +01:00
Dan Poltawski
96c69429e5 Merge branch 'wip-MDL-52715-master-additional' of git://github.com/abgreeve/moodle 2016-02-03 09:44:27 +00:00