mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-16 13:40:15 +01:00
Code Issues Projects Releases Wiki Activity
77,058 Commits 36 Branches 527 Tags
Commit Graph

21221 Commits

Author SHA1 Message Date
Dan Poltawski
e1a478c5f4 Merge branch 'MDL-49620_availability_settings' of git://github.com/synergylearning/moodle 2016-02-09 10:34:14 +00: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
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
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)
ba8491ae3f Merge branch 'MDL-52983' of git://github.com/aolley/moodle 2016-02-08 13:05:30 +01: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
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
7a662077f1 Merge branch 'MDL-51723-master' of git://github.com/andrewnicols/moodle 2016-02-08 09:02:41 +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
Damyon Wiese
e7c71c189b MDL-48634 grades: Make the rescaling option required if maxgrade changes 2016-02-05 18:20:17 +08:00
Damyon Wiese
d629c601c5 MDL-48634 grades: Add an option to rescale when changing the maxgrade 2016-02-05 18:20:17 +08:00
David Monllao
44841ca911 MDL-52958 medialib: Allow vimeo fullscreen using links 
All credit to Henrik Sune Pedersen.
 2016-02-05 10:15:08 +08:00
Matteo Scaramuccia
074b3dcecc MDL-52637 mail: Disabled automatic TLS encryption. 2016-02-04 21:16:23 +01:00
Davo Smith
6badbf0135 MDL-49620 availability: plugins can have global settings 2016-02-04 15:21:02 +00:00
sam marshall
f66da45fa5 MDL-52996 Atto: Allow plugins to customise toolbar 2016-02-04 12:42:27 +00:00
sam marshall
6bd871d3dd MDL-52981 Unit tests: Reset global after test 2016-02-03 10:25:27 +00: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
David Monllao
6d18da567d Merge branch 'MDL-52899' of git://github.com/timhunt/moodle 2016-02-03 13:44:41 +08:00
Adrian Greeve
a2161d57a4 MDL-52715 lib: Clean up of comments and variable names. 2016-02-03 10:07:08 +08:00
David Monllao
52ad3afadb Merge branch 'wip-MDL-51283-master' of git://github.com/marinaglancy/moodle 2016-02-02 17:40:39 +08:00
Marina Glancy
4be9c7ad99 MDL-51283 core_tag: Allow each tag area to set 'showstandard' 2016-02-02 17:31:17 +08:00
Marina Glancy
e11d7380c2 MDL-51283 core_tag: change tagtype to isstandard 
Change 'official' to 'standard' in UI
 2016-02-02 17:31:14 +08:00
David Monllao
367cf39985 Merge branch 'MDL-52873-master-modgradeid' of git://github.com/mudrd8mz/moodle 2016-02-02 12:12:03 +08:00
Dan Poltawski
b0e7075214 Merge branch 'wip-mdl-52932-m' of https://github.com/rajeshtaneja/moodle 2016-02-01 10:27:28 +00:00
David Monllao
d23bf21b0a MDL-52715 js: Merge M.str and clean memory 2016-02-01 14:29:09 +08:00
David Monllao
0b39d21ae7 MDL-52715 ws: Fragments WS using fragment requires properly. 2016-02-01 14:29:09 +08:00
Adrian Greeve
cc73ea075e MDL-52715 lib: Addition of new requirements class. 
This adds a fragment requirements class to allow plugins
to register JavaScript to be used in an mform.
 2016-02-01 14:29:09 +08:00
David Monllao
1dea567d6e Merge branch 'MDL-52261_master_file_not_found' of git://github.com/BenKelada/moodle 2016-02-01 13:55:57 +08:00
David Monllao
cd55c6e249 Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle 2016-02-01 13:46:18 +08:00
David Monllao
b831527ce8 Merge branch 'MDL-52831-master-emptynames' of git://github.com/mudrd8mz/moodle 2016-02-01 11:28:40 +08:00
Andrew Nicols
abedeb8c70 MDL-51723 ldap: Normalise the user objectclass 2016-02-01 10:24:34 +08:00
Mark Johnson
a2497e5036 MDL-52913 behat: Abort database transactions on exception. 2016-01-29 11:54:56 +00:00
David Monllao
ed654d4aa8 MDL-35590 block_navigation: Set attribute on node creation 
Otherwise we would need to unescape href and title.
 2016-01-29 13:01:26 +08:00
Rajesh Taneja
5e48383330 MDL-52932 behat: Restart session if it fails because of some reason 2016-01-29 11:59:01 +08:00
John Okely
a057ba5924 MDL-35590 navigation: Remove link from admin node if you have javascript 
Also:
* In behat, ensure nav node exists before checking attribute (Credit to
  Rajesh Taneja)
* Remove some unused JS constants
* Fix debugging notice for users without settings block
 2016-01-29 11:28:08 +08:00
David Monllao
4bed1fcc7e Merge branch 'MDL-35590-fixes' of git://github.com/ryanwyllie/moodle 2016-01-29 10:15:27 +08:00
Andrew Nicols
ca29dd4e84 Merge branch 'MDL-52825_master-fix' of git://github.com/dmonllao/moodle 2016-01-29 10:15:26 +08:00
Ryan Wyllie
5697de1832 MDL-35590 block_navigation: fix keyboard nav 
Fixed up the left/right keyboard navigation to match
the aria specification. Also stopped the root node from
being collapsible.
 2016-01-29 10:15:26 +08:00
David Monllao
90902953a8 MDL-52825 atto: Listen to gesturemovestart to discard some events 2016-01-29 10:15:26 +08:00
Rajesh Taneja
80f37f2739 MDL-35590 behat: Data-loaded is on li node 2016-01-29 10:15:25 +08:00
David Monllao
3e51b0ad7e MDL-52826 forms: Using id attr 
Switch from custom id references to the element's id attribute.

Extra fix to get rid of an unnecessary call to getValidationScript().
 2016-01-29 10:15:25 +08:00
Eloy Lafuente (stronk7)
3c415f13b8 Merge branch 'MDL-29817' of https://github.com/rushi963/moodle 2016-01-29 10:15:24 +08:00
Eloy Lafuente (stronk7)
6e38f41d8e MDL-52567 Core: amend existing test to new counting rules 2016-01-29 10:15:24 +08:00
Eloy Lafuente (stronk7)
bc269f6782 Merge branch 'MDL-52567_master' of https://github.com/nadavkav/moodle 2016-01-29 10:15:23 +08:00
Eloy Lafuente (stronk7)
aeba2257f4 Merge branch 'MDL-52780-mailoriginscript' of https://github.com/brendanheywood/moodle 2016-01-29 10:15:20 +08:00
Dan Poltawski
e23c76d72e Merge branch 'MDL-52826_master' of git://github.com/dmonllao/moodle 2016-01-29 10:15:18 +08:00
Dan Poltawski
1d1c8f6275 Merge branch 'MDL-51702_master' of git://github.com/dmonllao/moodle 2016-01-29 10:15:18 +08:00
Dan Poltawski
760b0a17f1 Merge branch 'MDL-52825_master' of git://github.com/dmonllao/moodle 2016-01-29 10:15:17 +08:00
David Monllao
0e5458f45f Merge branch 'wip-mdl-52799' of git://github.com/rajeshtaneja/moodle 2016-01-29 10:15:16 +08:00