76974 Commits

Author SHA1 Message Date
Damyon Wiese
b9d2419e39 MDL-49324 Output: The progress bar output is buffered.
Each call to update the progress bar needs to fill the output buffer so that it
gets sent immediately.
2016-02-23 08:35:10 +08:00
Dan Poltawski
83a951023e weekly release 3.1dev 2016-02-18 09:14:12 +00:00
Dan Poltawski
dafff3b84c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-02-18 09:14:09 +00:00
David Monllao
b0f437d8f7 Merge branch 'wip-mdl-52387' of git://github.com/rajeshtaneja/moodle 2016-02-18 11:48:14 +08:00
Rajesh Taneja
b4a5d4fa17 MDL-52387 auth_ldap: Use proper dn to find password age
dn with fine grained password should be used
to get msds-maximumpasswordage attribute.
No checks should be used to see if the array
key is set as entry should always return them.
2016-02-18 11:38:03 +08:00
Eloy Lafuente (stronk7)
12d5994fc7 MDL-52964 Qtype: Small fixes to behat tests
This applies some small changes to proposed behat tests:

- Geting rid of the @javascript tag when it's not needed.
- Adding some missing @_switch_window tags.
- Fixing some scenario names, previously duplicated.
- Fixing some typos and whitespace.
2016-02-18 01:42:22 +01:00
Eloy Lafuente (stronk7)
cad67991d4 Merge branch 'MDL-52964' of https://github.com/mkassaei/moodle 2016-02-18 00:58:10 +01:00
Eloy Lafuente (stronk7)
83fe83e988 Merge branch 'wip-MDL-51802-fix' of https://github.com/marinaglancy/moodle 2016-02-17 17:29:07 +01:00
Marina Glancy
fa4dd0169d MDL-51802 core: change template example 2016-02-17 20:32:55 +08:00
Dan Poltawski
0b14d8612b Merge branch 'MDL-51214-master' of git://github.com/andrewnicols/moodle 2016-02-17 07:58:15 +00:00
Marina Glancy
7c5c80350c MDL-49807 mod_wiki: section detection regexp fix 2016-02-17 13:11:10 +08:00
David Monllao
a6f4866e52 Merge branch 'MDL-48015-master' of git://github.com/junpataleta/moodle 2016-02-17 09:49:04 +08:00
Eloy Lafuente (stronk7)
45cb6145fb Merge branch 'MDL-51852-master' of git://github.com/andrewnicols/moodle 2016-02-17 02:03:48 +01:00
Andrew Nicols
a6fc917168 MDL-51852 mod_forum: Respect timed discussions in emails 2016-02-17 07:57:57 +08:00
Eloy Lafuente (stronk7)
642a4fde4b Merge branch 'wip-MDL-51802-master4' of https://github.com/marinaglancy/moodle 2016-02-16 23:22:35 +01:00
Eloy Lafuente (stronk7)
c70d54405b Merge branch 'MDL-29506-master' of git://github.com/andrewnicols/moodle 2016-02-16 17:50:22 +01:00
Eloy Lafuente (stronk7)
8bd2db2023 Merge branch 'MDL-52997-email-threading' of https://github.com/brendanheywood/moodle 2016-02-16 17:11:10 +01:00
AMOS bot
8753cdbca8 Automatically generated installer lang files 2016-02-17 00:05:41 +08:00
Eloy Lafuente (stronk7)
fa6426a069 Merge branch 'MDL-52814' of git://github.com/timhunt/moodle 2016-02-16 16:48:04 +01:00
Dani Palou
85894eda01 MDL-52993 wiki: Add unit tests for wiki_user_can_edit
Note: amended on integration to fix some comments.
2016-02-16 16:44:41 +01:00
Dani Palou
bb05505e00 MDL-52993 wiki: Fix wiki_user_can_edit for collab and separate groups 2016-02-16 16:44:07 +01:00
Dan Poltawski
821296dc7b Merge branch 'MDL-52862_master' of https://github.com/juancs/moodle 2016-02-16 15:18:46 +00:00
Dan Poltawski
0aefe91c50 Merge branch 'MDL-52990-email-themes' of https://github.com/brendanheywood/moodle 2016-02-16 11:17:54 +00:00
Dan Poltawski
3a9cc98c80 Merge branch 'MDL-34160-forum-subject' of https://github.com/brendanheywood/moodle 2016-02-16 11:04:41 +00:00
Dan Poltawski
33fa0e1181 Merge branch 'MDL-53012-master' of https://github.com/sammarshallou/moodle 2016-02-16 10:44:57 +00:00
Dan Poltawski
f155059452 Merge branch 'MDL-48439-change-background-colour-of-tool_capability-table' of git://github.com/synergylearning/moodle 2016-02-16 10:42:33 +00:00
Dan Poltawski
cbce7be769 MDL-28030 setup: Ensure $CFG->urlrewriteclass is properly setup
(To avoid crippling a site)
2016-02-16 11:35:07 +01:00
Dan Poltawski
cfdc1bb0ca Merge branch 'MDL-52879' of git://github.com/timhunt/moodle 2016-02-16 10:26:57 +00:00
Eloy Lafuente (stronk7)
5d8dfdef1d Merge branch 'MDL-51929-master' of git://github.com/dpalou/moodle 2016-02-16 11:22:53 +01:00
Dan Poltawski
6bb1bd930f Merge branch 'MDL-49612-master' of git://github.com/dpalou/moodle 2016-02-16 09:30:12 +00:00
Dan Poltawski
d330eb4342 Merge branch 'master_MDL-50620' of https://github.com/danmarsden/moodle 2016-02-16 09:09:08 +00:00
Dani Palou
052da7304a MDL-51929 external: Apply new validate_courses to data/lti/survey 2016-02-16 08:26:07 +01:00
David Monllao
82e1b645eb Merge branch 'MDL-52208-master-2' of git://github.com/junpataleta/moodle 2016-02-16 14:39:46 +08:00
Jun Pataleta
79c7fffce3 MDL-52208 webservice_soap: Remove Zend from webservice_soap 2016-02-16 14:14:11 +08:00
Brendan Heywood
efd420608e MDL-52990 email: Added site wide email mustache templates 2016-02-16 16:39:25 +11:00
David Monllao
b018aec5da Merge branch 'MDL-51117-master' of git://github.com/andrewnicols/moodle 2016-02-16 13:26:37 +08:00
David Monllao
7fadf9edff Merge branch 'MDL-52414_m31v7' of https://github.com/sbourget/moodle 2016-02-16 12:44:09 +08:00
Stephen Bourget
e6e5d0104f MDL-52414 Lesson: Fix lesson defaults 2016-02-15 23:05:37 -05:00
David Monllao
ce74ad69ae Merge branch 'MDL-52387-master' of git://github.com/lameze/moodle 2016-02-16 11:25:22 +08:00
David Monllao
fb2d4baf57 MDL-51196 mod_forum: Updating required context vars 2016-02-16 11:22:29 +08:00
David Monllao
0511b81240 Merge branch 'MDL-51196-text-email-permalink' of https://github.com/brendanheywood/moodle 2016-02-16 11:17:20 +08:00
Simey Lameze
c1bc628e1d MDL-52387 auth_ldap: add support for fine grained password
Contributed by Matthew Johnson.
2016-02-16 11:03:42 +08:00
David Monllao
88acc87d8c MDL-51839 mod: Info about removing icon.gif files 2016-02-16 11:02:49 +08:00
David Monllao
11ce3ffccc Merge branch 'MDL-51839-master' of git://github.com/andrewnicols/moodle 2016-02-16 10:58:22 +08:00
Brendan Heywood
091420f9e6 MDL-34160 mod_forum: Add extra site and course vars to postmailsubject 2016-02-16 13:06:22 +11:00
Andrew Nicols
5ddf81cd27 MDL-51214 block_news_items: Rename to "Latest announcements" 2016-02-16 10:05:27 +08:00
Andrew Nicols
265a9bf769 MDL-51214 mod_forum: Update News forum => Announcements 2016-02-16 10:05:24 +08:00
Eloy Lafuente (stronk7)
be5955edf0 Merge branch 'MDL-52969-email-unsubscribe' of https://github.com/brendanheywood/moodle 2016-02-16 02:54:08 +01:00
Eloy Lafuente (stronk7)
056a07388b Merge branch 'MDL-52511-master' of git://github.com/danpoltawski/moodle 2016-02-16 02:00:37 +01:00
David Monllao
c06749bdf3 Merge branch 'MDL-50385-master' of git://github.com/merrill-oakland/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2016-02-16 06:47:27 +08:00