Commit Graph

2844 Commits

Author SHA1 Message Date
Dan Poltawski 83a951023e weekly release 3.1dev 2016-02-18 09:14:12 +00: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
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
Andrew Nicols a9e12347b7 MDL-52217 repository: prepare_file should use per-request directory
The repository API defaults has a function, prepare_file, which is
responsible for creating a unique file to be used during the current
request.

This is usually used in the repository's get_file() function to store the
file before it is used elsewhere in the API to save the file to the
filestorage API.
It is also sometimes used to temporarily store credentials for the lifetime
of the session.

In all cases, this file is only expected to exist for the duration of the
session.

Switching to use of a per-request directory using make_request_directory()
ensures that the tempdir does not grow without control.

This commit also adds an upgrade step to remove all old temp directories
created by any repository currently installed.
2016-02-15 15:54:05 +08:00
Marina Glancy cdc5f9785b MDL-51802 core: new template for quick editing a title
convert editing tag name to use new template
2016-02-13 11:07:42 +08:00
Eric Merrill 201a90938e MDL-50385 grades: Adding index to improve history search 2016-02-11 12:30:12 -05:00
David Monllao 2f45a11ac4 weekly release 3.1dev 2016-02-11 13:58:46 +08:00
David Monllao 9d5d9c64ff weekly release 3.1dev 2016-02-04 14:30:03 +08: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
Adrian Greeve a2161d57a4 MDL-52715 lib: Clean up of comments and variable names. 2016-02-03 10:07:08 +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 c9d91bb734 weekly release 3.1dev 2016-01-29 14:36:50 +08:00
David Monllao 846cd414bf MDL-46553 admin: Version bump after history rewrite 2016-01-29 10:22:12 +08:00
Andrew Nicols eddec36d49 weekly release 3.1dev 2016-01-21 13:43:35 +08:00
Eloy Lafuente (stronk7) d3220ca34f MDL-52383 Calendar: fix versions 2016-01-20 01:25:16 +01:00
Stephen Bourget a721339193 MDL-52383 Calendar: Allow users to set lookahead to 1 year 2016-01-15 13:14:56 -05:00
Dan Poltawski e8d5100212 weekly release 3.1dev 2016-01-14 10:09:55 +00:00
Dan Poltawski 67f6802712 MDL-50851 upgrade: dan *REALLY* *REALLY* sucks at integrating 2016-01-13 12:01:33 +00:00
Dan Poltawski 04a03ff282 Merge branch 'wip-MDL-50851-master' of git://github.com/marinaglancy/moodle 2016-01-12 14:17:14 +00:00
Dan Poltawski b8ab80f07e Merge branch 'MDL-52210-master' of git://github.com/cameron1729/moodle 2016-01-12 13:36:13 +00:00
Marina Glancy c026a28d59 MDL-50851 core_tag: introduce tag collections 2016-01-10 15:25:43 +08:00
Dan Poltawski e65dfd9f28 weekly release 3.1dev 2016-01-07 08:32:34 +00:00
Cameron Ball 13ae7db2bb MDL-52210 webservices: Remove AMF webservice 2016-01-05 10:36:26 +08:00
Frederic Massart d0d4372ce7 MDL-49231 mod_glossary: External function view_glossary 2015-12-31 15:18:13 +01:00
Dan Poltawski ef343c3299 weekly release 3.1dev 2015-12-31 08:16:35 +00:00
David Monllao 97f4eb11a5 Merge branch 'MDL-50428-master' of git://github.com/jleyva/moodle
Conflicts:
	mod/scorm/version.php
	version.php
2015-12-29 10:46:52 +08:00
Dan Poltawski afbb53d70b weekly release 3.1dev 2015-12-23 11:35:50 +00:00
David Monllao febc314895 Merge branch 'MDL-51886-master' of git://github.com/dpalou/moodle
Conflicts:
	version.php
2015-12-22 16:28:18 +08:00
David Monllao a96bf448b8 Merge branch 'MDL-52073-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2015-12-22 16:23:33 +08:00
Dan Poltawski 07f8dd4314 Merge branch 'MDL-52399-master' of git://github.com/jleyva/moodle 2015-12-21 12:45:30 +00:00
Dani Palou 557b58b099 MDL-51886 wiki: New WS mod_wiki_view_wiki and mod_wiki_view_page 2015-12-21 08:19:24 +01:00
Dan Poltawski ea3ebbf20e weekly release 3.1dev 2015-12-18 12:26:50 +00:00
Juan Leyva 1e5241a12b MDL-52073 enrol_guest: New Web Service enrol_guest_get_instance_info 2015-12-10 12:32:30 +01:00
Juan Leyva 98fff78d00 MDL-50428 mod_scorm: New WS mod_scorm_launch_sco 2015-12-10 11:18:10 +01:00
Dan Poltawski 0dfcc2541a weekly release 3.1dev 2015-12-09 12:09:28 +00:00
Eloy Lafuente (stronk7) b5c73e6f42 MDL-51698 upgrade: bump version to newer than rewritten one
Some integration.git based sites can have 2015120801 version,
now rewritten. This commit ensures everybody goes forward to
2015120803.
2015-12-09 00:51:40 +01:00
Dan Poltawski c7bba4e5af Merge branch 'MDL-52165-master' of git://github.com/jleyva/moodle 2015-12-08 08:51:34 +00:00
Frederic Massart bf5bbe0127 MDL-50540 mod_glossary: Final clean up of new external function 2015-12-07 13:42:37 +08:00
Costantino Cito 23da998fad MDL-50540 glossary: New WS mod_glossary_get_glossaries_by_courses 2015-12-07 12:48:27 +08:00
Juan Leyva 04cd8ae3c0 MDL-52165 mod_forum: New Web Service mod_forum_can_add_discussion 2015-12-04 15:30:16 +01:00
Eloy Lafuente (stronk7) ea5c18dfce weekly release 3.1dev 2015-12-03 19:40:42 +01:00
Eloy Lafuente (stronk7) ef53650e8a NOBUG: Fixup commit to fix stuff wrongly changed on merge commits
On rewriting MDL-47491, we ended in a situation where these
modifications had been incorporated via merge commits. And kept
undetected by rebase -ip.

In general, please, use merge commits only for solving conflicts,
never as a replacement for fixup commits. To fix non-conflicting
things, add new, proper, fixup commits.
2015-12-03 18:52:25 +01:00
Juan Leyva bc7b1a3d4d MDL-52399 webservice: Add core_notes_delete_notes to the mobile service 2015-12-03 13:02:56 +01:00
Eloy Lafuente (stronk7) 7828bb972e Merge branch 'MDL-26935' of https://github.com/andrewhancox/moodle 2015-12-03 11:13:07 +01:00
Eloy Lafuente (stronk7) e070165f57 Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle 2015-12-01 00:50:10 +01:00
Dan Poltawski 92efb347b0 Merge branch 'MDL-52074-master' of git://github.com/jleyva/moodle 2015-11-30 15:29:29 +00:00
Dan Poltawski ca593e5f69 Merge branch 'MDL-52108-master' of git://github.com/jleyva/moodle 2015-11-30 15:25:22 +00:00
Dan Poltawski e354bf1e67 MDL-52219 admin: Enable completion and restricted access by default 2015-11-26 14:07:17 +00:00
David Monllao c18acb8997 weekly on-sync release 3.1dev 2015-11-26 11:02:40 +08:00