mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-09 02:10:00 +01:00
Code Issues Projects Releases Wiki Activity
46,931 Commits 36 Branches 523 Tags
Commit Graph

3311 Commits

Author SHA1 Message Date
Tim Hunt
e2cba246b7 MDL-20636 Merge vle/master into ouqe2 
Conflicts:
	mod/quiz/locallib.php
	mod/quiz/report/overview/overview_table.php
	mod/quiz/report/overview/report.php
	mod/quiz/report/responses/report.php
	question/type/random/questiontype.php
 2011-03-02 17:34:18 +00:00
Tim Hunt
d649fb0221 MDL-20636 Remove all references to global $QTYPES. 
Except in the question types that have not yet been converted to the new question engine.
 2011-02-24 15:29:07 +00:00
Eloy Lafuente (stronk7)
c04c06dc8e Merge branch 'MDL-25616_recent_messages' of git://github.com/andyjdavis/moodle 
Conflicts fixed:
	message/index.php
	message/lib.php
 2011-02-15 19:26:21 +01:00
Eloy Lafuente (stronk7)
da622b497b Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle 2011-02-15 12:40:43 +01:00
jeromemoodle
c73f196391 MDL-26179 implement the new 5 registration use cases 2011-02-15 10:24:32 +01:00
Petr Skoda
9449d0c5e8 MDL-25778 fix default country and city on user upload form and revert change in auth plugins 
Auth plugins should have separate defaults from site defaults).
 2011-02-15 09:13:33 +01:00
andyjdavis
bcab42daf2 message MDL-25616 adding recent conversations and recent notifications screens 2011-02-15 11:17:38 +08:00
Eloy Lafuente (stronk7)
2623f6bef2 Merge branch 'w07_MDL-25778_20_defaultcity' of git://github.com/skodak/moodle 2011-02-14 23:24:52 +01:00
Petr Skoda
fa7f750c60 MDL-25778 add defaultcity option 
This is based on patch by Jonathan Harker.
 2011-02-14 20:10:50 +01:00
Eloy Lafuente (stronk7)
7d87147203 Merge branch 'w07_MDL-26142_20_immediatelly' of git://github.com/skodak/moodle 2011-02-14 17:38:22 +01:00
Petr Skoda
743fff98dc MDL-26142 fix immediately spelling in strings, comments and code 2011-02-13 11:36:46 +01:00
Petr Skoda
b3929ae981 MDL-26383 add missing bloglevelupgrade admin section 2011-02-13 10:22:19 +01:00
Eloy Lafuente (stronk7)
5df4947cb8 Merge branch 'w06_MDL-26234_20_customfields' of git://github.com/skodak/moodle 2011-02-07 22:21:21 +01:00
Sam Hemelryk
449adacbc3 Merge branch 'MDL-25639' of git://git.luns.net.uk/moodle 2011-02-07 14:21:24 +08:00
Petr Skoda
bb98eea114 MDL-26234 fix fatal user upload error when custom text area field present 
Please note this does not fix problems with the actual upload of custon text area fields.
 2011-02-06 20:57:21 +01:00
Tim Hunt
74c479f212 MDL-20636 Merge branch 'master' into qe2_wip 
Conflicts:
	lib/questionlib.php
	question/type/calculated/lang/en/qtype_calculated.php
	question/type/questiontype.php
 2011-02-03 11:18:40 +00:00
Eloy Lafuente (stronk7)
b6a0ec4238 Merge branch 'w05_MDL-26140_20_experimental' of git://github.com/skodak/moodle 2011-01-31 16:17:13 +01:00
Eloy Lafuente (stronk7)
133a9b738e Merge branch 'w05_MDL-25921_20_tablemissing' of git://github.com/skodak/moodle 2011-01-31 16:01:02 +01:00
Petr Skoda
c259e5f636 MDL-25921 show error when module table is missing 2011-01-30 13:02:42 +01:00
Petr Skoda
dc80b14251 MDL-26140 hide unfinished experimental DTL pages 2011-01-30 11:50:19 +01:00
Daren Chandisingh
6110e008cb [MDL-25639] Fixed page output before redirection 2011-01-26 12:28:35 +00:00
Eloy Lafuente (stronk7)
29650825ad PULL-99, MDL-25929 progresstrackedroles out. Fixed conflicts and whitespace 2011-01-24 11:55:57 +01:00
Petr Skoda
25b355b623 MDL-26008 improved creator role description 2011-01-23 12:53:12 +01:00
Eloy Lafuente (stronk7)
755d2c74f6 MDL-25708 recordsets - fix admin dir uses 2011-01-25 19:58:59 +01:00
Petr Skoda
dd265e3091 Merge branch 'MDL-25987' of git://github.com/timhunt/moodle 2011-01-17 20:25:56 +01:00
Sam Hemelryk
83be8fce3a Merge branch 'MDL-25973_20_wip_charset' of git://github.com/skodak/moodle 2011-01-17 15:24:01 +08:00
Tim Hunt
04bbc70631 MDL-20636 qtype admin MDL-25987 also allow question type settings to be on an admin_externalpage. 2011-01-14 19:13:45 +00:00
Tim Hunt
1650a33cb4 qtype admin MDL-25987 also allow question type settings to be on an admin_externalpage. 2011-01-14 19:10:47 +00:00
Tim Hunt
24ef491d8f MDL-20636 qtype admin MDL-25987 use get_plugin_list, rather than including questionlib.php. 
This should be a small be significant performance win for people who are logged in as admin.
 2011-01-14 17:38:11 +00:00
Tim Hunt
63b5318e86 qtype admin MDL-25987 use get_plugin_list, rather than including questionlib.php. 
This should be a small be significant performance win for people who are logged in as admin.
 2011-01-14 17:26:31 +00:00
Petr Skoda
8a7703ce53 MDL-25973 add missing charset 2011-01-14 09:32:17 +01:00
Tim Hunt
f29aeb5afd MDL-20636 converstion of questionlib.php and base questiontype.php, plus other cheanges required to get the question editing page to display. 2011-01-13 18:35:37 +00:00
Petr Skoda
4cb02426ff MDL-25936 fixed user upload when manual plugin not first 2011-01-12 22:07:48 +01:00
sam marshall
1c6ed50500 completion MDL-25929 Remove progresstrackedroles option 2011-01-10 15:20:24 +00:00
Sam Hemelryk
1861a2875a Merge branch 'MDL-24299' of git://git.luns.net.uk/moodle 2011-01-10 13:10:33 +08:00
Tomasz Muras
936a0ae07e roles/assign MDL-24299 Fix back link 
Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
 2011-01-03 21:09:32 +00:00
Petr Skoda
01f6035ea1 Merge branch 'MDL-25822' of git://git.luns.net.uk/moodle 2011-01-03 17:53:51 +01:00
Dan Poltawski
5b903967de statistics MDL-25822 multiple values in get_field_sql 
A variety of get_field_sql calls returning multiple values, switched
to using MIN/MAX selects.
 2010-12-30 10:30:07 +00:00
Tim Lock
6c7b6efcf6 courseoverview report MDL-25727 Graphs Broken 
Typo preventing graphs from displaying

Signed-off-by: Dan Poltawski <dan.poltawski@luns.net.uk>
 2010-12-30 09:50:21 +00:00
Rossiani Wijaya
39f2bbf3fb MDL-25186: add environmental check to recommend PHP 5.3.3 2010-12-22 16:45:17 +08:00
Petr Skoda
ab12793355 Merge branch 'xhprof' of git://github.com/stronk7/moodle 2010-12-20 22:59:20 +01:00
Eloy Lafuente (stronk7)
6af80cae01 MDL-24600 profiling - add xhprof integration 2010-12-20 21:41:45 +01:00
David Mudrak
800bd78548 MDL-25647 mnet: fixed checkbox handling at peer services form 
We must use advcheckbox here so that unticked checkbox is considered as
0 and not as not-submitted in this case.
 2010-12-20 16:58:25 +01:00
David Mudrak
fda6946eb2 MDL-22676 language customization: enlarge the input textarea fields 
This patch combines the solution submitted by Ray Guo (computed
min-height) and the one used in AMOS (set the height of the textarea so
that it takes all available space in the row).
 2010-12-09 11:48:55 +00:00
Andrew Davis
4e226c99d5 message MDL-25240 add explanatory comment 2010-12-09 06:39:10 +00:00
Petr Skoda
59186c92b3 MDL-25614 add missing group lib 2010-12-09 06:14:38 +00:00
Sam Hemelryk
90e920c7f4 output MDL-25597 Added three new config settings that allow you to add additional HTML to every page. 2010-12-07 08:48:38 +00:00
David Mudrak
b876a003b4 MDL-25588 report_customlang: removed redundant safe path check 
Only the $lang part of the the path comes from the browser and it is
checked in get_localpack_location() anyway.
 2010-12-07 06:08:51 +00:00
jerome mouneyrac
ceac2af394 registration MDL-25322 fix average participant and module display (only two digital) 2010-11-19 09:23:12 +00:00
jerome mouneyrac
05d7a48dc5 registration MDL-25322 fix average participant and module display (only two digital) 2010-11-19 08:34:20 +00:00