moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67179 commits 37 branches 540 tags 1.3 GiB
Commit graph

67179 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
71591d7822 Merge branch 'MDL-46620-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE 2014-08-03 20:01:51 +02:00
AMOS bot
a7f445318d Automatically generated installer lang files 2014-08-01 00:05:41 +08:00
Dan Poltawski
753493ae11 weekly release 2.6.4+ 2014-07-31 09:37:18 +01:00
Dan Poltawski
f73bb3a21a Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-07-31 09:37:14 +01:00
Eric Merrill
e89b812518 MDL-46620 messages Make sure full message is used for read marking 
message_mark_message_read needs to have the full message object,
otherwise data will be lost.
 2014-07-30 15:58:08 -04:00
Dan Poltawski
4fe1c7647c Merge branch 'MDL-46236_26' of git://github.com/nobelium/moodle into MOODLE_26_STABLE 2014-07-29 12:04:34 +01:00
AMOS bot
3c1814cac7 Automatically generated installer lang files 2014-07-29 16:02:25 +08:00
Dan Poltawski
765ba4ce1e Merge branch 'wip-MDL-46338-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-29 08:50:40 +01:00
Marina Glancy
2d1ac616e8 Merge branch 'm26_MDL-46325' of git://github.com/totara/moodle into MOODLE_26_STABLE 2014-07-29 11:59:29 +08:00
Sam Hemelryk
23bf420120 Merge branch 'MDL-43908-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE 2014-07-29 15:51:03 +12:00
Sam Hemelryk
5175bb487e Merge branch 'MDL-45041_26_STABLE' of git://github.com/jleyva/moodle into MOODLE_26_STABLE 2014-07-29 15:47:18 +12:00
Marina Glancy
198c28cda2 MDL-46338 enrol_self: Icon should indicate enrolment availability 2014-07-29 09:52:34 +08:00
Adam Olley
2b413491e3 MDL-46457 mod_lti: Render lti description through standard format_module_intro 2014-07-29 10:40:52 +09:30
Sam Hemelryk
98311522ed Merge branch 'MDL-45044-m26-master' of https://github.com/dthies/moodle into MOODLE_26_STABLE 2014-07-29 08:46:55 +12:00
Dan Poltawski
0a346972f3 Merge branch 'MDL-45594_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE 2014-07-28 12:54:19 +01:00
Dan Poltawski
54021dcedb Merge branch 'wip-MDL-46503-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-28 12:49:17 +01:00
Dan Poltawski
abeb9d6544 Merge branch 'm26_MDL-45715' of https://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-07-28 12:47:35 +01:00
Dan Poltawski
2c28f42bae Merge branch 'MDL-46433-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-07-28 11:49:40 +01:00
Dan Poltawski
f5b49d8004 Merge branch 'MDL-46504_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-07-28 10:56:50 +01:00
Nobelium
c02b2fc931 MDL-46236 mod_scorm : Setting lauch options for scorm in popup 2014-07-28 06:35:33 +00:00
Sam Hemelryk
3390644156 Merge branch 'MDL-43390_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-07-28 12:22:45 +12:00
Sam Hemelryk
fcb1e8a9c2 Merge branch 'wip-MDL-46525-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-07-28 12:13:48 +12:00
Sam Hemelryk
cedd791b19 Merge branch 'MDL-46506-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-07-28 08:46:07 +12:00
Tony Butler
072e93e26e MDL-43908 mod_assign: Order submissions by course id then cm id 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-25 10:28:47 +01:00
Tony Butler
f249f9f41a MDL-43908 mod_assign: Remove redundant code and improve SQL query 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-25 10:28:47 +01:00
Tony Butler
d53cc3da71 MDL-43908 mod_assign: Prevent notifications for unavailable assignments 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>

Conflicts:
	mod/assign/locallib.php
 2014-07-25 09:54:49 +01:00
Tony Butler
1d3c72cafd MDL-43908 mod_assign: Defer notifications for unavailable assignments 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-07-25 09:54:49 +01:00
Juan Leyva
4f3ed071d4 MDL-45041 Web Service: add_user_device doesn't store entries for different users using the same push key 2014-07-25 10:42:27 +02:00
Marina Glancy
9de849779c MDL-46525 enrol_cohort: fix JS error 2014-07-25 14:45:53 +08:00
Brian Barnes
67c5420a1f MDL-46325 behat: Fixed issue where 'teacher1' didn't exist 2014-07-25 14:37:27 +12:00
AMOS bot
7dfed7234c Automatically generated installer lang files 2014-07-24 22:42:05 +00:00
Daniel Thies
3b80e3f77a MDL-45044 filter_tex: properly escape excutable pathnames for Windows 2014-07-24 14:06:02 -05:00
Dan Poltawski
2d43ffd1a9 weekly release 2.6.4+ 2014-07-24 09:50:58 +01:00
Dan Poltawski
899c251521 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-07-24 09:50:55 +01:00
Damyon Wiese
1bbe91bf16 MDL-46506 Assign: fix php warning on grant extension page 
This code was missed when the extensionduedate was moved to the userflags table.
 2014-07-24 11:26:28 +08:00
David Monllao
924cc85e08 MDL-46504 libraries: Fixing typo 2014-07-24 11:17:02 +08:00
Damyon Wiese
0ea2c043bc MDL-46017 Assign: Restore can't rely allocated marker fields existing in backup 2014-07-24 10:58:33 +08:00
Marina Glancy
a164b026c7 MDL-46503 behat: cohort generator allows to create cohort in category 2014-07-24 10:05:06 +08:00
Mark Nelson
475cf8be48 MDL-45594 core_message: added unit tests 2014-07-23 16:40:32 -07:00
Mark Nelson
aea298fc35 MDL-45594 core_message: ordered recent notifications by timecreated 2014-07-23 16:40:31 -07:00
Tim Hunt
ca0074bf89 MDL-45594 simplify message_get_recent_conversations SQL 
I am pretty sure that this new SQL is logically equivalent to
the original, and it passes Mark's unit tests. However, it is
hard to be 100% sure.
 2014-07-23 16:40:31 -07:00
AMOS bot
c4dd3d8dbf Automatically generated installer lang files 2014-07-23 22:46:24 +00:00
Simey Lameze
f754b93fb0 MDL-46433 blog: fix error message when creating an external blog 2014-07-23 16:12:09 +08:00
Dan Poltawski
5414931209 Revert "Merge branch 'MDL-45594_m26' of git://github.com/markn86/moodle into MOODLE_26_STABLE" 
This reverts commit 9e32e3befc, reversing
changes made to 695553b1a5.
 2014-07-23 09:02:28 +01:00
Dan Marsden
f320b2b391 MDL-45715 assign: disable marking allocation if markingworkflow is not set. 2014-07-23 19:22:00 +12:00
Damyon Wiese
170007b939 MDL-37509 Assign: Do not put description in calendar before it should be shown to students 2014-07-23 13:14:51 +08:00
Sam Hemelryk
cd60515114 MDL-45724 cache: fixed warning structure bug 2014-07-23 15:24:16 +12:00
AMOS bot
e9f88e7793 Automatically generated installer lang files 2014-07-22 22:49:19 +00:00
Dan Poltawski
5199fcd7cb Merge branch 'MDL-37509-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-07-22 15:56:59 +01:00
Dan Poltawski
00d4919e69 Merge branch 'MDL-34248_m26' of https://github.com/markn86/moodle into MOODLE_26_STABLE 2014-07-22 12:01:06 +01:00