Commit graph

68856 commits

Author SHA1 Message Date
Sam Hemelryk
da6ddbf8e6 Merge branch 'wip-MDL-46147-master' of git://github.com/marinaglancy/moodle 2014-07-02 09:31:34 +12:00
Sam Hemelryk
4c92c676e3 Merge branch 'wip-MDL-45507_master' of git://github.com/lazydaisy/moodle 2014-07-02 09:21:29 +12:00
Eloy Lafuente (stronk7)
024d762da7 MDL-45961 user profile: track user on reset
It seems that redirect (after reset button) was also
missing the userid so the user track was lost.
2014-07-01 19:19:59 +02:00
Eloy Lafuente (stronk7)
eb13ef2982 Merge branch 'MDL-45961' of https://github.com/NeillM/moodle 2014-07-01 19:13:43 +02:00
Dan Poltawski
bbe04d27f2 Merge branch 'MDL-46063_master' of git://github.com/schach/moodle 2014-07-01 17:29:14 +01:00
Dan Poltawski
c07969400a Merge branch 'MDL-46036_survey' of https://github.com/andyjdavis/moodle 2014-07-01 15:58:11 +01:00
Dan Poltawski
e065becdd4 Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle 2014-07-01 15:41:04 +01:00
Eric Merrill
cd230b31b6 MDL-42071 caching Skip memcache(d) tests if no servers defined 2014-07-01 10:28:01 -04:00
Dan Poltawski
4a27b061bf Merge branch 'MDL-46107_master' of https://github.com/totara/openbadges 2014-07-01 14:20:44 +01:00
Dan Poltawski
c4058e6e0c Merge branch 'MDL-46163_category_selector_renders_as_nested_form' of https://github.com/MorrisR2/moodle 2014-07-01 14:16:04 +01:00
Dan Poltawski
9b19282346 Merge branch 'MDL-46161_files_reference_index' of git://github.com/davosmith/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2014-07-01 13:37:56 +01:00
Dan Poltawski
2a957cda17 Merge branch 'MDL-46093' of git://github.com/timhunt/moodle 2014-07-01 10:53:59 +01:00
Dan Poltawski
99fbe16211 Merge branch 'wip_MDL-46099_m28_userglobal' of https://github.com/skodak/moodle 2014-07-01 10:39:14 +01:00
Dan Poltawski
5474aa7a6d Merge branch 'MDL-32450_master' of https://github.com/markn86/moodle 2014-07-01 10:37:50 +01:00
Dan Poltawski
2d8c48a995 Merge branch 'MDL-40457-question_bank_plugins_columns' of git://github.com/MorrisR2/moodle 2014-07-01 10:12:52 +01:00
Marina Glancy
acbf4579d5 MDL-46147 modinfo: performance improvement for course page (check filterall) 2014-07-01 15:28:54 +08:00
Damyon Wiese
0d9805dc14 MDL-46147 modinfo: performance improvement for course page
This is a big win in a specific situation, ie filters enabled for content+headings,
and no activity descriptions visible on the course page.
2014-07-01 15:26:06 +08:00
Sam Hemelryk
21e57e82ed Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle 2014-07-01 11:27:53 +12:00
Sam Hemelryk
a0145560b9 Merge branch 'MDL-40805-master' of git://github.com/lameze/moodle 2014-07-01 09:06:12 +12:00
Petr Skoda
2e00d01db4 MDL-46099 session: fix use of references for session globals
This reverses the references used for global $USER and $SESSION,
the reason is that PHP does not allow references to references.
$USER is a reference to $GLOBALS['USER'] which means we cannot
put any references to it. Solution is to store the current user and session
objects in $GLOBALS['USER'] and $GLOBALS['SESSIOn'] are reference
them in $_SESSION.

This patch makes the session code behave the same way in CLI,
phpunit and normal web requests - this allows use to finally
unit test most aspects of the session code in Moodle.
2014-07-01 08:38:00 +12:00
Sam Hemelryk
03384ff9fd Merge branch 'MDL-46118_master' of git://github.com/dmonllao/moodle 2014-07-01 08:33:13 +12:00
Mark Nelson
c9b0e9769a MDL-32450 editor_tinymce: documented removal of DragMath 2014-06-30 13:08:00 -07:00
Mark Nelson
07f8f2f559 MDL-32450 editor_tinymce: removed DragMath from the 'customtoolbar' setting 2014-06-30 13:07:33 -07:00
Dan Poltawski
f74b3cd8bc Merge branch 'wip-mdl-45641' of https://github.com/rajeshtaneja/moodle 2014-06-30 15:12:30 +01:00
Dan Poltawski
9d8c363927 Merge branch 'MDL-42467_database' of https://github.com/andyjdavis/moodle 2014-06-30 15:08:59 +01:00
Dan Poltawski
973508d2e5 Merge branch 'MDL-45833_master' of git://github.com/dmonllao/moodle 2014-06-30 13:27:14 +01:00
Dan Poltawski
edd605d913 Merge branch 'MDL-46044-master' of git://github.com/damyon/moodle 2014-06-30 11:45:29 +01:00
Heiko Schach
4c7a19eccc MDL-46063 feedback: Fix user pictures 2014-06-30 13:06:32 +03:00
Dan Poltawski
6f90b157f3 Merge branch 'MDL-41663-master' of git://github.com/damyon/moodle 2014-06-30 09:24:39 +01:00
Dan Poltawski
cb1bf3f51a Merge branch 'MDL-40228-master' of git://github.com/FMCorz/moodle 2014-06-30 08:55:35 +01:00
Eric Merrill
7abaa5f46c MDL-42071 caching Support for clustered memcache caching
For stores where there is a very high rate of sets compared to gets, it
is beneficial to retrieve from the local server, skipping the network
overhead, at the expense of having to set many severs when a key is set.

This patch adds a memcache option to enable clustering. When on, only
one "server" is allowed, which will be where fetches are from, while
sets/updates/deletes/purges will occur to the all the servers in the
"set server" list.

To run unit tests, define TEST_CACHESTORE_MEMCACHE_TESTSERVERS with
multiple (return delimited) servers.
2014-06-29 23:02:31 -04:00
Eric Merrill
1c0518a625 MDL-42071 caching Support for clustered memcached caching
For stores where there is a very high rate of sets compared to gets, it
is beneficial to retrieve from the local server, skipping the network
overhead, at the expense of having to set many severs when a key is set.

This patch adds a memcached option to enable clustering. When on, only
one "server" is allowed, which will be where fetches are from, while
sets/updates/deletes/purges will occur to the all the servers in the
"set server" list.

To run unit tests, define TEST_CACHESTORE_MEMCACHED_TESTSERVERS with
multiple (return delimited) servers.
2014-06-29 23:02:06 -04:00
Ray Morris
17f229fae3 MDL-40457 Question Bank: Allow plugins to add columns to question bank view
Allows plugins to add columns to the question bank view by extending core_question\bank\column_base
Columns to display are set in $CFG->questionbankcolumns. Columns are namespaced and autoloaded to support this.
2014-06-29 21:28:52 -05:00
Mark Nelson
e3e4ea97ff MDL-32450 upgrade: do not remove DragMath settings if the files still exist 2014-06-29 15:48:21 -07:00
Petr Skoda
1170df12a1 MDL-32450 delete Dragmath plugin and library because it is not compatible with GPL 2014-06-29 15:36:29 -07:00
Tim Hunt
097dbfe11a MDL-46093 quiz review should default to showing everything on one page
... as long as the quiz is not too big. At the moment, that limit is
set to 50 questions.
2014-06-27 17:14:51 +01:00
Davo Smith
463882d085 MDL-46161 switch the field order of the index on mdl_files_reference to improve performance of file_storage::search_references 2014-06-27 11:34:37 +01:00
NeillM
6288c923f6 MDL-45961 Customise this page button on user profile page only works correctly for users own profile 2014-06-27 09:03:38 +01:00
Rajesh Taneja
f1259a7679 MDL-45641 event: Ldap user_signup unit test added 2014-06-27 15:44:56 +08:00
Rajesh Taneja
9363073b22 MDL-45641 event: Manually trigger event where needed.
Some places, user_created_user and user_updated_user
events should be triggred after profile data is saved.
2014-06-27 15:44:56 +08:00
Rajesh Taneja
a7466eb448 MDL-45641 event: Removed multiple user_updated event trigger
user_updated event was being triggred while
setting password, which is not correct. It now
trigger user_password_updated event. Few more
modifications done:
1. Correct event is being triggred.
2. Event is only triggred when password is chnaged.
3. Password is updated via single api.
4. Updated unit test
2014-06-27 15:44:56 +08:00
Rajesh Taneja
2b55cb1b18 MDL-45641 event: Option to trigger user event manually
On some pages full user data is not stored before user_created/
user_updated event is triggred. So giving option to trigger that
manually, so it can be triggred after all data is saved
2014-06-27 15:44:56 +08:00
Damyon Wiese
92d78aace8 MDL-46044 Assign: Add conditions to the inner query for performance 2014-06-27 14:58:58 +08:00
Damyon Wiese
6447021bc0 MDL-46044 Assign: Modify myhome query to only use the maxattempt from the submission
Using mismatches from the submissions/grades tables does not make much sense, we
should always only consider only the maxattempt from the submissions table.
2014-06-27 14:22:48 +08:00
Damyon Wiese
6c489d2cd0 MDL-46044 Assign: Move common setup to setUp method (share it for all of lib_test.php) 2014-06-27 14:15:31 +08:00
Damyon Wiese
fc1dac2e1e MDL-46044 Assign: Fix print_overview function when there are multiple attempts 2014-06-27 14:15:31 +08:00
Damyon Wiese
5533e011ce MDL-46044 Assign: Update unit test to test multiple attempts on overview page 2014-06-27 14:15:31 +08:00
David Monllao
fb9a2cddfb MDL-46118 report_log: No results limit when downloading 2014-06-27 11:35:12 +08:00
David Monllao
c16970ead0 MDL-45833 event: Removing courseid as the context is higher than course context 2014-06-27 11:25:14 +08:00
Yuliya Bozhko
d9fe7dbe78 MDL-46107 badges: Fix badges navigation and remove empty breadcrumbs on pages using Clean
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-06-27 12:45:25 +12:00