mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity
68,910 Commits 36 Branches 528 Tags
Commit Graph

68910 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
95d294368f Merge branch 'MDL-46212' of git://github.com/timhunt/moodle 
Conflicts:
	question/type/calculated/question.php
 2014-07-08 11:43:09 +12:00
Sam Hemelryk
cf9ae1134c Merge branch 'm28_MDL-46225' of https://github.com/totara/moodle 2014-07-08 10:36:10 +12:00
Sam Hemelryk
a5dcdd4bd9 Merge branch 'MDL-46240-master' of git://github.com/danpoltawski/moodle 2014-07-08 10:34:28 +12:00
Eloy Lafuente (stronk7)
292803a4f9 Merge branch 'wip_MDL-45945_m28_mssqlcol' of https://github.com/skodak/moodle 2014-07-08 00:31:54 +02:00
Sam Hemelryk
03ecddb440 MDL-45678 cache: renamed new cache and better comments 2014-07-08 09:52:41 +12:00
Sam Hemelryk
207891d791 Merge branch 'MDL-45678-006-master' of https://github.com/dbezborodovrp/moodle 2014-07-08 09:42:35 +12:00
Sam Hemelryk
a02656b75a Merge branch 'wip_MDL-46126_m28_passnulls' of https://github.com/skodak/moodle 2014-07-08 09:37:08 +12:00
Sam Hemelryk
4264ed8454 Merge branch 'MDL-43347-master' of https://github.com/mackensen/moodle 2014-07-08 09:28:20 +12:00
Sam Hemelryk
744c77c057 Merge branch 'MDL-16474-master' of git://github.com/FMCorz/moodle 2014-07-08 08:29:45 +12:00
Adrian Greeve
005402f503 MDL-46201 events: Sanitization of username before returning the description. 2014-07-07 18:18:45 +01:00
Yuliya Bozhko
ea76b652fc MDL-46042 badges: Clean up external badge data 
Signed-off-by: Yuliya Bozhko <yuliya.bozhko@totaralms.com>
 2014-07-07 16:37:36 +01:00
Dan Poltawski
e3541d3c1b Merge branch 'MDL-42393-master' of git://github.com/FMCorz/moodle 2014-07-07 16:27:29 +01:00
Osanda Malith Jayathissa
ce5a785b09 MDL-45683 user: Escaping Skype ID used in profile 2014-07-07 16:05:06 +01:00
Marina Glancy
9dbf62d230 MDL-45760 make sure to check permission before setting header 2014-07-07 15:06:08 +01:00
Tim Hunt
88ec9f308d MDL-46148 qtype_calculated: validate formulas everywhere. 2014-07-07 14:33:34 +01:00
Tim Hunt
155bc75472 MDL-46148 qtype_calculated: function to validate equations in text. 2014-07-07 14:33:29 +01:00
Tim Hunt
29005a5418 MDL-46148 qtype_calculated: Remove unused function. 2014-07-07 14:33:24 +01:00
Tim Hunt
44f726a7b1 MDL-46148 qtype_calculated: unit tests + fixes for validation 2014-07-07 14:33:20 +01:00
Frederic Massart
595ef4772d MDL-45417 mod_imscp: Prevent entity injections from package content 2014-07-07 13:02:54 +01:00
Frederic Massart
78ed99ec7e MDL-45463 mod_lti: Prevent XML entity injections from provider 2014-07-07 13:01:02 +01:00
Marina Glancy
e29bb97c07 MDL-45616 repositories: API changes to avoid serialized data in user input 2014-07-07 14:41:20 +08:00
Marina Glancy
56964b7948 MDL-45616 repositories: use json encoding instead of serialization 2014-07-07 14:41:20 +08:00
Marina Glancy
5ad3f3c61e 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 14:41:20 +08:00
Dan Poltawski
a332d6606a MDL-43848 message: remove unused strings 2014-07-07 13:37:11 +08:00
Dan Poltawski
20490cbb2b 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:37:10 +08:00
Dan Poltawski
e1673b58ec MDL-46240 atto_collapse: fix icon url 2014-07-04 14:33:39 +01:00
Damien Bezborodov
eeb9ee8ebf MDL-45678 assignsubmission_comments: Improve performance for permissions checking 2014-07-04 14:24:31 +09:30
Petr Skoda
ffda0ca360 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:28:59 +12:00
Petr Skoda
b86912431e MDL-45945 mssql: force default database collation in all tables including temp table 2014-07-04 15:04:50 +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
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