Commit graph

67179 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
792fb3ea61 Merge branch '46208-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-07-08 02:15:51 +02:00
Sam Hemelryk
15dcd5a535 MDL-45678 cache: renamed new cache and better comments 2014-07-08 09:52:57 +12:00
Sam Hemelryk
8ce2f33f9e Merge branch 'MDL-45678-006-26' of https://github.com/dbezborodovrp/moodle into MOODLE_26_STABLE 2014-07-08 09:42:43 +12:00
Yuliya Bozhko
dcf8e1f5d8 MDL-46073 badges: Make sure html tags are not used in badge description
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-07-08 09:37:27 +12:00
Sam Hemelryk
ca13549a89 Merge branch 'wip_MDL-46126_m26_passnulls' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-07-08 09:37:14 +12:00
Sam Hemelryk
20e563e825 Merge branch 'MDL-43347-26' of https://github.com/mackensen/moodle into MOODLE_26_STABLE 2014-07-08 09:28:25 +12:00
Yuliya Bozhko
0174a0a57f MDL-46042 badges: Clean up external badge data
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-07-07 16:37:48 +01:00
Dan Poltawski
7047adfdbe Merge branch 'MDL-42393-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-07-07 16:27:34 +01:00
Dan Poltawski
47de7aac75 Merge branch 'MDL-41389_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE 2014-07-07 16:10:28 +01:00
Osanda Malith Jayathissa
739d227c58 MDL-45683 user: Escaping Skype ID used in profile 2014-07-07 16:05:10 +01:00
Marina Glancy
74556525de MDL-45760 make sure to check permission before setting header 2014-07-07 15:06:42 +01:00
Tim Hunt
9d8348e13f MDL-46148 qtype_calculated: fix formula validation. 2014-07-07 14:34:02 +01:00
Frederic Massart
bbc12d9cb5 MDL-45417 mod_imscp: Prevent entity injections from package content 2014-07-07 13:03:07 +01:00
Frederic Massart
4637ad6f7e MDL-45463 mod_lti: Prevent XML entity injections from provider 2014-07-07 13:00:43 +01:00
Marina Glancy
40d52d4067 MDL-45616 repositories: use json encoding instead of serialization 2014-07-07 15:23:02 +08:00
Marina Glancy
68170f0b01 MDL-45616 repositories: more clearly distinguish when we use source and when reference
Function repository::get_moodle_file() should always be called on packed reference and not on the source received from user.
Also added phpdocs to some other methods that were confusing source and reference
2014-07-07 15:23:02 +08:00
Jason Fowler
a5ac47089e MDL-42752 File-picker: Fix tabbing to disabled icons 2014-07-07 14:33:51 +08:00
Dan Poltawski
7d6e6ffceb MDL-43848 messages: do not display message content in popups
The user is not in control of when these popups show up and it
may not be appropiate to have part of this content display whilst
in the presence of other users.
2014-07-07 13:48:08 +08:00
Nadav Kavalerchik
0057543e5e MDL-19270 - Quiz graph - Fix reverse display of Hebrew legend text in RTL mode 2014-07-06 18:51:11 +03:00
Helen Foster
07d9521c49 MDL-46231 Merge English strings from the en_fix language pack 2014-07-04 22:43:32 +02:00
Damien Bezborodov
4ee23c10bb MDL-45678 assignsubmission_comments: Improve performance for permissions checking 2014-07-04 14:25:32 +09:30
Petr Skoda
37648d141f MDL-46126 upgrade: fix bogus nulls in user.password before changing precission
Note: there is no need to deal with Oracle empty strings here
because only MySQL running in non-strict mode is affected.
2014-07-04 16:29:58 +12:00
Frederic Massart
3fd99e0ff6 MDL-45596 roles: Escape filter value before using it in form field 2014-07-04 11:49:32 +08:00
Mark Nelson
2d47c45485 MDL-41389 auth_db: added unit tests for events 2014-07-03 20:19:10 -07:00
AMOS bot
f214d6e69a Automatically generated installer lang files 2014-07-04 00:44:28 +00:00
Daniel Neis Araujo
e0cd470f1d MDL-46248 calendar: HTML validation check fails on add event screen (Backport of MDL-42869) 2014-07-03 17:20:34 -07:00
Mark Nelson
5e44d5abaa 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:16:02 -07:00
Mark Nelson
dba2527290 MDL-41389 auth_db: added user_updated/created event triggers 2014-07-03 15:11:47 -07:00
Sam Hemelryk
0b7cbdb0e6 MDL-46208 cachestore_mongo: fixed invalid collection name use 2014-07-04 08:11:21 +12:00
Dan Poltawski
92e7886965 weekly release 2.6.3+ 2014-07-03 10:53:21 +01:00
Dan Poltawski
7b414e6258 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-07-03 10:53:18 +01:00
Frederic Massart
880c2fb8ba MDL-42393 calendar: Preventing open/close loop in events overlay 2014-07-03 10:17:25 +08:00
Yuliya Bozhko
e68af16896 MDL-46229 badges: Fix missing additional names fields
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
2014-07-03 09:35:06 +12:00
AMOS bot
a2a8e3edf9 Automatically generated installer lang files 2014-07-02 00:44:47 +00:00
Eloy Lafuente (stronk7)
333c9cd9df Merge branch 'wip-mdl-45889-m26' of https://github.com/rajeshtaneja/moodle into MOODLE_26_STABLE 2014-07-02 00:57:09 +02:00
Eloy Lafuente (stronk7)
5d4923ffcc Merge branch '45209-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-07-01 23:43:28 +02:00
Sam Hemelryk
2ce17661e8 Merge branch 'wip-MDL-46147-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-02 09:31:10 +12:00
Mary Evans
dc22f74419 MDL-45507 theme_bootstrapbase: Fix regression for theme based custom menu
in renderers/core_renderer.php.
2014-07-02 09:22:49 +12:00
Eloy Lafuente (stronk7)
f7adf8a010 Merge branch 'MDL-45961_MOODLE_26_STABLE' of https://github.com/NeillM/moodle into MOODLE_26_STABLE 2014-07-01 19:23:46 +02:00
Dan Poltawski
92267ed9fe Merge branch 'MDL-46063_26' of git://github.com/schach/moodle into MOODLE_26_STABLE 2014-07-01 17:29:18 +01:00
Dan Poltawski
d520b92579 Merge branch 'MDL-46036_survey_26' of https://github.com/andyjdavis/moodle into MOODLE_26_STABLE 2014-07-01 16:34:32 +01:00
Charles Fulton
83f78c7c5e MDL-43347 grades: convert keep highest to text field 2014-07-01 07:36:15 -07:00
Charles Fulton
78e6292f47 MDL-43347 grades: consistent interface for drop lowest setting 2014-07-01 07:36:08 -07:00
Dan Poltawski
e666c72330 Merge branch 'MDL-46107_26' of https://github.com/totara/openbadges into MOODLE_26_STABLE 2014-07-01 14:20:53 +01:00
Dan Poltawski
db1cf750bd Merge branch 'wip_MDL-46099_m26_userglobal' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-07-01 10:39:18 +01:00
Marina Glancy
2522a179b0 MDL-46147 modinfo: performance improvement for course page (check filterall) 2014-07-01 15:32:48 +08:00
Damyon Wiese
30e2727e72 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:32:41 +08:00
Brian Barnes
faa963ba9a MDL-46144 core_calendar:Fixed label linking in calendar 2014-07-01 13:51:40 +12:00
Sam Hemelryk
3bbb37741f Merge branch 'MDL-40805-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-07-01 09:06:16 +12:00
Petr Skoda
d0dd8d33bb 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:52 +12:00