10892 Commits

Author SHA1 Message Date
Sam Hemelryk
c5fe313c06 Merge branch 'w28_MDL-23344_m22_loginfocus2' of git://github.com/skodak/moodle 2011-07-18 20:25:43 +10:00
Petr Skoda
5c754932e7 MDL-28344 new option to prevent clickjacking via frame embedding 2011-07-14 22:01:23 +02:00
Petr Skoda
595646d15b MDL-28344 remove the unused $CFG->framename 2011-07-14 21:40:50 +02:00
Petr Skoda
2d16dad0e1 MDL-23344 new option to autofocus username or password on the login form
Nearly everybody else does this login page autofocus. Once we switch to HMTL 5 we should use the new autofocus input option. I believe the admin setting should be enabled by default but it would not be possible to get it through the reviews.
2011-07-14 15:58:01 +02:00
Eloy Lafuente (stronk7)
21ba26e814 Merge branch 'w27_MDL-28158_m22_cookies' of git://github.com/skodak/moodle 2011-07-11 15:33:03 +02:00
Eloy Lafuente (stronk7)
75853bc5a5 Merge branch 'w27_MDL-28279_m22_flash' of git://github.com/skodak/moodle 2011-07-11 12:06:22 +02:00
Sam Hemelryk
e2d1b25a5a Merge branch 'w27_MDL-26965_m22_cohortuploaduser' of git://github.com/skodak/moodle 2011-07-11 16:11:50 +08:00
Sam Hemelryk
9dae5179cb Merge branch 'w27_MDL-22404_m22_cohortbulk' of git://github.com/skodak/moodle 2011-07-11 15:40:12 +08:00
Petr Skoda
56284322ea MDL-22404 bulk user add to cohort 2011-07-11 09:20:45 +02:00
Petr Skoda
0342fc3609 MDL-28158 add optional "Remember username" checkbox in login forms 2011-07-10 13:22:55 +02:00
Petr Skoda
cdbd37126d MDL-28279 remove flash client version blocking
Everybody is responsible for upgrades of Flash, there is no excuse any more.
2011-07-10 11:03:02 +02:00
Petr Skoda
92b59a56d1 MDL-26965 add support for uploading of users to cohorts via csv 2011-07-09 16:32:52 +02:00
Petr Skoda
5121a95da2 MDL-28273 waring that removing user from cohorts may unenrol from courses 2011-07-09 16:23:36 +02:00
Eloy Lafuente (stronk7)
b274bc55d0 Merge branch 'MDL-27279' of git://git.luns.net.uk/moodle 2011-07-07 00:01:08 +02:00
Sam Hemelryk
8323432992 Merge branch 'MDL-26611-take2' of git://git.luns.net.uk/moodle 2011-07-06 11:06:20 +08:00
Sam Hemelryk
5b966cbb3b Merge branch 'MDL-28135' of git://github.com/nebgor/moodle 2011-07-06 10:53:48 +08:00
Dan Poltawski
f2ad165538 MDL-26611 Roles Language - remove reference to 'legacy role type' 2011-07-05 10:23:00 +01:00
Aparup Banerjee
43d26e6d73 MDL-28135 general Updated doc links related to Release notes to docs.moodle.org/dev/Releases now 2011-07-05 14:29:47 +08:00
Tim Hunt
c141b05f7d MDL-25357 Allow maximum number of sections to be set by the admin. Also allow 0 sections at an choice.
Also fix one bad <br/> in another lang string.
2011-07-04 15:35:03 +01:00
Dan Poltawski
e9aa24736a MDL-27279 lang/en/xmldb - Fix Typo in confirmcheckforeignkeys 2011-07-02 12:56:09 +01:00
Eloy Lafuente (stronk7)
715a5bb732 MDL-27829 blocks - lang string fixes. Credit goes to Helen! 2011-07-01 20:38:06 +02:00
Eloy Lafuente (stronk7)
67fcc9989a Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-07-01 11:51:26 +02:00
Andrew Davis (andyjdavis)
2f9bdadfd2 MDL-27829 blocks: made the ability to add a block to all site administration pages work 2011-07-01 17:11:10 +08:00
Eloy Lafuente (stronk7)
91dc377b74 Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-30 16:39:45 +02:00
Andrew Davis (andyjdavis)
d097ad564d MDL-27829 blocks: added a warning to the block settings page that displays when the block was using a block type we dont let users select anymore 2011-06-30 17:44:50 +08:00
Andrew Davis (andyjdavis)
096928c79e MDL-27829 blocks: improved backwards compatibility for blocks set to display on page types we dont allow the user to select anymore 2011-06-30 16:42:28 +08:00
Andrew Davis (andyjdavis)
800688bd1e MDL-27829 blocks: added code to make the page type restrictions for blocks on admin setting pages make sense 2011-06-30 15:32:34 +08:00
Eloy Lafuente (stronk7)
586fecb80b Merge branch 'MDL-27149' of git://github.com/timhunt/moodle 2011-06-30 00:20:43 +02:00
Sam Hemelryk
f86e19b1ee Merge branch 'MDL-27829_block_pagetype_master' of git://github.com/andyjdavis/moodle 2011-06-29 17:04:13 +08:00
jamiepratt
13264f3505 MDL-27162 "localize strings in mathslib" needed to add mathslib file
to list of core language files in moodlelib.
2011-06-23 12:33:32 +01:00
Tim Hunt
da72991636 MDL-27979 Should be an edit link for each question when previewing or reviewing a quiz. 2011-06-22 21:07:40 +01:00
Andrew Davis (andyjdavis)
b822fc8511 MDL-27829 blocks: added some brains to generate_page_type_patterns() so that it can handle special cases like course reports 2011-06-22 17:01:21 +08:00
Tim Hunt
460797abbd MDL-27928 missing string in the question bank UI.
AMOS BEGIN
 MOV [categorymove,mod_quiz],[categorymove,question]
AMOS END
2011-06-19 10:44:44 +01:00
Tim Hunt
fde4560dae MDL-27490 Implement a manage question behaviours admin page
While doing this, I found various bugs in the manages question types admin page, and so fixed them, and updated the code
there to use $OUTPUT and html_writer.

AMOS BEGIN
 MOV [cannotdeletemissingqtype,admin],[cannotdeletemissingqtype,question]
 MOV [cannotdeleteqtypeinuse,admin],[cannotdeleteqtypeinuse,question]
 MOV [cannotdeleteqtypeneeded,admin],[cannotdeleteqtypeneeded,question]
 MOV [deleteqtypeareyousure,admin],[deleteqtypeareyousure,question]
 MOV [deleteqtypeareyousuremessage,admin],[deleteqtypeareyousuremessage,question]
 MOV [deletingqtype,admin],[deletingqtype,question]
 MOV [numquestions,admin],[numquestions,question]
 MOV [numquestionsandhidden,admin],[numquestionsandhidden,question]
 MOV [qtypedeletefiles,admin],[qtypedeletefiles,question]
 MOV [uninstallqtype,admin],[uninstallqtype,question]
AMOS END
2011-06-17 16:21:32 +01:00
Eloy Lafuente (stronk7)
a31a6ce32d MDL-27171 take rid of 2 wrong strings moved to forum/lang/xx/forum.php 2011-06-16 00:43:58 +02:00
Eloy Lafuente (stronk7)
a16e137f21 Merge branch 'MDL-27639_wip' of git://github.com/timhunt/moodle 2011-06-15 01:30:59 +02:00
Eloy Lafuente (stronk7)
ee1235e7af Merge branch 'backup-convert' of git://github.com/mudrd8mz/moodle 2011-06-14 22:38:27 +02:00
Tim Hunt
b8882c1334 MDL-27639 add two missing language strings.
Without these strings, important information for debugging is not displayed.
2011-06-14 12:10:27 +01:00
Sam Hemelryk
d8f85b6e8b Merged branch 's11_MDL-27552_token_master' of git@github.com:dongsheng/moodle.git with changes 2011-06-14 09:32:44 +08:00
Dongsheng Cai
13ea96c40b MDL-27552 get webservice token by providing username and password 2011-06-13 17:41:56 +08:00
Sam Hemelryk
46d3b9be73 Merged branch 's7_MDL-26105_block_settings_master' git://github.com/andyjdavis/moodle.git with changes 2011-06-13 16:54:52 +08:00
Eloy Lafuente (stronk7)
379f39eb9f Merge branch 'MDL-27789-qe2plugins' of git://github.com/mudrd8mz/moodle 2011-06-13 10:12:03 +02:00
Andrew Davis (andyjdavis)
35d725627c MDL-26105 blocks: added use of user friendly block settings to messaging 2011-06-10 13:52:53 +08:00
David Mudrak
a0166f5507 MDL-27792 Fixed missing core subsystem 2011-06-09 16:19:51 +02:00
David Mudrak
d1c77ac372 MDL-27789 The new question plugins reported as standard ones 2011-06-09 14:29:27 +02:00
David Mudrak
b61cf3ff8a MDL-22414 Merge branch 'master' into backup-convert
Conflicts:
	theme/base/style/core.css
2011-06-09 13:04:49 +02:00
Andrew Davis (andyjdavis)
fb794ab73c MDL-26105 blocks: fixed some php errors and made a help string better 2011-06-09 17:03:27 +08:00
Dongsheng Cai
b1627a92e5 MDL-26105 Block settings should contains less options, and be more user friendly
AMOS BEGIN
    MOV [page-blog-index, pagetype], [page-blog-index, blog]
    MOV [page-blog-x, pagetype], [page-blog-x, blog]
    MOV [page-tag-x, pagetype], [page-tag-x, tag]
    MOV [page-course-view-weeks, pagetype], [page-course-view-weeks, format_weeks]
    MOV [page-course-view-weeks-x, pagetype], [page-course-view-weeks-x, format_weeks]
    MOV [page-course-view-topics, pagetype], [page-course-view-topics, format_topics]
    MOV [page-course-view-topics-x, pagetype], [page-course-view-topics-x, format_topics]
AMOS END
2011-06-09 13:51:14 +08:00
Sam Hemelryk
00a33dcbac Merged branch 'MDL-26777-wip' of git://github.com/mouneyrac/moodle.git 2011-06-08 17:52:59 +08:00
Sam Hemelryk
96e0194c05 Merged branch 'MLD-27551' of git://github.com/mouneyrac/moodle.git with changes 2011-06-08 17:34:17 +08:00