mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 05:00:06 +01:00
Code Issues Projects Releases Wiki Activity
76,886 Commits 36 Branches 523 Tags
Commit Graph

76886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
c1184f6cc2 Merge branch 'wip_MDL-53029_master' of git://github.com/gjb2048/moodle 2016-02-15 11:07:38 +00:00
Dan Poltawski
220f8115d9 Merge branch 'MDL-44626-master' of git://github.com/andrewnicols/moodle 2016-02-15 10:36:20 +00:00
David Monllao
e8ba34ac89 Merge branch 'wip-MDL-52566-master' of https://github.com/cdsmith-umn/moodle 2016-02-15 15:17:13 +08:00
David Monllao
6cc1c06236 Merge branch 'MDL-49807-master' of git://github.com/marinaglancy/moodle 2016-02-15 15:11:09 +08:00
David Monllao
3738d1b60b MDL-52249 css: Recompile CSS 2016-02-15 14:20:02 +08:00
David Monllao
61c2a0804b Merge branch 'MDL-52249-master' of git://github.com/andrewnicols/moodle 2016-02-15 14:19:17 +08:00
David Monllao
85dc424a7c Merge branch 'MDL-48634_master' of git://github.com/markn86/moodle 2016-02-15 12:20:59 +08:00
Andrew Nicols
75debb4dbb MDL-47365 mod_forum: Add permalink to forum posts 2016-02-12 08:03:01 +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
Andrew Nicols
6f0768618a MDL-44626 files: Show the PHP max upload size instead of 'unlimited' 
Even when a user has the appropriate capability to upload any sized files,
they are still restricted to the PHP post_max_size, and upload_max_filesize
values.

Rather than showing a value of "Unlimited', we should always restrict to
this value.
 2016-02-11 10:55:54 +08:00
Andrew Nicols
658a922fa6 MDL-44626 repository: Correct error message when uploading large files 2016-02-11 08:08:57 +08:00
Gareth J Barnard
6eaa3230ba MDL-53029 mod_book: Hidden chapter has markup in alt and title attrs. 2016-02-10 18:10:24 +00: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
Marina Glancy
3d89ccb374 MDL-49807 mod_wiki: minimum heading level should always be <h3> 2016-02-09 17:48:39 +08:00
Mark Nelson
a3dd8be7dc MDL-48634 core: changes to automated tests to pass with changes 2016-02-09 17:46:43 +08:00
Mark Nelson
5af1321b41 MDL-48634 core_grades: added behat test for grade items form validation 2016-02-09 17:46:42 +08:00
Mark Nelson
1b8bd51c06 MDL-48634 core_form: added behat test for 'modgrade' validation 2016-02-09 17:46:42 +08:00
Mark Nelson
664d8be7ea MDL-48634 core: prevent change of grade values when necessary 
Three additional checks have been added.

Once grades have been recorded for the activity/grade item -

1) Do not allow the grade type to be changed.
2) Do not allow the scale to be changed.
3) If we are using ratings do not allow the 'Maximum points'
value to be changed.

Also reordered form elements, removed form elements that
were not necessary, added and changed existing language
strings to improve the overall UI.
 2016-02-09 17:46:42 +08: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
Andrew Nicols
14cfe26f49 MDL-52249 theme_bootstrapbase: Remove dropdown-backdrop 
Standard bootstrap adds a backdrop for touch-responsive clients.
Unfortunately the backdrop is not compatible with submenus.

The backdrop was only added in Bootstrap v2.3.1, and Moodle switched to
using the bootstrap JS in version 3.0.0.
 2016-02-08 14:44:39 +08: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
Damyon Wiese
3c4cf9f02b MDL-48634 grades: Remove hardcoded hack in grade book 
This was testing specifically for mod_assign - now we can test to see if
an activity provides it's own rescaling function.
 2016-02-05 18:20:17 +08:00