18989 Commits

Author SHA1 Message Date
Marina Glancy
9422f6ee42 MDL-46163 question/quiz: fix elements ids and their labels 2014-07-03 10:13:00 +01:00
Sam Hemelryk
ebdcb2924c MDL-41663 output: fix for methods with _renderable suffix 2014-07-02 14:59:31 +12:00
Sam Hemelryk
da6ddbf8e6 Merge branch 'wip-MDL-46147-master' of git://github.com/marinaglancy/moodle 2014-07-02 09:31:34 +12: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
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
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
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
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
6f90b157f3 Merge branch 'MDL-41663-master' of git://github.com/damyon/moodle 2014-06-30 09:24:39 +01:00
Frederic Massart
3774d40f8c MDL-16474 scale: Allow scales with 1 item 2014-06-30 14:24:24 +08: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
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
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
Marina Glancy
d70fe4f8d9 Merge branch 'wip-mdl-46061' of git://github.com/rajeshtaneja/moodle 2014-06-26 10:26:59 +08:00
Rajesh Taneja
d7a0b72160 MDL-46061 behat: Fixed blur event problem for atto_image
atto_image look for blur event after changing width/height
Added a new step to get focus off the element, so this can
work.
2014-06-26 09:59:49 +08:00
Damyon Wiese
2b472c83b5 MDL-45983 Atto equation editor: Exclude phantomjs from this behat test because it's buggy 2014-06-25 15:04:20 +08:00
Rajesh Taneja
6c396b6bb4 MDL-43835 behat: Added new step to set field with xpath defined 2014-06-25 12:54:52 +08:00
Rajesh Taneja
955118d831 MDL-43835 behat: Fixed matches for select form field 2014-06-25 12:54:52 +08:00
Damyon Wiese
1a1d3665dc MDL-41663 Output: Allow subtype as a namespace level on it's own 2014-06-25 12:16:53 +08:00
Damyon Wiese
79046c2726 MDL-41663 Output: Unit tests for output factories search paths 2014-06-25 11:42:17 +08:00
Damyon Wiese
d2bba1ee2b MDL-41663 Renderers - allow autoloaded renderers 2014-06-25 11:42:17 +08:00
Eloy Lafuente (stronk7)
eaa504cd67 Merge branch '43365-28' of git://github.com/samhemelryk/moodle 2014-06-25 01:35:17 +02:00
Sam Hemelryk
78c12cdb0f MDL-43365 lib: converted text and plugin deprecated classes to new scheme
Four core library classes renamed for autoloading with deprecated stubs
have been converted to the new scheme for autoloading.
They are:

 * textlib
 * collatorlib
 * plugin_manager
 * plugininfo_base

These will be removed in 2.9 by MDL-46124
2014-06-25 09:30:38 +12:00
Sam Hemelryk
37e600076d MDL-43365 lib: added better means of renaming classes for autoloading
I've added a better means of renaming classes for autoloading and
handling the deprecation of the original class name.
This system records renamed classes in db/renamedclasses.php and
when a renamed class is requested a debugging notice is printed
and a class alias is created so that the calling code both works
and is informed of the deprecation.
2014-06-25 09:28:30 +12:00
Eloy Lafuente (stronk7)
c45754d840 Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle 2014-06-24 21:54:58 +02:00
Damyon Wiese
2ef26ad94f Merge branch 'wip_MDL-45985_m28_dbschema' of https://github.com/skodak/moodle 2014-06-24 14:19:20 +08:00
Damyon Wiese
d9640a99ba Merge branch 'MDL-46022-master' of git://github.com/jethac/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
2014-06-24 14:10:51 +08:00
Damyon Wiese
e9018b50a2 Merge branch 'MDL-46031' of git://github.com/timhunt/moodle 2014-06-24 14:05:54 +08:00
Marina Glancy
8d879f3928 Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle 2014-06-24 13:51:30 +08:00
Marina Glancy
5c5d182301 Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle 2014-06-24 13:32:13 +08:00
Damyon Wiese
95664d548f Merge branch 'MDL-46046-master' of git://github.com/FMCorz/moodle 2014-06-24 11:44:42 +08:00
Damyon Wiese
5d71e8b51a Merge branch 'wip-MDL-36003-master' of git://github.com/abgreeve/moodle 2014-06-24 11:23:21 +08:00
Simey Lameze
f9f9d187f8 MDL-40805 auth_cas : Method postlogout_hook created to be executed after user_loggedout event trigger. 2014-06-24 11:00:32 +08:00
Damyon Wiese
f8793245e8 Merge branch 'MDL-44773-master' of git://github.com/FMCorz/moodle 2014-06-24 10:08:28 +08:00
Eloy Lafuente (stronk7)
b362c8f90d Merge branch 'MDL-39883-master' of git://github.com/ankitagarwal/moodle 2014-06-24 00:46:36 +02:00
Jerome Mouneyrac
5cba1029ca MDL-32917 port YUI2 Moodle calendar into a shifted YUI3 Calendar 2014-06-23 13:50:47 +08:00
Damyon Wiese
7fb32aaafc MDL-41746 External api: Allow multiple calls to validate_context at different levels
(Only from webservices)
2014-06-23 13:38:53 +08:00
Damyon Wiese
a51201a433 Merge branch 'MDL-43835' of https://github.com/mr-russ/moodle 2014-06-23 12:20:04 +08:00
Adrian Greeve
06dc1e7f56 MDL-36003 events: Added events for viewing grade reports. 2014-06-23 11:59:35 +08:00
Marina Glancy
c436a90dfb Merge branch 'MDL-46013_uninstall_theme' of git://github.com/moodlerooms/moodle 2014-06-23 11:34:27 +08:00
Marina Glancy
47b933df3d Merge branch 'MDL-44124-master' of git://github.com/ankitagarwal/moodle 2014-06-23 11:33:50 +08:00
Daniel Neis
ee9e079ddd MDL-35864 Require 'enrol/PLUGIN:config' capabilities to delete enrol instances 2014-06-20 13:08:18 -03:00