ba8491ae3f
Merge branch 'MDL-52983' of git://github.com/aolley/moodle
2016-02-08 13:05:30 +01:00
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
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
7a662077f1
Merge branch 'MDL-51723-master' of git://github.com/andrewnicols/moodle
2016-02-08 09:02:41 +08:00
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
e7c71c189b
MDL-48634 grades: Make the rescaling option required if maxgrade changes
2016-02-05 18:20:17 +08:00
d629c601c5
MDL-48634 grades: Add an option to rescale when changing the maxgrade
2016-02-05 18:20:17 +08:00
44841ca911
MDL-52958 medialib: Allow vimeo fullscreen using links
...
All credit to Henrik Sune Pedersen.
2016-02-05 10:15:08 +08:00
074b3dcecc
MDL-52637 mail: Disabled automatic TLS encryption.
2016-02-04 21:16:23 +01:00
6badbf0135
MDL-49620 availability: plugins can have global settings
2016-02-04 15:21:02 +00:00
f66da45fa5
MDL-52996 Atto: Allow plugins to customise toolbar
2016-02-04 12:42:27 +00:00
6bd871d3dd
MDL-52981 Unit tests: Reset global after test
2016-02-03 10:25:27 +00:00
96c69429e5
Merge branch 'wip-MDL-52715-master-additional' of git://github.com/abgreeve/moodle
2016-02-03 09:44:27 +00:00
6d18da567d
Merge branch 'MDL-52899' of git://github.com/timhunt/moodle
2016-02-03 13:44:41 +08:00
a2161d57a4
MDL-52715 lib: Clean up of comments and variable names.
2016-02-03 10:07:08 +08:00
e3e036ee09
MDL-52974 mod_assign: New Web Service mod_assign_view_submission_status
2016-02-02 13:27:03 +01:00
52ad3afadb
Merge branch 'wip-MDL-51283-master' of git://github.com/marinaglancy/moodle
2016-02-02 17:40:39 +08:00
4be9c7ad99
MDL-51283 core_tag: Allow each tag area to set 'showstandard'
2016-02-02 17:31:17 +08:00
e11d7380c2
MDL-51283 core_tag: change tagtype to isstandard
...
Change 'official' to 'standard' in UI
2016-02-02 17:31:14 +08:00
367cf39985
Merge branch 'MDL-52873-master-modgradeid' of git://github.com/mudrd8mz/moodle
2016-02-02 12:12:03 +08:00
b0e7075214
Merge branch 'wip-mdl-52932-m' of https://github.com/rajeshtaneja/moodle
2016-02-01 10:27:28 +00:00
d23bf21b0a
MDL-52715 js: Merge M.str and clean memory
2016-02-01 14:29:09 +08:00
0b39d21ae7
MDL-52715 ws: Fragments WS using fragment requires properly.
2016-02-01 14:29:09 +08:00
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
1dea567d6e
Merge branch 'MDL-52261_master_file_not_found' of git://github.com/BenKelada/moodle
2016-02-01 13:55:57 +08:00
cd55c6e249
Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle
2016-02-01 13:46:18 +08:00
b831527ce8
Merge branch 'MDL-52831-master-emptynames' of git://github.com/mudrd8mz/moodle
2016-02-01 11:28:40 +08:00
abedeb8c70
MDL-51723 ldap: Normalise the user objectclass
2016-02-01 10:24:34 +08:00
a2497e5036
MDL-52913 behat: Abort database transactions on exception.
2016-01-29 11:54:56 +00:00
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
5e48383330
MDL-52932 behat: Restart session if it fails because of some reason
2016-01-29 11:59:01 +08:00
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
4bed1fcc7e
Merge branch 'MDL-35590-fixes' of git://github.com/ryanwyllie/moodle
2016-01-29 10:15:27 +08:00
ca29dd4e84
Merge branch 'MDL-52825_master-fix' of git://github.com/dmonllao/moodle
2016-01-29 10:15:26 +08:00
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
90902953a8
MDL-52825 atto: Listen to gesturemovestart to discard some events
2016-01-29 10:15:26 +08:00
80f37f2739
MDL-35590 behat: Data-loaded is on li node
2016-01-29 10:15:25 +08:00
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
3c415f13b8
Merge branch 'MDL-29817' of https://github.com/rushi963/moodle
2016-01-29 10:15:24 +08:00
6e38f41d8e
MDL-52567 Core: amend existing test to new counting rules
2016-01-29 10:15:24 +08:00
bc269f6782
Merge branch 'MDL-52567_master' of https://github.com/nadavkav/moodle
2016-01-29 10:15:23 +08:00
aeba2257f4
Merge branch 'MDL-52780-mailoriginscript' of https://github.com/brendanheywood/moodle
2016-01-29 10:15:20 +08:00
e23c76d72e
Merge branch 'MDL-52826_master' of git://github.com/dmonllao/moodle
2016-01-29 10:15:18 +08:00
1d1c8f6275
Merge branch 'MDL-51702_master' of git://github.com/dmonllao/moodle
2016-01-29 10:15:18 +08:00
760b0a17f1
Merge branch 'MDL-52825_master' of git://github.com/dmonllao/moodle
2016-01-29 10:15:17 +08:00
0e5458f45f
Merge branch 'wip-mdl-52799' of git://github.com/rajeshtaneja/moodle
2016-01-29 10:15:16 +08:00
6c3def94fa
Merge branch 'MDL-35590-master' of git://github.com/lameze/moodle
2016-01-29 10:15:15 +08:00
41f4dabe2b
MDL-52899 behat: make PAGE_READY_JS more robust
2016-01-26 11:23:26 +00:00
ef3cd03876
MDL-52896 moodlelib: Remove APD support relic
...
The support for Advanced PHP Debugger was dropped in Moodle 2.2
(MDL-29881). This seems to be a forgotten relic no longer used and
needed in moodlelib.
2016-01-26 09:33:35 +01:00
5200054dc2
MDL-52567 Core: remove quotation marks, for proper word count
2016-01-24 00:47:13 +02:00
Eloy Lafuente (stronk7)