mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
68,693 Commits 36 Branches 519 Tags
Commit Graph

68693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
0faba5386c Merge branch 'MDL-38693-master' of git://github.com/jethac/moodle 2014-06-23 14:11:30 +08:00
Damyon Wiese
7fb32aaafc MDL-41746 External api: Allow multiple calls to validate_context at different levels 
(Only from webservices)
 2014-06-23 13:38:53 +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
Marina Glancy
c436a90dfb Merge branch 'MDL-46013_uninstall_theme' of git://github.com/moodlerooms/moodle 2014-06-23 11:34:27 +08:00
Marina Glancy
47b933df3d Merge branch 'MDL-44124-master' of git://github.com/ankitagarwal/moodle 2014-06-23 11:33:50 +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
Damyon Wiese
7784c3ad18 weekly release 2.8dev 2014-06-19 14:12:07 +08:00
Damyon Wiese
7e18746f04 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-06-19 14:11:39 +08:00
AMOS bot
126248941c Automatically generated installer lang files 2014-06-19 00:42:45 +00:00
Marina Glancy
0b47bbfa32 MDL-45941 messaging: submit all necessary user fields to message_send 2014-06-18 16:37:27 +08:00
Ankit Agarwal
29a05a56af MDL-44124 libraries: Allow rrules with only one part during rrule validation checks 2014-06-18 14:12:25 +08:00
Damyon Wiese
33efee99ff MDL-45884: Version bump for new setting. 2014-06-18 11:12:42 +08:00
AMOS bot
2852292f6a Automatically generated installer lang files 2014-06-18 00:42:21 +00:00
Eloy Lafuente (stronk7)
033b14dc33 Merge branch 'MDL-45978_master' of git://github.com/grabs/moodle 2014-06-17 11:54:33 +02: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
Eloy Lafuente (stronk7)
f393b3ecb1 Merge branch 'MDL-44929-master' of git://github.com/andrewnicols/moodle 2014-06-17 11:04:11 +02:00
Marina Glancy
65f4667348 Merge branch 'wip_MDL-45941_m28_message' of git://github.com/skodak/moodle 2014-06-17 13:08:14 +08:00
Andreas Grabs
ec4e78a80f MDL-45978 logging - added missing parameter id 2014-06-17 07:05:05 +02:00
Petr Skoda
349f98ad3e MDL-45941 implement support for message sending from DB transactions and fix other problems 
This patch includes following fixes:
 - messages may be now sent when database transactions active
 - consistent return status on failure from message_send(), false is
   returned only when message not created in message(_read)? table,
   processor failure results in debugging message only and messages
   are not marked as read
 - message_sent is triggered always with id from message table
 - logic for marking messages as viewed was standardised
 - message_viewed event is triggered consistently
 - improved performance when fetching user preferences
 - full unit tests coverage for send_message() function
 - fixed multiple other smaller issues discovered by unit tests
 2014-06-17 16:09:43 +12: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)
3a2421a56e Merge branch 'MDL-45611-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-06-17 01:11:25 +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
Eloy Lafuente (stronk7)
bfc66dd983 Merge branch 'MDL-45936_master' of https://github.com/markn86/moodle 2014-06-17 00:18:15 +02:00
Mark Nielsen
f149e58990 MDL-46013 theme: Uninstall theme unconditionally unsets configs 2014-06-16 15:10:30 -07:00
Eloy Lafuente (stronk7)
d519545a54 Merge branch '45884-28' of https://github.com/samhemelryk/moodle 2014-06-17 00:09:50 +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
Rajneel Totaram
8fb7520095 MDL-45967 admin lang: Fix typo 2014-06-16 17:26:34 +08:00
Marina Glancy
14422ae946 Merge branch 'MDL-43274-master' of git://github.com/xow/moodle 2014-06-16 17:23:53 +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
John Okely
fbd449509e MDL-43274 Course: Remove message about course logs from upgrade.txt 2014-06-16 16:25:27 +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
Damyon Wiese
070d5b17e1 MDL-31409 Grading form webservice: Whitespace fixes 2014-06-16 16:14:43 +08:00
Damyon Wiese
be08fd134e Merge branch 'MDL-31861' of https://github.com/Lightwork-Marking/moodle 2014-06-16 16:13:38 +08:00
Marina Glancy
4a61670aed Merge branch 'MDL-35648' of git://github.com/danielneis/moodle 2014-06-16 14:02:38 +08:00
Marina Glancy
6581e387a0 Merge branch 'MDL-45935-master' of git://github.com/andrewnicols/moodle 2014-06-16 14:02:17 +08:00
Damyon Wiese
b3f297df31 Merge branch 'MDL-31998_master' of git://github.com/grabs/moodle 2014-06-16 12:04:02 +08:00
Damyon Wiese
bf4c212284 Merge branch 'wip-mdl-46001' of https://github.com/rajeshtaneja/moodle 2014-06-16 11:24:29 +08:00
Rajesh Taneja
96b86e038e MDL-46001 atto_clear: modfied behat test to work on xvfb 2014-06-16 11:09:43 +08:00
Damyon Wiese
1df546a77e Merge branch 'MDL-45803_master' of https://github.com/markn86/moodle 2014-06-16 11:00:26 +08:00
Damyon Wiese
70b58992b8 Merge branch 'wip-MDL-45395-master' of git://github.com/abgreeve/moodle 2014-06-16 10:07:00 +08:00
John Okely
bb8d6e1a81 MDL-43274 Course: Remove ability to delete logs on a course during reset 2014-06-16 09:10:05 +08:00