mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
72,377 Commits 36 Branches 527 Tags
Commit Graph

72377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Monllao
d84a9a322e Merge branch 'MDL-46238' of git://github.com/shashirepo/moodle 2015-02-25 09:52:30 +08:00
Andrew Nicols
db23cd087b Merge branch 'MDL-48716-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
	lib/db/upgrade.php
	version.php
 2015-02-25 09:20:26 +08:00
Andrew Nicols
1725c553ac MDL-49008 lang: Revert unnecessary rename warning 
This was failing unit tests because it does not check for the presence of
the source directory first. If there is no source directory, it cannot be
moved.
 2015-02-25 08:54:45 +08:00
Dan Poltawski
86e5b0a707 Merge branch 'MDL-49220-master' of https://github.com/lucisgit/moodle 2015-02-24 16:54:58 +00:00
Dan Poltawski
4a3b900698 Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle 2015-02-24 16:50:12 +00:00
Tony Butler
f1399fb8e7 MDL-49220 mod_choice: Add behat scenario to test choice preview option 2015-02-24 16:25:18 +00:00
Dan Poltawski
94e4ca4cca Merge branch 'MDL-46665' of https://github.com/rlorenzo/moodle 2015-02-24 11:51:44 +00:00
Dan Poltawski
6750b66c39 Merge branch 'MDL-48142-master' of git://github.com/lameze/moodle 2015-02-24 11:21:50 +00:00
Dan Poltawski
73d8a50d73 Merge branch 'master-18177' of https://github.com/timpricecatalyst/moodle-1 2015-02-24 11:18:37 +00:00
Dan Poltawski
6856894efe Merge branch 'wip_MDL-49184_m29_choice' of https://github.com/skodak/moodle 2015-02-24 10:43:15 +00:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Andrew Nicols
17dd7e7ccd Merge branch 'MDL-48730-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2015-02-24 18:12:32 +08:00
Andrew Nicols
b6daeec8bd Merge branch 'm29_MDL-48519' of https://github.com/totara/moodle 2015-02-24 17:51:22 +08:00
Andrew Nicols
5c26cbdf22 Merge branch 'MDL-49078' of git://github.com/shashirepo/moodle 2015-02-24 17:04:28 +08:00
Dan Poltawski
e6c453bb3d Merge branch 'MDL-48108-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	version.php
 2015-02-24 08:59:53 +00:00
Shashikant Vaishnav
ad75897dd4 MDL-49078 theme_bootstrapbase: 'Create new course' text too high 
Thanks to  Gareth J Barnard  for the code suggestion
 2015-02-24 14:13:41 +05:30
Juan Leyva
5d62e813ab MDL-48730 webservices: New ws core_group_get_course_user_groups 2015-02-24 09:39:05 +01:00
Dan Poltawski
e09bd104b9 Merge branch 'MDL-49216-master' of git://github.com/andrewnicols/moodle 2015-02-24 08:31:53 +00:00
Andrew Nicols
5a3fe24392 Merge branch 'MDL-49008_lang_vanish' of https://github.com/andyjdavis/moodle 2015-02-24 16:15:35 +08:00
David Monllao
fdc30bd7c5 Merge branch 'MDL-49183_m29v5' of git://github.com/sbourget/moodle 2015-02-24 16:07:18 +08:00
Andrew Davis
21b859e935 MDL-29008 lang: reintroduced error silencing to prevent unit test failures 2015-02-24 09:00:25 +01:00
Andrew Nicols
78f26c076c Merge branch 'MDL-34375_m29v2' of https://github.com/sbourget/moodle 2015-02-24 11:40:27 +08:00
Andrew Nicols
ad80b121ad Merge branch 'master_MDL-46408' of https://github.com/danmarsden/moodle 2015-02-24 11:34:27 +08:00
Andrew Nicols
2eaf309d16 Merge branch 'MDL-49008_lang_vanish' of https://github.com/andyjdavis/moodle 2015-02-24 11:07:05 +08:00
Andrew Nicols
8b52863f0a MDL-48108 core: Add new indexes to message tables 2015-02-24 09:39:05 +08:00
Andrew Nicols
b5e9faa67e MDL-48108 message: Rewrite recent conversations 2015-02-24 09:38:50 +08:00
Andrew Nicols
6c10b1cc88 MDL-48108 message: Add additional testing for recent conversations 2015-02-24 09:38:49 +08:00
Andrew Nicols
38ec3fb080 MDL-49216 mod_forum: Move subquery to outer component 
It is not possible to order sub-query results with some RDBMs, and the
subquery is not necessary anyway.
 2015-02-24 08:29:43 +08:00
Andrew Nicols
94802d3518 MDL-49216 mod_forum: Add tests for discussion reply count 2015-02-24 08:29:43 +08:00
Dan Poltawski
4b525e7508 Merge branch 'MDL-49198_master' of https://github.com/markn86/moodle 2015-02-23 16:29:24 +00:00
Dan Poltawski
8d952359d2 Merge branch 'MDL-49200_master' of https://github.com/markn86/moodle 2015-02-23 16:25:25 +00:00
Dan Poltawski
d75bc7ea13 Merge branch 'master' of https://github.com/eberhardt/moodle 2015-02-23 15:55:36 +00:00
Dan Poltawski
c40678fb44 Merge branch 'MDL-49046-master' of git://github.com/damyon/moodle 2015-02-23 13:33:40 +00:00
Damyon Wiese
adeb96d28f MDL-49046 javascript: Add support for AMD modules and jquery. 
Grunt is the build tool.
 2015-02-23 16:23:10 +08:00
Andrew Nicols
558354df81 MDL-48807 accesslib: Change create_level_instance to recordset 2015-02-23 16:01:58 +08:00
Andrew Nicols
49e6309f08 Merge branch 'MDL-48807-master' of git://github.com/lameze/moodle 2015-02-23 14:46:59 +08:00
Simey Lameze
77df1778f2 MDL-48807 core_task: change create_contexts_task to daily frequency 2015-02-23 14:33:39 +08:00
Simey Lameze
5a39b24b9a MDL-48807 accesslib: table locking fix on all create_level_instance 2015-02-23 14:25:21 +08:00
David Monllao
40b10c304a MDL-49145 report_log: Moving conditions 
Now get_url() does not need to be resolved when
we are downloading.
 2015-02-23 10:30:47 +08:00
Andrew Nicols
27fdee391c Merge branch 'MDL-49174-master' of git://github.com/jleyva/moodle 2015-02-23 09:35:45 +08:00
Andrew Nicols
07754b4c67 Merge branch 'MDL-35392-master' of git://github.com/zbdd/moodle 2015-02-23 09:20:25 +08:00
Zachary Durber
3547f186a8 MDL-35392 mod_assign: Push feedback to gradebook when releasing grades 
When bulk changing workflow status a mismatch in variable
names meant that feedback wasn't being sent to the gradebook.
 2015-02-23 09:14:05 +08:00
Andrew Nicols
f393b0592e Merge branch 'MDL-49145_master' of git://github.com/dmonllao/moodle 2015-02-23 09:05:34 +08:00
David Monllao
fada0d44cc MDL-49145 report_log: Fixing condition 
Credit and thanks to Tyler Bannister and Renaat Debleu.
 2015-02-23 08:45:25 +08:00
Andrew Davis
4a85b4c0d0 MDL-49008 lang: removed preemptive deleting of old language files 2015-02-22 19:58:57 +01:00
Andrew Davis
323f95b222 MDL-49008 lang: made lang update error reporting work 2015-02-22 19:58:57 +01:00
Rex Lorenzo
c85140350b MDL-46665 core_user: Add 'idnumber' field to user filter 2015-02-20 10:34:08 -08:00
Tony Butler
c30dbd69e7 MDL-49220 mod_choice: Add option to allow students to preview choices 2015-02-20 14:27:55 +00:00
Stephen Bourget
1cf8ca343f MDL-49183 Lesson: Add additional events 2015-02-19 21:16:26 -05:00
Dan Marsden
a544661398 MDL-46408 mod_scorm: check param is set before using. 
The default org is only set if it exists in the imsmanifest.xml
 2015-02-20 14:41:07 +13:00