76782 Commits

Author SHA1 Message Date
Dan Poltawski
98e01bb70e Merge branch 'MDL-45740_master' of git://github.com/markn86/moodle 2016-02-01 11:02:22 +00:00
Mark Nelson
da82688689 MDL-45740 mod_choice: fixed remaining issues 2016-02-01 18:49:22 +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
Dan Poltawski
c89a009c56 Merge branch 'MDL-52940_master' of git://github.com/markn86/moodle 2016-02-01 09:49:20 +00:00
David Monllao
6b7421003b Merge branch 'MDL-51704-master' of git://github.com/dpalou/moodle 2016-02-01 17:19:59 +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
Mark Nelson
d14ba3a2f4 MDL-52940 core_backup: prevent always displaying logs 2016-02-01 12:43:53 +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
Mark Johnson
a2497e5036 MDL-52913 behat: Abort database transactions on exception. 2016-01-29 11:54:56 +00:00
David Monllao
c9d91bb734 weekly release 3.1dev 2016-01-29 14:36:50 +08:00
David Monllao
1789c20796 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-01-29 14:36:47 +08:00
Stephen Bourget
e62f6a01e4 MDL-45740 choice: add new events 2016-01-29 13:23:15 +08: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
846cd414bf MDL-46553 admin: Version bump after history rewrite 2016-01-29 10:22:12 +08:00
Eloy Lafuente (stronk7)
fabe7ebd53 MDL-50620 mod_scorm: Preventive (on rewrite) version bump to current. 2016-01-29 10:15:28 +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
Andrew Nicols
17cd73b684 Merge branch 'MDL-52826_master-fix' of git://github.com/dmonllao/moodle 2016-01-29 10:15:25 +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)
89bb268e21 MDL-37739 mod_wiki: test headings being wikilinks (toc and content) 2016-01-29 10:15:23 +08:00
Eloy Lafuente (stronk7)
7b6d50b743 Merge branch 'MDL-37739-malformed-wiki-toc-links' of https://github.com/lucaboesch/moodle 2016-01-29 10:15:23 +08:00
Dan Poltawski
e092a7c3d8 Merge branch 'MDL-48953_m31v4' of https://github.com/sbourget/moodle 2016-01-29 10:15:22 +08:00
Dan Poltawski
758e57499a Merge branch 'MDL-25864' of https://github.com/rushi963/moodle 2016-01-29 10:15:22 +08:00
David Monllao
5ceb208ba7 Merge branch 'MDL-42190-master-workshopdelsub' of git://github.com/mudrd8mz/moodle 2016-01-29 10:15:21 +08:00
David Monllao
25dbed8b9e Merge branch 'MDL-52459-master' of git://github.com/jleyva/moodle 2016-01-29 10:15:20 +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
Eloy Lafuente (stronk7)
94fe0fa02e Merge branch 'wip-mdl-52839' of https://github.com/rajeshtaneja/moodle 2016-01-29 10:15:20 +08:00
Eloy Lafuente (stronk7)
81be5d3456 Merge branch 'MDL-52843-master-paramsignup' of git://github.com/mudrd8mz/moodle 2016-01-29 10:15:19 +08:00
Dan Poltawski
4ce6dac426 Merge branch 'MDL-52791' of git://github.com/timhunt/moodle 2016-01-29 10:15:19 +08:00
Dan Poltawski
4ce63c9ccf Merge branch 'MDL-52835-master' of git://github.com/deraadt/moodle 2016-01-29 10:15:19 +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
99e96d83b6 Merge branch 'MDL-52682-master' of git://github.com/andrewnicols/moodle 2016-01-29 10:15:17 +08:00
David Monllao
33854a2968 MDL-52683 mod_scorm: Test for scorm_get_last_completed_attempt 2016-01-29 10:15:17 +08:00
David Monllao
0b8be05caf Merge branch 'MDL-52683-master' of git://github.com/s-cenni/moodle 2016-01-29 10:15:16 +08:00
David Monllao
0e5458f45f Merge branch 'wip-mdl-52799' of git://github.com/rajeshtaneja/moodle 2016-01-29 10:15:16 +08:00
David Monllao
6c3def94fa Merge branch 'MDL-35590-master' of git://github.com/lameze/moodle 2016-01-29 10:15:15 +08:00
David Monllao
9edcfdad4f Merge branch 'MDL-31635-master' of git://github.com/marinaglancy/moodle 2016-01-29 10:15:15 +08:00
AMOS bot
3ccc59d199 Automatically generated installer lang files 2016-01-28 00:04:19 +08:00
Dani Palou
156de651c7 MDL-51704 survey: Fix display problems in report page 2016-01-26 14:06:57 +01:00