moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77814 commits 37 branches 540 tags 1.3 GiB
Commit graph

77814 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Monllao
218fbd6ca2 Merge branch 'MDL-51267-master' of git://github.com/lameze/moodle 2016-04-19 11:53:22 +08:00
Simey Lameze
819e1ff0ad MDL-51267 mod_url: make the url and resource forms friendlier 2016-04-19 11:13:18 +08:00
Andrew Nicols
383819375d Merge branch 'MDL-53779-master' of git://github.com/FMCorz/moodle 2016-04-19 10:32:56 +08:00
David Monllao
a60b808d1c Merge branch 'MDL-48506-master' of git://github.com/ryanwyllie/moodle 2016-04-19 10:05:17 +08:00
Andrew Nicols
cd82dcd08f Merge branch 'MDL-53535_master' of git://github.com/dmonllao/moodle 2016-04-19 09:45:30 +08:00
Eloy Lafuente (stronk7)
15f69edb1d Merge branch 'MDL-53796_master' of git://github.com/dmonllao/moodle 2016-04-19 01:58:13 +02:00
Eloy Lafuente (stronk7)
8ac2e53d17 Merge branch 'MDL-53795-master' of git://github.com/merrill-oakland/moodle 2016-04-19 01:44:46 +02:00
Ryan Wyllie
33688fbfe6 MDL-48506 cachestore_memcached: added shared cache config option 
When added a memcached instance you can now select whether the cache is
being shared by other applications. The setting will determine the
purging strategy.

Shared caches will have individual keys deleted while dedicated caches
will have the entire cache purged (better performance over networks).

Note: This option only works with the correct version of the php
memcached extension and with the multi-site safe changes.
 2016-04-18 07:18:24 +00:00
Sam Hemelryk
7797d7ead0 MDL-48506 cachestore_memcached: added upgrade notice 2016-04-18 06:56:46 +00:00
Sam Hemelryk
957e0c7567 MDL-48506 cachestore_memcached: is now multi-site safe 2016-04-18 06:56:46 +00:00
David Monllao
fbc6c48736 Merge branch 'MDL-53841-master' of http://github.com/damyon/moodle 2016-04-18 14:03:32 +08:00
David Monllao
23fc1be833 MDL-53535 search_solr: Solr version restrictions 
Also removing is_server_ready call from execute_query as in production
workflows search is done through \core_search\manager::search and
\core_search\manager::instance already checks is_server_ready. In
testing environment setUp functions should check that the server is
ready before performing other actions.
 2016-04-18 09:59:58 +08:00
Ben Kelada
48143990e0 MDL-53345 forum: rename itemid 2016-04-18 11:04:57 +10:00
Ben Kelada
e881c4f5c3 MDL-53345 forum: Add attachmentareaid to support attachments in api 2016-04-18 11:04:57 +10:00
Ben Kelada
41182118ae MDL-53345 forum: Add item id as parameter to support inline attachments 2016-04-18 11:04:57 +10:00
Damyon Wiese
77a530601a MDL-53841 assign: Fix for assignment listing page. 
Was throwing debugging because there is no course module defined on this page.
 2016-04-17 22:35:41 +08:00
Eloy Lafuente (stronk7)
4f33514063 weekly release 3.1dev 2016-04-15 10:19:04 +02:00
Eloy Lafuente (stronk7)
cd9e057be3 NOBUG: Fixed file access permissions 2016-04-15 10:19:04 +02:00
Eloy Lafuente (stronk7)
bdc5337644 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-04-15 10:18:59 +02:00
Damyon Wiese
821ab1bf9b MDL-52954 assign: Behat fixes because the assign grading ui has changed 2016-04-15 15:57:56 +08:00
Damyon Wiese
11c16f5fc8 MDL-53772 externallib: Deprecate external_function_info() 2016-04-14 15:07:41 +08:00
Damyon Wiese
e02e7f5a01 MDL-53772 libraries: More context fixes 
1. Improve upgrade note
2. Don't abuse $PAGE to get the current course/cm
3. Use validate_context, never $PAGE->set_context()
4. Reset current coursemodule in validate_context().
5. Respect moodlepageclass when calling an external function.
 2016-04-14 15:02:41 +08:00
David Monllao
e689d68b54 Merge branch 'MDL-52954-master-behat-fixes' of git://github.com/damyon/moodle 2016-04-14 14:26:16 +08:00
David Monllao
3dd89357d4 Merge branch 'MDL-53772-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/upgrade.txt
 2016-04-14 14:01:16 +08:00
Marina Glancy
787ec240c1 MDL-53772 inplace_editable: set context in callbacks 2016-04-14 13:58:29 +08:00
Damyon Wiese
56fa860ead MDL-53772 externallib: Fix busted webservices context handling 
Fix:
$PAGE->context must be reset when calling validate_context

Improve:
Provide wrapper for calling an external function

The wrapper correctly checks the function parameters and return type against
the description of the external function, and stores the PAGE and COURSE global
state variables, restoring them before the function returns.

Fix: buggy unit tests.

These tests are expecting debugging from a bug that was fixed, and calling web
service functions with no user or session.
 2016-04-14 13:58:23 +08:00
Damyon Wiese
5267d632ff MDL-52954 assign: Fixes to webservices and context. 
This patch gets the behat tests passing again - but only with MDL-53772 in the branch.
 2016-04-13 21:23:50 +08:00
Dan Poltawski
e92a39cf0c Revert "Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle" 
This reverts commit 61a0465ce7, reversing
changes made to 2408f8fe2b.
 2016-04-13 10:48:59 +01:00
David Monllao
27cec47220 Merge branch 'wip-MDL-53443-fix' of git://github.com/marinaglancy/moodle 2016-04-13 12:41:04 +08:00
Marina Glancy
47f4909a08 MDL-53443 mod_feedback: fix SQL statment to work on all DB 2016-04-13 12:00:14 +08:00
David Monllao
8918a8115e MDL-53796 behat: Move get_debug_text to base class 2016-04-13 10:34:28 +08:00
David Monllao
101303034f Merge branch 'wip-MDL-16855-master' of https://github.com/marinaglancy/moodle 2016-04-13 09:51:35 +08:00
Eric Merrill
e214f22f39 MDL-53795 logging: Add DB index for use when backing up logs 2016-04-12 21:44:15 -04:00
David Monllao
27bfb0ee9b Merge branch 'wip-MDL-45064-master' of https://github.com/marinaglancy/moodle 2016-04-13 09:38:12 +08:00
Eloy Lafuente (stronk7)
1d981ae4c2 Merge branch 'wip-MDL-53443-master' of https://github.com/marinaglancy/moodle 2016-04-13 03:26:46 +02:00
Marina Glancy
df003a85f0 MDL-53443 mod_feedback: templates code clean up and behat tests 2016-04-13 09:21:33 +08:00
Marina Glancy
2348c13732 MDL-45064 mod_lti: use callback get_shortcuts() 
deprecate callback for ltisource plugins get_types(), instead introduce
get_shortcuts()
 2016-04-13 08:30:05 +08:00
Marina Glancy
9ca0420e93 MDL-45064 course: mod callback get_shortcuts() 
also deprecate callback get_types()
 2016-04-13 08:30:04 +08:00
John Okely
01e8bfd745 MDL-45064 lti: LTI types in activity chooser 2016-04-13 08:30:04 +08:00
Marina Glancy
f40b444ef8 MDL-52707 tags: fix SQL query to work on all DBs 2016-04-13 07:46:44 +08:00
Eloy Lafuente (stronk7)
aca13ea2b6 Merge branch 'MDL-53642-master' of git://github.com/merrill-oakland/moodle 2016-04-12 22:39:26 +02:00
Eloy Lafuente (stronk7)
11c673f3a3 Merge branch 'MDL-53167-master' of git://github.com/merrill-oakland/moodle 2016-04-12 21:34:41 +02:00
AMOS bot
6526005fcf Automatically generated installer lang files 2016-04-13 00:04:10 +08:00
Dan Poltawski
d350414813 Merge branch 'MDL-52263-master' of git://github.com/crazyserver/moodle 2016-04-12 16:50:29 +01:00
Dan Poltawski
61a0465ce7 Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle 2016-04-12 14:13:36 +01:00
Pau Ferrer Ocaña
b1a9804a9b MDL-52263 libraries: Add test cases to external_format_text options 2016-04-12 15:05:46 +02:00
Pau Ferrer Ocaña
19a131edff MDL-52263 libraries: Add options to external_format_text 2016-04-12 14:39:23 +02:00
Frederic Massart
bf6239eddb MDL-53779 external: get_string and get_strings use PARAM_RAW 
For the string parameters and translated strings.
 2016-04-12 17:04:19 +08:00
Damyon Wiese
2408f8fe2b MDL-52954 assign: Fix CSS lint issues 2016-04-12 08:19:31 +01:00
David Monllao
212153767a Merge branch 'wip-MDL-52707-master' of https://github.com/marinaglancy/moodle 2016-04-12 14:34:11 +08:00