Commit graph

56823 commits

Author SHA1 Message Date
Sam Hemelryk
a2400fcf71 Merge branch 'MDL-37295-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE 2013-01-21 10:18:10 +13:00
Sam Hemelryk
cf7ace8a37 Merge branch 'MDL-35817_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2013-01-21 09:46:01 +13:00
Sam Hemelryk
cfdc33bf08 Merge branch 'MDL-36757_hidden_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2013-01-21 09:31:12 +13:00
Petr Škoda
bb92d9053c MDL-37559 fix display of multiple roles of other users
Credit goes to Tyron Delean, thanks.
2013-01-19 16:52:03 +01:00
Tim Hunt
af8ce622b0 MDL-28512 qtype essay: clean up properly when a question is deleted. 2013-01-18 11:52:33 +00:00
Mark Nelson
a12d510c35 MDL-35924 filemanager: added label for the input field when creating a new folder 2013-01-18 15:35:48 +08:00
Mark Nelson
c56248f14b MDL-37275 webservices: ensure a webservice function is chosen before attempting to add to service 2013-01-18 15:33:46 +08:00
Dan Poltawski
e61f96c55b weekly release 2.3.4+ 2013-01-18 14:32:02 +08:00
Dan Poltawski
fa0218be0e Merge branch 'install_23_STABLE' of git://git.moodle.cz/moodle-install into MOODLE_23_STABLE 2013-01-18 14:31:25 +08:00
Ankit Agarwal
a518f7eff5 MDL-37295 forum: Parse old log entries during restore 2013-01-17 14:33:21 +08:00
Rajesh Taneja
b61ab6193b MDL-35873 Blocks: Fixed roles icon 2013-01-17 14:04:16 +08:00
Dan Poltawski
92a3802c39 Merge branch 'wip-mdl-29534-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2013-01-17 13:48:42 +08:00
Rajesh Taneja
532da94d0e MDL-29534 Forum: Fixed userfrom reference problem 2013-01-17 13:49:11 +08:00
Rossiani Wijaya
e99486c448 MDL-35817 login: convert html tag to use html_writer and change <a> tag id to be more specific to login 2013-01-17 13:06:58 +08:00
Rossiani Wijaya
a59dc25d6d MDL-35817 Login: set page focus to error message for login error 2013-01-17 13:06:50 +08:00
Damyon Wiese
508f42e2f1 MDL-37539 Assignment upgrade: Disable submission comments if allow notes was not enabled.
For advanced upload of files only - this setting was stored in var2.

Conflicts:

	mod/assign/submission/comments/locallib.php
2013-01-17 12:17:38 +08:00
Damyon Wiese
f20d185c87 MDL-37540 Assignment upgrade: Upgrade setting "Hide description before due date"
Advanced upload of files has this setting which is stored in var3.
2013-01-17 11:57:10 +08:00
Rajesh Taneja
4c4ade1ca9 MDL-35780 Administration: current user email should be always displayed on participants page 2013-01-17 11:57:07 +08:00
Andrew Davis
f86473cebc MDL-36757 course: avoid accidently overwriting the hidden/visible values set on grade items 2013-01-17 11:37:09 +08:00
Damyon Wiese
5be632e8b6 MDL-37543 Assignment upgrade: convert advanced upload files "Send for marking" setting
Advanced upload files assignment type has "Enable send for marking" setting instead
of "Allow resubmissions". Needs special handling in upgrade code to convert to
"Require students click submit button".

Conflicts:

	mod/assign/submission/file/locallib.php
2013-01-17 11:29:58 +08:00
Dan Poltawski
5919718019 Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-01-17 10:23:15 +08:00
Eloy Lafuente (stronk7)
d10ca0e697 MDL-37555 Apply realpath() 2 CFG->phpunit_dataroot 2013-01-16 20:54:57 +01:00
Tim Hunt
0ad7caf4c3 MDL-31616 blocks: ensure showinsubcontexts is only 0 or 1 in the DB. 2013-01-16 19:15:44 +01:00
Tim Hunt
4ca741e456 MDL-37374 questions: fix property_exists calls. 2013-01-16 11:21:03 +00:00
Rajesh Taneja
2ed251d007 MDL-32526 Course: After creating course user should be redirected to newly created course
After creating a new course if user has capability to enrol users then
enrol user page should be visible else user should see newly created course
2013-01-16 16:30:02 +08:00
Rajesh Taneja
178d99677b MDL-35873 Blocks: Made alt-text on block control icons more descriptive
Conflicts:
	lib/blocklib.php
2013-01-16 18:28:33 +13:00
Damyon Wiese
c5c330babc MDL-37527 Assignment - Change query for print_overview so it uses an index (postgres)
Reported by Mark Neilsen.

Conflicts:

	mod/assign/lib.php
2013-01-16 13:18:16 +08:00
Davo Smith
1d8066e2d0 MDL-31484 backup - repeated restores with anonymised users now works correctly 2013-01-16 11:45:57 +08:00
Dan Poltawski
50dcac01eb Merge branch 'MDL-36412-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-01-16 09:57:01 +08:00
Rajesh Taneja
b3f92c0ab7 MDL-37339 Administration: Unique custom profile should not be checked if it's empty.
Currently we have two options for custom profile fields 'Unique' and 'Required'
If value s not entered for unique and not required field then we should allow
duplicate empty values. If value is entered then we should check for unique input.
In case field is unique and required then it should be always checked as required
field can't be empty.
2013-01-16 09:47:07 +08:00
Dan Poltawski
1962821cf5 MDL-37313 question: fix trailing whitespace 2013-01-16 09:40:32 +08:00
Dan Poltawski
cd0523a78e Merge branch 'MDL-37313_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE 2013-01-16 09:40:07 +08:00
AMOS bot
31f183fd73 Automatically generated installer lang files 2013-01-16 00:43:45 +00:00
Sam Hemelryk
9bc178f3e6 Merge branch 'wip-MDL-35818-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE 2013-01-16 11:03:09 +13:00
Eloy Lafuente (stronk7)
7cf0504ac6 Merge branch 'MDL-37173-m23' of git://github.com/andrewnicols/moodle into MOODLE_23_STABLE 2013-01-15 21:56:49 +01:00
Eloy Lafuente (stronk7)
5d112775e9 Merge branch 'MDL-37354-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE 2013-01-15 21:51:38 +01:00
Eloy Lafuente (stronk7)
5a3aaea503 Revert "MDL-33117 grade: adding unit tests for the user report function inject_rowspans()"
This reverts commit b65bd8b658.
2013-01-15 21:35:02 +01:00
Eloy Lafuente (stronk7)
34db04595e Revert "MDL-33117 Whitespace fixes"
This reverts commit 5696c69b3b.
2013-01-15 21:34:41 +01:00
Eloy Lafuente (stronk7)
5f2d7b3009 Merge branch 'MDL-31616_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-01-15 20:16:29 +01:00
Eloy Lafuente (stronk7)
09ebf8386a Merge branch 'wip-mdl-37062-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2013-01-15 20:06:26 +01:00
Eloy Lafuente (stronk7)
d7b3cced54 NOBUG: 1 more whitespace, was hurting my eyes all the time. 2013-01-15 19:19:04 +01:00
Eloy Lafuente (stronk7)
5696c69b3b MDL-33117 Whitespace fixes 2013-01-15 19:11:48 +01:00
Eloy Lafuente (stronk7)
4090cd2b92 Merge branch 'MDL-34883_unit_tests_23' of git://github.com/andyjdavis/moodle into MOODLE_23_STABLE 2013-01-15 18:21:35 +01:00
Eloy Lafuente (stronk7)
dc43bfe372 Merge branch 'MDL-37395-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE 2013-01-15 18:17:33 +01:00
sam marshall
f84e58d809 MDL-34612 Grade condition range validation allows impossible conditions 2013-01-15 12:48:30 +00:00
Ben Johnson
e6b9308a23 MDL-36421 SCORM: fix SCORM course format new window popups 2013-01-15 23:18:22 +13:00
Dan Poltawski
ded1043407 Merge branch 'MDL-37162_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE 2013-01-15 13:34:02 +08:00
Dan Poltawski
b175cf2c72 Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-01-15 12:59:54 +08:00
Jason Fowler
0da02e0a20 MDL-30316 - Libraries - improving pagination output to allow a shifting start page for displays of less than 18 pages -- original code provided by Martha (martha dot morelos at gmail dot com) 2013-01-15 12:50:05 +08:00
Dan Poltawski
25ad1dea0e Merge branch 'MDL-29835_23' of git://github.com/pauln/moodle into MOODLE_23_STABLE 2013-01-15 12:42:09 +08:00