Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: moodle/moodle
...
head fork: andyjdavis/moodle
compare: MDL-32192_copy_string_21
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Mar 12, 2012
@samhemelryk samhemelryk Merge branch 'MDL-28998-m21' of git://github.com/ankitagarwal/moodle …
…into MOODLE_21_STABLE
5c3f517
@rajeshtaneja rajeshtaneja MDL-27862 Themes: Strings updated on theme selection pages 960838e
@rajeshtaneja rajeshtaneja MDL-27862 Themes: Added button to un-select theme for devices, except…
… default device
2942426
@rajeshtaneja rajeshtaneja MDL-27862 Themes: replaced disabled use theme button with unset theme…
… button
c6a49f7
@rajeshtaneja rajeshtaneja MDL-27862 Themes: clear theme cache button will redirect to the page …
…on which it was pressed
ad3635a
@rajeshtaneja rajeshtaneja MDL-27862 Themes: Device name first letter is capital and font is mad…
…e similar to theme name font
d383e08
@rajeshtaneja rajeshtaneja MDL-28972 formslib: Checkbox controller will use yui to select and un…
…select checkboxes
2961a37
@rajeshtaneja rajeshtaneja MDL-28972 formslib: orignalvalue is considered and checkboxes are upd…
…ated depending on orignalvalue of controller
62b3a99
@mackensen mackensen MDL-31664 fix invalid boolean to string comparison 79795cd
@samhemelryk samhemelryk Merge branch 'MDL-27304-21' of https://github.com/mackensen/moodle in…
…to MOODLE_21_STABLE
81dc3b5
@samhemelryk samhemelryk MDL-27304 mod_wiki: Fixed up phpdocs for globals e2094c3
@samhemelryk samhemelryk Merge branch 'wip-MDL-27087-stable21' of git://github.com/phalacee/mo…
…odle into MOODLE_21_STABLE
06a31cb
@lazydaisy lazydaisy MDL-30298 coursereport_progress: adds outer wrapper with class no-ove…
…rflow to report table so as to enable horizontal scroll bar
fc2d52b
@stronk7 stronk7 Merge branch 'w11_MDL-31494_m21_adodblink' of git://github.com/skodak…
…/moodle into MOODLE_21_STABLE
2d2dfae
@skodak skodak MDL-31534 init PAGE before require_login() 373b8fb
@stronk7 stronk7 Merge branch 'w11_MDL-31534_m21_pageinitroot' of git://github.com/sko…
…dak/moodle into MOODLE_21_STABLE
3bc7584
@stronk7 stronk7 Merge branch 'w11_MDL-31815_m21_confirmemail' of git://github.com/sko…
…dak/moodle into MOODLE_21_STABLE
833af94
@skodak skodak MDL-31595 improve enrol link comments 96b421f
@stronk7 stronk7 Merge branch 'w11_MDL-31595_m21_enrolme' of git://github.com/skodak/m…
…oodle into MOODLE_21_STABLE
41c65d7
Brian Jorgensen MDL-31984: add debugging message if theme renderer file is missnamed 5ceb782
@micaherne micaherne MDL-31979 Typo in config-dist.php 4c4c719
@stronk7 stronk7 Merge branch 'w11_MDL-31956_m21_paypal' of git://github.com/skodak/mo…
…odle into MOODLE_21_STABLE
8135ecf
@samhemelryk samhemelryk Merge branch 'MDL-31702_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
421a853
@samhemelryk samhemelryk Merge branch 'MDL-30298_M21' of git://github.com/lazydaisy/moodle int…
…o MOODLE_21_STABLE
449fd68
@samhemelryk samhemelryk Merge branch 'w11_MDL-27457_m21_enrolnorecover' of git://github.com/s…
…kodak/moodle into MOODLE_21_STABLE
63f4993
Commits on Mar 13, 2012
Ruslan Kabalin MDL-31919 Fix assignment overview output to respect gradebook grading.
Currenly, if assigment has been graded in gradebook only, in the assigment
overview it is listed as not graded.
08fb6ca
Ruslan Kabalin MDL-31917 Improve assigment submission usability
Say 'View' if assignment has been graded via gradebook and changing
grades via submissions interface is not possible.
0b50793
Ruslan Kabalin MDL-31808 Upload assignment: fix user feedback display
Conflicts:

	mod/assignment/type/upload/assignment.class.php
1a19ad3
@davosmith davosmith MDL-31935 Fixed restore backup link in course search 7456f0b
@lazydaisy lazydaisy MDL-31008 themes: (base theme) reversed MDL-26712 by making dimmed ob…
…jects grey and added new rule for dimmed activity label text to give 50% transparancy instead
b713f5c
@nebgor nebgor MDL-31008 Themes : fixed css code style e92ca9d
@nebgor nebgor Merge branch 'MDL-30867_m21' of git://github.com/rwijaya/moodle into …
…MOODLE_21_STABLE
e785ca6
@nebgor nebgor Merge branch 'wip-mdl-30817-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
361492a
@rwijaya rwijaya MDL-31266 Lesson module: Improve feedback so that the responses are c…
…oncatenated instead of overwritten
5816961
@nebgor nebgor Merge branch 'wip-mdl-27862-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
a5d7e18
@stronk7 stronk7 Merge branch 'wip-MDL-31175-m21' of git://github.com/samhemelryk/mood…
…le into MOODLE_21_STABLE
651cf35
@andyjdavis andyjdavis MDL-31834 message: fixed up some not quite correct usage of moodle/si…
…te:readallmessages
0149696
@stronk7 stronk7 Merge branch 'MDL-31981_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
b434431
@ankitagarwal ankitagarwal MDL-28998 libraries: Using default value of 0 for userid during login e2835a5
@samhemelryk samhemelryk Merge branch 'MDL-29440-21_STABLE' of git://github.com/danpoltawski/m…
…oodle into MOODLE_21_STABLE
40ba373
@davosmith davosmith MDL-29147 Quickform fixed insertElementBefore to ignore duplicate unn…
…amed elements
9086379
Commits on Mar 14, 2012
@davosmith davosmith MDL-31853 Fix pagelayout problem with admin_externalpage_setup 4850ab6
@samhemelryk samhemelryk Merge branch 'wip-mdl-28972-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
3d9dff0
@marinaglancy marinaglancy MDL-32037: MDL-32037: After displaying error message filepicker could…
… not send proper request to server

We need to make sure that code executed on error does not create more requests and
especially does not create the same request that resulted with error. So now by default
filepicker will clear the right side of the window if repository_ajax.php returned an
error.
Also fixed an 'invalidsesskey' error string.
cbd6ad1
@stronk7 stronk7 MDL-28972 formslib: whitespace fixes 5d332d4
@danmarsden danmarsden MDL-32055 fix typo with flash player check d588f8c
@mackensen mackensen MDL-26243 calendar: display correct number of repeated events 2199fb2
Commits on Mar 15, 2012
AMOS bot Automatically generated installer lang files 4970d12
@jsnfwlr jsnfwlr MDL-27064 - Blog - Changing the link text for different levels of blo…
…g entries
9a47738
@rwijaya rwijaya MDL-30890 accessibility compliance: add summary to calendar table e77f635
@stronk7 stronk7 Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle i…
…nto MOODLE_21_STABLE
197cd28
@stronk7 stronk7 weekly release 2.1.5+ 3c4111e
@timhunt timhunt MDL-31594 question manual grading: did not handle comma as decimal. 8e30abf
@samhemelryk samhemelryk MDL-31528 navigation: Fixed up generation for category contexts ac7b47e
@samhemelryk samhemelryk MDL-31528 navigation: Fixed up navbar generation when editing categories ba23ddb
@samhemelryk samhemelryk MDL-31528 navigation: Tidied up page for viewing and managing categories fff39dc
Commits on Mar 16, 2012
@andyjdavis andyjdavis MDL-31835 message: added a view conversation type link after each con…
…versation on the recent conversation screen
4e1dd69
@ankitagarwal ankitagarwal MDL-28952 blocks: Fixing the extra escaping issue with profile links 33e8e9e
@skodak skodak MDL-32079 folder revision must be incremented after any file change 16b879e
@skodak skodak MDL-32071 fix fatal problems in experimental forum_usetextsearches 2c7a06e
@skodak skodak MDL-32071 fix incorrect get_dbfamily() call 6bdb01c
@timhunt timhunt MDL-32064 quiz navigation: JS form submit must fire submit event hand…
…lers.
73848c6
@skodak skodak MDL-32090 fix invalid group members url
Credit goes to Jean-Philippe Gaudreau.
d42aaae
Commits on Mar 17, 2012
AMOS bot Automatically generated installer lang files ddcb36b
@andyjdavis andyjdavis MDL-28187 message: fixed up $PAGE->set_url() in /message/index.php so…
… the nav highlighted properly
9d014d7
@lazydaisy lazydaisy MDL-32084 theme_fusion: removed default tagline in frontpage.php and …
…changed configtextarea to configtext in settings.php
4247b7d
Commits on Mar 18, 2012
@samhemelryk samhemelryk Merge branch 'MDL-30890_m21' of git://github.com/rwijaya/moodle into …
…MOODLE_21_STABLE
d0690af
Commits on Mar 19, 2012
@samhemelryk samhemelryk Merge branch 'MDL-31835_recent_conversations_21' of git://github.com/…
…andyjdavis/moodle into MOODLE_21_STABLE
5a7722e
@samhemelryk samhemelryk Merge branch 'MDL-28187_messaging_nav_21' of git://github.com/andyjda…
…vis/moodle into MOODLE_21_STABLE
b7fa2f9
@andrewnicols andrewnicols MDL-32004 Set the defaultrequestcategory correctly when deleting/crea…
…ting the default category
0f08848
@samhemelryk samhemelryk Merge branch 'wip-MDL-27064-stable21' of git://github.com/phalacee/mo…
…odle into MOODLE_21_STABLE
9ac6d34
@samhemelryk samhemelryk Merge branch 'm21_MDL-32055' of git://github.com/danmarsden/moodle in…
…to MOODLE_21_STABLE
70a63a7
@dvillemure dvillemure MDL-26674 wiki2.0: Fixed wiki activity log f346322
@rajeshtaneja rajeshtaneja MDL-26674 wiki2.0: cleaned wiki event logging patch fe8d2ef
@rajeshtaneja rajeshtaneja MDL-31640 course: Move to, edit and search functionality in search.ph…
…p is fixed with proper permission check
f9374e5
@rajeshtaneja rajeshtaneja MDL-31640 course: removed extra error message and using require_capab…
…ility
b99ec3e
@samhemelryk samhemelryk Merge branch 'MDL-31984_theme_renderer_file_debugging' of git://githu…
…b.com/ualberta-eclass/moodle into MOODLE_21_STABLE
ed85611
@samhemelryk samhemelryk MDL-31984 Fixed whitespace during integration 7a8c221
@samhemelryk samhemelryk MDL-31528 navigation: Fixed up missing break and optimised category.php 84b0900
@samhemelryk samhemelryk Merge branch 'wip-mdl-26674-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
2657240
@skodak skodak MDL-31703 allow serving of JavaScript from unsupported '/' dirroot 1e02608
@skodak skodak MDL-27553 admin: Fixed override bug c1608f4
@samhemelryk samhemelryk Merge branch 'w12_MDL-32090_m21_groupui' of git://github.com/skodak/m…
…oodle into MOODLE_21_STABLE
9231ed5
@samhemelryk samhemelryk Merge branch 'MDL-32084_M21' of git://github.com/lazydaisy/moodle int…
…o MOODLE_21_STABLE
2849965
@andrewnicols andrewnicols MDL-32065 Allow feedback images to be themed 9f1495a
@samhemelryk samhemelryk Merge branch 'MDL-32064_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
2aab431
@mkassaei mkassaei MDL-32048 mod_quiz: Question bank select/deselect all shows strange b…
…ehaviour in IE
8cac5c0
@mkassaei mkassaei MDL-32053 question: Question bank table displayed inconsistently 8fafe29
@samhemelryk samhemelryk Merge branch 'w12_MDL-32079_m21_folderrev' of git://github.com/skodak…
…/moodle into MOODLE_21_STABLE
d29f6eb
@samhemelryk samhemelryk Merge branch 'w12_MDL-32071_m21_dbfamily' of git://github.com/skodak/…
…moodle into MOODLE_21_STABLE
a11492d
Commits on Mar 20, 2012
@samhemelryk samhemelryk Merge branch 'wip-MDL-32037-MOODLE_21_STABLE' of git://github.com/mar…
…inaglancy/moodle into MOODLE_21_STABLE
fa93616
@marinaglancy marinaglancy MDL-32036: Repositories wikimedia and youtube lack paging
repositories wikimedia and youtube:
- save last search in
- process parameter 'page'
- remove buttons 'Refresh', 'Search' and 'Logout' since they don't have meaning
filepicker:
- allow unknown number of pages (['pages'] = -1), show one 'Next' page after the current (both JS and non-JS modes)
repository wikimedia:
- add non-AJAX search form to make it work with JS disabled
97e990c
@samhemelryk samhemelryk Merge branch 'wip-MDL-32036-MOODLE_21_STABLE' of git://github.com/mar…
…inaglancy/moodle into MOODLE_21_STABLE
404958a
@nebgor nebgor Merge branch 'wip-MDL-31528-m21' of git://github.com/samhemelryk/mood…
…le into MOODLE_21_STABLE
49e45d0
@ankitagarwal ankitagarwal MDL-28592 blocks: changing the arguments to moodle_url::out() db378fe
@rajeshtaneja rajeshtaneja MDL-29331 Users: Participants list with user_details now show check b…
…ox for bluk operation
da5f922
@rwijaya rwijaya MDL-27710 lesson module: add the following jump options: unseen branc…
…h page, random page and random branch
1bca128
@nebgor nebgor Merge branch 'MDL-29848-21' of https://github.com/mackensen/moodle in…
…to MOODLE_21_STABLE
c8f9566
@nebgor nebgor MDL-29848 glossary: fixed whitespace 3bc6e06
@rwijaya rwijaya MDL-31775 Lesson Module: fixed start at last page seen bug 5577a1a
@danpoltawski danpoltawski Merge branch 'MDL-31266_m21' of git://github.com/rwijaya/moodle into …
…MOODLE_21_STABLE
f5fd808
@samhemelryk samhemelryk Merge branch 'MDL-32065-MOODLE_21_STABLE-1' of git://git.luns.net.uk/…
…moodle into MOODLE_21_STABLE
e5f9484
@samhemelryk samhemelryk Merge branch 'MDL-28952-m21' of git://github.com/ankitagarwal/moodle …
…into MOODLE_21_STABLE
7ad2002
@samhemelryk samhemelryk Merge branch 'wip-mdl-31640-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
a7dedc5
Commits on Mar 21, 2012
@samhemelryk samhemelryk MDL-31528 category: Fixed use of lang_string class 2eaa6c2
@andyjdavis andyjdavis MDL-31818 grade: removed some broken code to do with overriding stude…
…nts per page, added a post variable so the page isnt lost when submitting grades
989e8b7
@samhemelryk samhemelryk MDL-31528 categories: Fixed up typo and function call 912ec1f
Commits on Mar 22, 2012
@danmarsden danmarsden MDL-32147 SCORM improve performance of 404s for files inside SCORM pa…
…ckages.
5d2930d
@danmarsden danmarsden MDL-32147 - use correct 404 for server type d23a6b0
@samhemelryk samhemelryk Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle i…
…nto MOODLE_21_STABLE
0982968
@samhemelryk samhemelryk weekly release 2.1.5+ a7899ca
Commits on Mar 23, 2012
@rwijaya rwijaya MDL-32172 Lesson Module: add variable initialization for 08b69b2
Commits on Mar 25, 2012
@lazydaisy lazydaisy MDL-30019 theme_fusion: fix for mod-assignment-submission page by red…
…ucing font-size and page wapper padding
425a72f
Ruslan Kabalin MDL-32026 messaging: Fix non-existing variable in the error output
Conflicts:

	lib/messagelib.php
fa13450
@danpoltawski danpoltawski MDL-29400 assignment: Require a file to be uploaded in form
Don't display 'File uploaded successfully' when no file uploaded for
both upload and uploadsingle
05d8d4a
Juho Viitasalo MDL-31903 course: Fixed course highlight icon and title toggle c62eeed
@rajeshtaneja rajeshtaneja MDL-31903 course: update patch to fix course highlight icon and title…
… toggle
690cf46
@rajeshtaneja rajeshtaneja MDL-31903 course: Highlight icon will get iniatlised properly 65df3cd
@rajeshtaneja rajeshtaneja MDL-31903 course: Title on highlight and hide icon should be only add…
…ed in ie
a8f7ec4
@samhemelryk samhemelryk Merge branch 'wip-mdl-29331-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
8a4aa94
@andrewnicols andrewnicols MDL-32142 Add missing langstring for section backups 81e33e7
@yuyokk yuyokk MDL-31513 rename 'Edit service' to 'Save changes' 94c2ba8
Commits on Mar 26, 2012
@ankitagarwal ankitagarwal MDL-22510 libraries: Set wantsurl only when $setwantsurltome is set in
require_login
4d8cb11
@marinaglancy marinaglancy MDL-32106: fixed JS bug - when html element did not exist the script …
…stopped
1d0ac18
@danpoltawski danpoltawski Merge branch 'MDL-27710_m21' of git://github.com/rwijaya/moodle into …
…MOODLE_21_STABLE
d6e3be6
@kanikagoyal kanikagoyal MDL-31856, if choice not open, responses inconsistently displayed fa913a3
@danpoltawski danpoltawski Merge branch 'MDL-32172_m21' of git://github.com/rwijaya/moodle into …
…MOODLE_21_STABLE
8b2aff4
@danpoltawski danpoltawski Merge branch 'MDL-31775_m21' of git://github.com/rwijaya/moodle into …
…MOODLE_21_STABLE
38dbeec
@samhemelryk samhemelryk Merge branch 'm21_MDL-32147' of git://github.com/danmarsden/moodle in…
…to MOODLE_21_STABLE
88ead1b
@samhemelryk samhemelryk Merge branch 'MDL-22510-m21' of git://github.com/ankitagarwal/moodle …
…into MOODLE_21_STABLE
c4d7207
Commits on Mar 27, 2012
@tlock tlock MDL-31869: Searching for users in messaging with multiple roles gener…
…ates a warning
77c5c20
@nebgor nebgor Merge branch 'wip-MDL-32106-MOODLE_21_STABLE' of git://github.com/mar…
…inaglancy/moodle into MOODLE_21_STABLE
3d06074
@andrewnicols andrewnicols MDL-31914 Ensure that completion criteria are deleted when removing a…
… course module

Conflicts:

	lib/db/upgrade.php
	version.php

Conflicts:

	version.php
a8a0767
@danpoltawski danpoltawski MDL-31775 lesson: fix undefined variable warnings a16f0a3
Commits on Mar 29, 2012
AMOS bot Automatically generated installer lang files 9ea53a1
@danpoltawski danpoltawski Revert "MDL-31914 Ensure that completion criteria are deleted when re…
…moving a course module"

This reverts commit a8a0767.
5703599
@stronk7 stronk7 Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle i…
…nto MOODLE_21_STABLE
539eb19
@stronk7 stronk7 weekly release 2.1.5+ c54172b
@timhunt timhunt MDL-32220 question import: files sometimes stored in the wrong context.
Sadly, this involves a small API change, but I don't believe anyone was
using the argument I had to remove (because we were sometimes passing a
wrong value, and there is not way to compute the right value at that
point in the code.)

Also sadly, the code to compute the context we are importing into is now
rather spaghetti-like, but it works.

Conflicts:

	question/format/examview/format.php
	question/format/learnwise/format.php
	question/format/webct/format.php

Conflicts:

	question/format/upgrade.txt
64f4979
@timhunt timhunt MDL-32246 question export: should cope with unrecognised qtypes.
If a question is of an unrecognised type, then we just omit it from the export.
1fdd740
@timhunt timhunt MDL-32239 question bank: wrong cap checks editing/viewing quesitions
None of these problems affect the default roles. They only occur when
the permissions have been edited to allow restricted subsets of the
question capabilities.

In some cases, things that the restriced subset of capabilities should
have allowed were blocked by errors. In other cases, users were allowed
to do more than they should bave been due to failures to check the
right capabilities in the right places.

For full details, see the bug report.

Two of the bugs were previously reported separately as MDL-26395 and
MDL-27232.
0f83dd1
@timhunt timhunt MDL-32240 quiz editing: check permissions questions are added.
We also check permissions when removing questions from the quiz, so that
we do not let users make mistakes they cannot immediately undo.

Conflicts:

	mod/quiz/editlib.php
016660c
@mudrd8mz mudrd8mz MDL-32258 database module does not have any data_cron() function to e…
…xecute
9f6c79e
@timhunt timhunt MDL-32201 question export: use qformat_xml::write_answer in base class
Without this, images in answers were not being written to the export
file for questions using extra_answer_fields.
5b662f3
@timhunt timhunt MDL-32039 qeupgradehelper: fix typos in the lang strings
Conflicts:

	admin/tool/qeupgradehelper/lang/en/tool_qeupgradehelper.php
9fd2278
@samhemelryk samhemelryk MDL-32264 theme_standard: Fixed multi-day calendar event border issue 5fab704
@samhemelryk samhemelryk MDL-32018 mod_wiki: Improved form definitions to ensure they consiste…
…nt and secure
4e05e64
@samhemelryk samhemelryk MDL-32018 mod_wiki: Fixed formatting of the page title so that is is …
…consistent and secure
2ab3134
@samhemelryk samhemelryk MDL-32018 mod_wiki: Fixed up whitespace after peer-review 0056819
@samhemelryk samhemelryk MDL-29678 navigation: Navigation AJAX require_login calls no longer s…
…et wantsurl or redirect
a897a25
@samhemelryk samhemelryk MDL-29678 lib: Require login now overrides to false for AJAX scripts 8491ee2
Commits on Mar 30, 2012
@jsnfwlr jsnfwlr MDL-30784 - lib - Patch provided by Jason Hardin to provide detection…
… for Android Tablets to allow the theme engine to provide the tablet theme
f674eb8
AMOS bot Automatically generated installer lang files f2e6b40
@rajeshtaneja rajeshtaneja MDL-30904 Calendar: Event links are descriptive with hidden event nam…
…e, for screen readers
c7f8a54
@rajeshtaneja rajeshtaneja MDL-32150 Libraries: checkall and uncheckall will not select disabled…
… or readonly checkboxes
22e4bd4
@skodak skodak MDL-32141 back port latest TinyMCE 3.4.9 5405de1
@rajeshtaneja rajeshtaneja MDL-30051 cron: login error sql is now cross db 8f343c6
@rwijaya rwijaya MDL-30843 and MDL-30842 - accessibility compliance: Add <label> for f…
…orm input text and select tag
0add004
Commits on Mar 31, 2012
@lazydaisy lazydaisy MDL-32262 theme_afterburner: fixed missing comma in afterburner_style…
…s.css
31489a4
Commits on Apr 01, 2012
@lazydaisy lazydaisy MDL-32289 theme_afterburner: added lang menu to frontpage layout in c…
…onfig.php
5023419
@samhemelryk samhemelryk Merge branch 'MDL-32289_M21' of git://github.com/lazydaisy/moodle int…
…o MOODLE_21_STABLE
c185ac1
@kanikagoyal kanikagoyal MDL-31908 Glossary: entry list format- printable version does not sho…
…w content
a2e7655
@samhemelryk samhemelryk Merge branch 'MDL-32258-data-cron_21_STABLE' of git://github.com/mudr…
…d8mz/moodle into MOODLE_21_STABLE
50cc39f
Commits on Apr 02, 2012
@danpoltawski danpoltawski Merge branch 'MDL-32201_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
9807bef
@danpoltawski danpoltawski Merge branch 'MDL-32246_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
5e84c2e
@rajeshtaneja rajeshtaneja MDL-32150 Libraries: checkbox controller will not check or uncheck fr…
…eezed checkboxes
1180f2d
@danpoltawski danpoltawski Merge branch 'wip-MDL-32264-m21' of git://github.com/samhemelryk/mood…
…le into MOODLE_21_STABLE
58b4ff5
@samhemelryk samhemelryk Merge branch 'MDL-32239_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
6931d54
@mkassaei mkassaei MDL-32214 quiz regrading: with many attempts, PHP runs out of memory 2d8d024
@grabs grabs MDL-31768 - it is not possible to add a picture to the thanks page in…
… feedback
21cadef
@danpoltawski danpoltawski Merge branch 'MDL-32039_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
7d7331b
@davosmith davosmith MDL-32213 Question upgrade now correctly handles non-core manually-gr…
…aded question types
a006cb4
@samhemelryk samhemelryk Merge branch 'wip-mdl-32150-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
3e14545
Commits on Apr 03, 2012
@danpoltawski danpoltawski Merge branch 'MDL-32220_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
a76a53a
@rajeshtaneja rajeshtaneja MDL-32270 Library: ->defaulthomepage is checked before used d5830dd
@danpoltawski danpoltawski Merge branch 'wip-mdl-30904-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
3eaee3a
@marinaglancy marinaglancy MDL-32171: add 'Manage' link to Picasa repository
Conflicts:

	repository/picasa/lib.php
7e7fbf6
@nebgor nebgor Merge branch 'wip-MDL-30784-stable21' of git://github.com/phalacee/mo…
…odle into MOODLE_21_STABLE
a0bf107
@nebgor nebgor Merge branch 'w14_MDL-32141_m21_tinymce' of git://github.com/skodak/m…
…oodle into MOODLE_21_STABLE
e496f11
@nebgor nebgor MDL-32141 lib : update thirdpartylibs.xml to TinyMCE 3.4.9 e8f075b
@stronk7 stronk7 Merge branch 'wip-MDL-32018-m21' of git://github.com/samhemelryk/mood…
…le into MOODLE_21_STABLE
ee72fe8
@stronk7 stronk7 Merge branch 'wip-MDL-29678-m21' of git://github.com/samhemelryk/mood…
…le into MOODLE_21_STABLE
471b1c8
@stronk7 stronk7 Merge branch 'MDL-32240_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
80a9e2a
Commits on Apr 04, 2012
@samhemelryk samhemelryk MDL-31631 navigation: Removed caching of activities and sections arra…
…ys in favour of relying on cminfo caching
ed1163b
@nebgor nebgor Merge branch 'wip-MDL-31631-m21' of git://github.com/samhemelryk/mood…
…le into MOODLE_21_STABLE
69d0176
Commits on Apr 05, 2012
@nebgor nebgor Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle i…
…nto MOODLE_21_STABLE
a0e75f0
@nebgor nebgor weekly release 2.1.5+ 4b3ee4f
Commits on Apr 07, 2012
@grabs grabs MDL-32124 - mails to non respondents are sent as plain text with html…
…-tags
53dcf63
@ppichet ppichet MDL-32217_21 Setting options->unitgradingtype
Signed-off-by: ppichet <pichet.pierre@uqam.ca>
ff4d877
Commits on Apr 09, 2012
AMOS bot Automatically generated installer lang files 4f7d9de
Hugh Davenport MDL-32308 Fix error when testing id of guest user 4d6bcda
@grabs grabs MDL-32316 feedback: fix tem type label does honor trusted text c5c7879
@samhemelryk samhemelryk Merge branch 'wip-mdl-32270-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
56e270e
@samhemelryk samhemelryk Merge branch 'MDL-30843_b_m21' of git://github.com/rwijaya/moodle int…
…o MOODLE_21_STABLE
ea71709
Commits on Apr 10, 2012
@danpoltawski danpoltawski Merge branch 'wip-mdl-30051-m21' of git://github.com/rajeshtaneja/moo…
…dle into MOODLE_21_STABLE
4c9d373
@jsnfwlr jsnfwlr MDL-27427 - Blog - Adding ability to delete entries from external blogs 5cd936c
@samhemelryk samhemelryk Merge branch 'MDL-32124_21_wip' of git://github.com/grabs/moodle into…
… MOODLE_21_STABLE
365e69b
@samhemelryk samhemelryk MDL-32124 mod_feedback: Cleanup post-integration of unused var e17f0d3
@samhemelryk samhemelryk MDL-32393 navigation: Fixed up issue when rendering action_link insta…
…nces for the navigation
5c2a2f2
Commits on Apr 11, 2012
@danpoltawski danpoltawski Merge branch 'MDL-32217_21' of git://github.com/ppichet/moodle into M…
…OODLE_21_STABLE
d08845f
@samhemelryk samhemelryk Revert "MDL-30843 and MDL-30842 - accessibility compliance: Add <labe…
…l> for form input text and select tag"

This reverts commit 0add004.
fad5279
@mouneyrac mouneyrac MDL-27547 When deleting a local plugin containing a built-in service,…
… the built-in service is not deleted
a49c98f
@danmarsden danmarsden MDL-32388 SCORM: Fix chrome pop-ups 133e7f3
Commits on Apr 12, 2012
AMOS bot Automatically generated installer lang files bf5ff54
@andyjdavis andyjdavis MDL-30819 grade: fixed column highlighting on the grader report 2a2a830
@andyjdavis andyjdavis MDL-30955 rating: corrected /rating/index.php as it was determining t…
…he maximum rating incorrectly for custom scales
211bb24
@danpoltawski danpoltawski Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle i…
…nto MOODLE_21_STABLE
6d73da4
@danpoltawski danpoltawski weekly release 2.1.5+ 8e35d0a
@skodak skodak MDL-30026 improve session lock acquire timeouts and other minor cleanup
This is partially based on original patch by Tony Levi.
a6ecee4
@stronk7 stronk7 MDL-30026 improve session lock - unit tests & minor comment fixup adb6cdb
@stronk7 stronk7 MDL-30026 improve session lock - mssql workaround for bug with scalar…
… returned values
54b0eec
@stronk7 stronk7 MDL-30026 improve session lock - stronger detection for oracle a16230a
@stronk7 stronk7 MDL-30026 dml - fix sqlsrv support for session locks dfd6a60
@merrill-oakland merrill-oakland MDL-32353 backup: Flaw in settings logic for user info and anonymise 14d8d5a
Commits on Apr 13, 2012
@mudrd8mz mudrd8mz MDL-25660 workshop registers events in the calendar 5f05ebc
@mudrd8mz mudrd8mz MDL-25660 recreate all workshop calendar events
Due to complex workshop upgrade path from 1.9 and missing calendar events
support in 2.x, the only safe way to get rid of potentially invalid
calendar events (such as those reported in MDL-26687) is to remove all
current workshop events and recreate them from scratch.
3108a0f
@mudrd8mz mudrd8mz MDL-25660 workshop removes its calendar events on instance deletion f58b7c2
Commits on Apr 14, 2012
AMOS bot Automatically generated installer lang files 7d5af12
@lazydaisy lazydaisy MDL-32385 theme_base: adds line-height:normal in style/course.css for…
… section summary
fcb0c7f
@timhunt timhunt MDL-32404 question export: missing error message when exporting an em…
…pty category.
57fe307
@merrill-oakland merrill-oakland MDL-32442 questionupgrade: error in SQL from postgres systems 75831af
Commits on Apr 15, 2012
@lazydaisy lazydaisy MDL-32444 theme_afterburner: adds 5px margin to the left of #loginbtn…
…, input, button, select in /style/afterburner_styles.css
52bb093
@skodak skodak MDL-32437 fix invalid gradebook query sql f0aeced
@samhemelryk samhemelryk Merge branch 'MDL-27547-MOODLE_21_STABLE' of git://github.com/mouneyr…
…ac/moodle into MOODLE_21_STABLE
84aabea
@samhemelryk samhemelryk Merge branch 'MDL-32316_21_wip' of git://github.com/grabs/moodle into…
… MOODLE_21_STABLE
a38d62e
@samhemelryk samhemelryk Merge branch 'MDL-30955_forum_ratings_21' of git://github.com/andyjda…
…vis/moodle into MOODLE_21_STABLE
6535721
@samhemelryk samhemelryk Merge branch 'MDL-30819_grader_col_highlight_21' of git://github.com/…
…andyjdavis/moodle into MOODLE_21_STABLE
0eeb087
Commits on Apr 16, 2012
@samhemelryk samhemelryk Merge branch 'm21_MDL-32388' of git://github.com/danmarsden/moodle in…
…to MOODLE_21_STABLE
50ff77d
@ppichet ppichet MDL-32358 : numerical question: validation messages errors
The selected unit parameter is added answer paramter when renderer call
 $question->get_validation_error() so that it mimics the
is_complete_response(array $response) structure.
8886f0a
@danpoltawski danpoltawski Merge branch 'MDL-32442_m21' of git://github.com/merrill-oakland/mood…
…le into MOODLE_21_STABLE
8876dd3
@samhemelryk samhemelryk Merge branch 'MDL-32353_m21' of git://github.com/merrill-oakland/mood…
…le into MOODLE_21_STABLE
f0c351f
@samhemelryk samhemelryk MDL-32353 fixed up very minor whitespace 93deef3
@merrill-oakland merrill-oakland MDL-32443 qeupgradehelper: Add cli tool to execute qeupgrade helper 5e76b4a
@samhemelryk samhemelryk Merge branch 'MDL-32444_M21' of git://github.com/lazydaisy/moodle int…
…o MOODLE_21_STABLE
f2994d7
@danpoltawski danpoltawski Merge branch 'MDL-32404_21' of git://github.com/timhunt/moodle into M…
…OODLE_21_STABLE
a9b7100
@samhemelryk samhemelryk Merge branch 'MDL-32385_M21' of git://github.com/lazydaisy/moodle int…
…o MOODLE_21_STABLE
b83306c
@danpoltawski danpoltawski Merge branch 'MDL-32443_m21' of git://github.com/merrill-oakland/mood…
…le into MOODLE_21_STABLE
c046a3f
@danpoltawski danpoltawski MDL-32443 queupgradehelper cli: fix path & whitespace c175e01
@danpoltawski danpoltawski Merge branch 'wip-MDL-32393-m21' of git://github.com/samhemelryk/mood…
…le into MOODLE_21_STABLE
bde399d
@mouneyrac mouneyrac MDL-31694 Fix XSS security issue with service name accepting javascript 4b8da40
@danpoltawski danpoltawski Merge branch 'MDL-32358_21' of https://github.com/ppichet/moodle into…
… MOODLE_21_STABLE
dd9841f
@danpoltawski danpoltawski Merge branch 'w16_MDL-32437_m21_tablename' of git://github.com/skodak…
…/moodle into MOODLE_21_STABLE
8a2b5c4
Commits on Apr 17, 2012
AMOS bot Automatically generated installer lang files d5f9cfc
@danpoltawski danpoltawski Merge branch 'MDL-25660-workshop-calendar_21' of git://github.com/mud…
…rd8mz/moodle into MOODLE_21_STABLE
d89ebcc
@mouneyrac mouneyrac MDL-30225 Creating new web service tokens create error 993debd
@stronk7 stronk7 Merge branch 'w16_MDL-30242_m21_session' of git://github.com/skodak/m…
…oodle into MOODLE_21_STABLE
721c418
Commits on Apr 18, 2012
@andrewnicols andrewnicols MDL-32061 Use old lesson_answer ID and correct when restoring lesson …
…attempts
6475153
Commits on Apr 19, 2012
@danpoltawski danpoltawski Merge branch 'install_21_STABLE' of git://github.com/amosbot/moodle i…
…nto MOODLE_21_STABLE
c003806
@danpoltawski danpoltawski weekly release 2.1.5+ bd44a3b
Commits on Apr 21, 2012
@andyjdavis andyjdavis MDL-32191 grade:renamed a mis-spelled string name
AMOS BEGIN
 CPY [invalidgradeitmeid,error],[invalidgradeitemid,error]
AMOS END
24ca82d