mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 01:50:55 +01:00
Code Issues Projects Releases Wiki Activity
68,798 Commits 36 Branches 527 Tags
Commit Graph

15664 Commits

Author SHA1 Message Date
David Monllao
e20392edc0 MDL-42716 mod_assign: Lang str for the viewblinddetails capability 2014-06-25 13:20:41 +08:00
Eloy Lafuente (stronk7)
025fa4fc74 Merge branch 'MDL-45645_LTIUsernameParam' of https://github.com/moodlerooms/moodle 2014-06-25 01:28:35 +02:00
Eloy Lafuente (stronk7)
c45754d840 Merge branch 'MDL-45445_master' of https://github.com/markn86/moodle 2014-06-24 21:54:58 +02:00
Eloy Lafuente (stronk7)
046930cfba Merge branch 'MDL-46045-master' of git://github.com/damyon/moodle 2014-06-24 21:48:30 +02:00
Eloy Lafuente (stronk7)
e5d7c55151 Merge branch 'MDL-41258-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	mod/forum/tests/maildigest_test.php
 2014-06-24 20:25:58 +02:00
Marina Glancy
89d91403f9 Merge branch 'MDL-1626-master' of git://github.com/andrewnicols/moodle 2014-06-24 16:14:31 +08:00
Andrew Nicols
ca14c76f3b MDL-1626 mod_forum: Correct SQL syntax when fetching subscriptions 2014-06-24 14:48:23 +08:00
Marina Glancy
9cd5966168 Merge branch 'MDL-45933-master' of git://github.com/damyon/moodle 2014-06-24 13:52:30 +08:00
Marina Glancy
bb9fd6b29d Merge branch 'MDL-41448-master' of git://github.com/damyon/moodle 2014-06-24 13:51:20 +08:00
Damyon Wiese
e70f8d0a30 MDL-41448 assign: Fix all plugin styles - they should be restricted to mod assign pages. 2014-06-24 13:42:53 +08:00
Damyon Wiese
b63bf750bd Merge branch 'MDL-46035_survey' of https://github.com/andyjdavis/moodle 2014-06-24 13:07:57 +08:00
Marina Glancy
e28d6b29dc MDL-42716 assign: whitespace fix 2014-06-24 13:04:49 +08:00
Michael Hughes
323f221b11 MDL-42716 Assign: Implemented capability based viewing of blind details (squashed) 2014-06-24 12:27:10 +08:00
Andrew Nicols
035746504a MDL-1626 mod_forum: Update discussion subscriptions when moving discussions 2014-06-24 12:16:34 +08:00
Andrew Nicols
ebfb73db7b MDL-1626 mod_forum: Update user interface to reflect per-discussion subscriptions 
AMOS BEGIN
  MOV [forcessubscribe,mod_forum],[forcesubscribed,mod_forum]
AMOS END
 2014-06-24 12:16:34 +08:00
Barbara Ramiro
a42d781864 MDL-1626 mod_forum: Add icons for subscription status 2014-06-24 12:16:34 +08:00
Andrew Nicols
49566c8a67 MDL-1626 mod_forum: Make cron handle discussion subscriptions 2014-06-24 12:16:34 +08:00
Andrew Nicols
e3bbfb52c4 MDL-1626 mod_forum: Add functions to change user discussion subscription state 2014-06-24 12:16:34 +08:00
Andrew Nicols
59075a4349 MDL-1626 mod_forum: Move subscription management to a separate class 2014-06-24 12:16:33 +08:00
Andrew Nicols
361a41d355 MDL-1626 mod_forum: Create new discussion subscription tracking table 2014-06-24 12:16:33 +08:00
Andrew Nicols
dc0464801d MDL-1626 mod_forum: Add behat tests for existing functionality 2014-06-24 12:16:33 +08:00
Andrew Nicols
a7a849038a MDL-1626 mod_forum: Add unit tests for forum cron mail behaviour 2014-06-24 12:16:33 +08:00
Damyon Wiese
44a0b1e700 Merge branch 'MDL-46056-master' of git://github.com/mudrd8mz/moodle 2014-06-24 11:34:23 +08:00
Eloy Lafuente (stronk7)
70465e7cb5 Merge branch 'MDL-45764_generalTool' of https://github.com/moodlerooms/moodle 2014-06-24 00:01:51 +02:00
Damyon Wiese
2dffa24f10 Merge branch 'MDL-45580-master' of git://github.com/FMCorz/moodle 2014-06-23 15:17:45 +08:00
Frederic Massart
b4148e4688 MDL-45580 assignfeedback_editpdf: Save readonly version in backup 2014-06-23 14:46:18 +08:00
Frederic Massart
7dbbb848c6 MDL-45580 assignfeedback_editpdf: Delete draft content on new submission 2014-06-23 14:17:24 +08:00
Frederic Massart
098f7dd438 MDL-45580 assignfeedback_editpdf: Store a readonly version of the PDF 2014-06-23 14:16:49 +08:00
Damyon Wiese
2404605ad4 Merge branch 'MDL-35453' of git://github.com/timhunt/moodle 2014-06-23 12:29:36 +08:00
Damyon Wiese
69377ddfab Merge branch 'MDL-46086' of git://github.com/timhunt/moodle 2014-06-23 12:26:00 +08:00
Damyon Wiese
a51201a433 Merge branch 'MDL-43835' of https://github.com/mr-russ/moodle 2014-06-23 12:20:04 +08:00
Tim Hunt
1c2e363c0e MDL-46086 quiz: fix unit test on Oracle 2014-06-20 22:25:21 +01:00
Tim Hunt
2ce9a94d96 MDL-35453 quiz reports: don't order by id. 
We were using ORDER BY id even though there was a perfectly good
attempt column to order the attempts by one user at one quiz.

Also, Oracle was complaining:
Debug info: ORA-01799: a column may not be outer-joined to a subquery
 2014-06-20 16:09:03 +01:00
Andrew Davis
19f2765be2 MDL-46035 mod_survey: a string change to make an error message always correct 2014-06-20 08:42:36 +08:00
Damyon Wiese
a084ac0db4 MDL-46045 Fix php tags (lowercase) everywhere 2014-06-19 11:05:16 +08:00
David Mudrák
56c8eaf5d2 MDL-46056 Remove invalid string definition from the workshop module 
The correct version of the string is defined above.
 2014-06-19 00:43:47 +02:00
Damyon Wiese
1165b7ded7 MDL-45933 Assign: Prevent fatal error when there are no users in the grading table 2014-06-18 15:17:02 +08:00
Russell Smith
d2c58b95bb MDL-43835 phpunit: Correct unit tests. 
When different ID's are set for each sequence a number
of unit test failures appear.  They have been corrected
to allow unit tests to pass with the new generator in place.
 2014-06-17 19:08:01 +10:00
Andrew Nicols
908996b10e MDL-41258 Forum: Add additional unit tests for forum digest settings 2014-06-17 16:06:10 +08:00
Damyon Wiese
e192e37f51 MDL-45582 EditPDF: whitespace fix 2014-06-17 10:27:19 +08:00
Damyon Wiese
177cc379ed MDL-45582 Editpdf: Prevent debugging when there is no pdf 2014-06-17 10:21:14 +08:00
Damyon Wiese
fac23f93ec Merge branch 'master_MDL-45582' of git://github.com/greg-or/moodle-mod_assign 2014-06-17 10:20:39 +08:00
Eloy Lafuente (stronk7)
01dca76248 Merge branch 'MDL-45970' of git://github.com/timhunt/moodle 2014-06-17 01:15:21 +02:00
Eloy Lafuente (stronk7)
cf7ac0aebf Merge branch 'wip-mdl-45719-master' of https://github.com/deraadt/moodle 2014-06-17 00:58:50 +02:00
Eloy Lafuente (stronk7)
8888451ed5 Merge branch 'MDL-45870-master' of git://github.com/FMCorz/moodle 2014-06-17 00:51:26 +02:00
Marina Glancy
db8071a7f9 Merge branch 'MDL-45940-master' of git://github.com/damyon/moodle 2014-06-16 17:28:15 +08:00
Marina Glancy
c126413655 Merge branch 'MDL-45901_Quiz_master' of git://github.com/nadavkav/moodle 2014-06-16 17:27:20 +08:00
Gregory Faller
028c9d20b9 MDL-45582: Apply grades and feedback to entire group does not work with Annotate PDF feature 2014-06-16 18:09:21 +09:30
Damyon Wiese
a3d7a82b64 Merge branch 'MDL-42531-alt' of https://github.com/jonof/moodle 2014-06-16 16:26:06 +08:00
Damyon Wiese
de06ce7ed3 MDL-45940 Assign: Improved access check 
Call can_edit() instead of repeating a (slightly wrong) access check.
 2014-06-16 16:20:11 +08:00