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

68681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
AMOS bot
fe70d3a8df Automatically generated installer lang files 2014-06-15 00:42:34 +00:00
Mark Nelson
e0e6d931f3 MDL-45936 auth_db: use core functions when creating/updating a user 2014-06-14 15:59:45 -07:00
Nadav Kavalerchik
c9976d96a5 MDL-45901 - Quiz - Display random questions (from category) on RTL mode. 2014-06-13 12:20:23 +03:00
Paul Charsley
0ff4ebb4a3 MDL-31861 add web service function save_definitions 2014-06-13 15:36:25 +12:00
AMOS bot
340df7eb34 Merge branch 'master' into install_master 2014-06-13 00:41:51 +00:00
Andreas Grabs
16ee970c94 MDL-31998 mod_feedback - Feedback depend questions bug 2014-06-13 01:45:23 +02:00
Sam Hemelryk
99f041ebfa MDL-45884 navigation: changed to positive setting phrasing 2014-06-13 10:16:25 +12:00
Sam Hemelryk
aab6438ca1 MDL-45884 navigation: tidied up code and added behat tests 2014-06-13 10:16:25 +12:00
Syxton
4d378e9f70 MDL-45884 navigation: setting that allows sites to collapse My Courses by default 2014-06-13 10:16:25 +12:00
Tim Hunt
4175a57038 MDL-45970 quiz editing: fix display of random questions. 
The pass by reference meant the function was clobbering the variable in
the calling function. Once that was change, it was not strictly
necessary to rename the variable in the function, but I did anyway for
clarity.

Thanks to Rajesh Taneja for finding the problem, and identifying which
bit of code was broken. I really just made the patch.
 2014-06-12 19:45:33 +01:00