Commit graph

69344 commits

Author SHA1 Message Date
Mark Nelson
91ad3ef1a2 MDL-46016 auth_shibboleth: updated misleading comment
Also generated a random string for the password field in case it is ever used.
2014-07-03 16:15:44 -07:00
Sam Hemelryk
ddd2361e80 MDL-42609 course: management page now selected default category initially 2014-07-04 10:55:40 +12:00
Sam Hemelryk
a67c56d007 MDL-41502 course: removed classes and files deprecated in 2.6 2014-07-04 10:27:40 +12:00
Sam Hemelryk
c9ef35e1f3 MDL-46208 cachestore_mongo: fixed invalid collection name use 2014-07-04 08:11:27 +12:00
Tim Hunt
f4fe3968a2 MDL-46212 questions: add {} whenver vars are put into "" strings
Having had one subtle bug cased be this, I decided to do a search and
fix all of these.
2014-07-03 14:02:39 +01:00
Tim Hunt
0e30442ca8 MDL-46212 question editing: extra answer fields notice.
It turns out that PHP does not interpret "$field[$key]" the way we were
expecting.
2014-07-03 13:56:11 +01:00
Dan Poltawski
4de51c25ae weekly release 2.8dev 2014-07-03 10:53:14 +01:00
Dan Poltawski
0c55700691 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-07-03 10:53:11 +01:00
Marina Glancy
9422f6ee42 MDL-46163 question/quiz: fix elements ids and their labels 2014-07-03 10:13:00 +01:00
David Monllao
bfce1e4a1b MDL-43849 enrol_meta: Renaming methods according to what they test 2014-07-03 14:45:26 +08:00
David Monllao
fd63568619 MDL-43849 mod_forum: Adding tests for observers 2014-07-03 14:45:17 +08:00
Brian Barnes
8d29ac9803 MDL-46225 core_admin: Changed heading to add a new user to a button 2014-07-03 09:01:29 +12:00
Tim Hunt
84deaaf8bb MDL-46163 quiz/questions: fix missing hidden fields.
I have done this by eliminating the duplication between the base class
and the subclass.

This was a regression introdcued by MDL-40313.
2014-07-02 14:32:53 +01:00
Dan Poltawski
9cafb3433f MDL-46163 question: fix missing ; 2014-07-02 07:22:15 +01:00
Marina Glancy
41dcab66d1 Merge branch '41663-28' of git://github.com/samhemelryk/moodle 2014-07-02 11:52:12 +08:00
Sam Hemelryk
fe22c729ff Merge branch 'MDL-42071_MK3' of https://github.com/merrill-oakland/moodle 2014-07-02 15:13:18 +12:00
Sam Hemelryk
ebdcb2924c MDL-41663 output: fix for methods with _renderable suffix 2014-07-02 14:59:31 +12:00
Eric Merrill
9043a10907 MDL-42071 caching Validate setservers correctly for php pre 5.5 2014-07-01 22:28:22 -04:00
AMOS bot
0d54006225 Automatically generated installer lang files 2014-07-02 00:44:32 +00:00
Eloy Lafuente (stronk7)
fc8caadf43 Merge branch 'wip-mdl-45889' of https://github.com/rajeshtaneja/moodle 2014-07-02 00:21:21 +02:00
Eloy Lafuente (stronk7)
5c8ce898ab Merge branch 'MDL-45379' of https://github.com/totara/openbadges 2014-07-01 23:59:31 +02:00
Eloy Lafuente (stronk7)
6d84726b3a Merge branch '45209-28' of git://github.com/samhemelryk/moodle 2014-07-01 23:49:58 +02:00
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
Mark Nelson
05c0d19a5d MDL-45381 mod_forum: updated unit tests for subscription created/deleted events 2014-06-30 23:32:43 -07:00
Frederic Massart
23a2d6f7c5 MDL-42393 calendar: Preventing open/close loop in events overlay 2014-07-01 11:20:33 +08:00
Brian Barnes
afeb71078b MDL-46144 core_calendar: Fixed linking of labels on calendar pages 2014-07-01 13:39:38 +12: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