Commit graph

56665 commits

Author SHA1 Message Date
Stephen Bourget
5ac332392a MDL-37533 Assign: assign_print_overview does not correctly display assignments that need grading
Conflicts:

	mod/assign/lib.php
2013-01-24 11:15:55 +08:00
AMOS bot
16441ae878 Automatically generated installer lang files 2013-01-24 00:46:51 +00:00
Jerome Mouneyrac
30e2ad8b85 MDL-37476 course_create unit test fails if course completion is enabled 2013-01-23 14:15:00 +08:00
David Monllao
7ce10d15d6 MDL-37634 lesson: readquestion visibility to protected 2013-01-23 09:52:36 +08:00
Jean-Philippe Gaudreau
eed5149f1f MDL-37629 assign: Fix from regression MDL-37244 2013-01-23 09:25:52 +08:00
Mary Evans
9044b7fadf MDL-29723 mod/quiz: Modified show/hide button in edit.php and added some extra CSS rules to styles.css to make Question bank block more compatible/adaptable with themes. 2013-01-23 01:05:24 +00:00
Damyon Wiese
5cf0388b84 MDL-37619 Assign - Fix regression assign_print_overview caused by MDL-37527 2013-01-23 08:42:02 +08:00
Sam Hemelryk
3ad0ab4e67 Merge branch 'MDL-34435-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Conflicts:
	version.php
2013-01-23 11:07:40 +13:00
Eloy Lafuente (stronk7)
24430c5aad Merge branch 'wip-MDL-15930-23' of git://github.com/abgreeve/moodle into MOODLE_23_STABLE 2013-01-22 20:40:56 +01:00
Aparup Banerjee
e88dfd38bd Merge branch 'wip-mdl-37339-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2013-01-22 16:28:53 +08:00
Dan Poltawski
38f688108d Merge branch 'wip-mdl-32526-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE 2013-01-22 14:00:42 +08:00
Dan Poltawski
166cb23ea4 Merge branch 'MDL-27164-MOODLE_23_STABLE' of git://github.com/micaherne/moodle into MOODLE_23_STABLE 2013-01-22 12:52:08 +08:00
Dan Poltawski
6042f30d5f Merge branch 'MDL-37275_m23' of git://github.com/markn86/moodle into MOODLE_23_STABLE 2013-01-22 12:46:23 +08:00
Dan Poltawski
9e4c326caf Merge branch 'MDL-37375_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2013-01-22 12:44:07 +08:00
Dan Poltawski
49042e1c8c Merge branch 'MDL-37430-23' of github.com:damyon/moodle into MOODLE_23_STABLE 2013-01-22 11:53:57 +08:00
Dan Poltawski
0302aca4ec Merge branch 'MDL-35357_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE 2013-01-22 11:48:26 +08:00
Dan Poltawski
211fa38ca5 Merge branch 'MDL-37599_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE 2013-01-22 11:40:28 +08:00
Dan Poltawski
e21f9dd982 Merge branch 'MDL-37473-23' of git://github.com/srynot4sale/moodle into MOODLE_23_STABLE 2013-01-22 11:14:42 +08:00
Aparup Banerjee
72455fca5a Merge branch 'MDL-37540-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-01-22 11:00:05 +08:00
Aparup Banerjee
c90b8f82a8 Merge branch 'MDL-37543-23' of git://github.com/damyon/moodle into MOODLE_23_STABLE 2013-01-22 10:56:54 +08:00
Dan Poltawski
a932d0c4cc Merge branch 'MDL-37355-stable23' of git://github.com/mouneyrac/moodle into MOODLE_23_STABLE 2013-01-22 09:06:44 +08:00
Eloy Lafuente (stronk7)
b210380b4e Merge branch 'MDL-36104_m23' of https://github.com/markn86/moodle into MOODLE_23_STABLE 2013-01-22 01:20:06 +01:00
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