Eloy Lafuente (stronk7)
19740fe4a6
Merge branch 'MDL-37539-23' of github.com:damyon/moodle into MOODLE_23_STABLE
2013-01-22 01:06:23 +01:00
Eloy Lafuente (stronk7)
4e3f4bd9be
Merge branch 'MDL-28512_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2013-01-22 01:02:34 +01:00
Aaron Barnes
c208efa04c
MDL-37473 completion: Add missing cap checks to tracked users functions
...
Namely get_num_tracked_users and is_tracked_user()
2013-01-22 11:27:21 +13:00
Sam Hemelryk
8f3ae32b88
Merge branch 'MDL-37563-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE
2013-01-22 09:10:23 +13:00
Eloy Lafuente (stronk7)
9d2f74684c
Merge branch 'MDL-37577_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
2013-01-21 20:01:56 +01:00
Eloy Lafuente (stronk7)
ee7411c4b6
Merge branch 'MDL-35924_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE
2013-01-21 19:44:27 +01:00
Eloy Lafuente (stronk7)
fd843c7f22
Merge branch 'MDL-34050_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE
2013-01-21 16:47:45 +01:00
Tim Hunt
5f9a56011e
MDL-37577 quiz overdue handling: optimise database query
...
This is the standard trick of adding a redundant WHERE clause to a
subquery to help the database realise that it does not have to inspect
so many rows.
2013-01-21 13:24:01 +00:00
Tim Hunt
fb5819b13c
MDL-37599 question import: add missing string.
...
AMOS BEGIN
MOV [matcherror,question],[invalidgrade,question]
AMOS END
2013-01-21 12:12:50 +00:00
Michael de Raadt
54a25a2f88
MDL-35357 Lesson Module: fixed undefined property for $answerformat
2013-01-21 15:42:52 +08:00
Aparup Banerjee
d971df89b1
Merge branch 'w03_MDL-37559_m23_otherusers' of git://github.com/skodak/moodle into MOODLE_23_STABLE
2013-01-21 15:26:51 +08:00
Rossiani Wijaya
93a91776f6
MDL-37375 Report: fixed blog post link from course activity report
2013-01-21 14:57:05 +08:00
Mark Nelson
55ab55ba5c
MDL-36104 mod_assign: added hidden labels to the feedback input fields
2013-01-21 12:52:58 +08:00
Andrew Davis
65ac28683e
MDL-37352 core_grade:fixed some ajax display issues
...
Conflicts:
grade/report/grader/styles.css
2013-01-21 12:31:53 +08:00
Rossiani Wijaya
28497b53b3
MDL-19069 RSS feed block: Removed link for remote RSS feeds on navigation
2013-01-21 12:02:31 +08:00
Dan Poltawski
812ea3aae2
Merge branch 'wip-mdl-36674-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE
2013-01-21 10:15:31 +08:00
Dan Poltawski
b0da482ae0
Merge branch 'MDL-35074_23_2' of git://github.com/pauln/moodle into MOODLE_23_STABLE
2013-01-21 10:09:07 +08:00
Dan Poltawski
176bb7570b
Merge branch 'MDL-37527-23' of github.com:damyon/moodle into MOODLE_23_STABLE
2013-01-21 10:04:04 +08:00
Damyon Wiese
7a6d23ef25
MDL-37563 Assignment upgrade: Upgrade conditional activity settings.
...
Conflicts:
mod/assign/upgradelib.php
2013-01-21 09:13:21 +08:00
Dan Poltawski
0d674390c3
Merge branch 'm23_MDL-36421' of git://github.com/danmarsden/moodle into MOODLE_23_STABLE
2013-01-21 09:01:26 +08:00
AMOS bot
7e1f3dda3b
Automatically generated installer lang files
2013-01-21 00:44:55 +00:00
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