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

69420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
aba9019832 Merge branch 'wip_MDL-46711_m28_memcachesrvs' of https://github.com/skodak/moodle 2014-08-19 16:31:06 +08:00
Marina Glancy
4cb61b6b4e Merge branch 'MDL-46281-master' of git://github.com/lucisgit/moodle 2014-08-19 16:26:35 +08:00
Damyon Wiese
fc9b567f32 Merge branch 'MDL-46772-master' of git://github.com/andrewnicols/moodle 2014-08-19 15:41:32 +08:00
Marina Glancy
816ddceceb Merge branch 'MDL-46829_master' of git://github.com/lazydaisy/moodle 2014-08-19 14:20:51 +08:00
Marina Glancy
7e4475d37c Merge branch 'MDL-46833-master' of git://github.com/lucisgit/moodle 2014-08-19 14:20:41 +08:00
Marina Glancy
c86ae8660c Merge branch 'MDL-46846-master' of git://github.com/damyon/moodle 2014-08-19 14:20:31 +08:00
Damyon Wiese
c97bb5df16 Merge branch 'MDL-41513_Scrollbar_not_working' of https://github.com/MorrisR2/moodle 2014-08-19 14:11:43 +08:00
Marina Glancy
2c0ee558e5 Merge branch 'wip-mdl-46817' of git://github.com/rajeshtaneja/moodle 2014-08-19 14:03:27 +08:00
Marina Glancy
04821cbbe7 Merge branch 'MDL-46469-master' of git://github.com/ankitagarwal/moodle 2014-08-19 14:01:48 +08:00
Damyon Wiese
32d3bfa2de Merge branch 'MDL-46792-master' of https://github.com/lucisgit/moodle 2014-08-19 13:57:50 +08:00
Ankit Agarwal
2eca9a23ae MDL-46469 scorm: Update report plugins to use namespaced classnames 2014-08-19 13:56:13 +08:00
Ankit Agarwal
fd57607fdb MDL-46469 scorm: Support autoloading for report plugins 2014-08-19 13:56:13 +08:00
Marina Glancy
430529bde8 Merge branch 'MDL-18014-master' of git://github.com/damyon/moodle 2014-08-19 13:50:44 +08:00
Marina Glancy
dd924ea9db Merge branch 'MDL-43197-master-2nd' of git://github.com/FMCorz/moodle 2014-08-19 13:25:32 +08:00
Damyon Wiese
9fb3fdd75f Merge branch 'MDL-46188' of https://github.com/shashirepo/moodle 2014-08-19 13:13:08 +08:00
Damyon Wiese
9eea856632 MDL-18014 Atto autosave: Add a timemodified field to the auto save drafts 
Do not restore any draft older than 4 days to (sort of) sync with the draft file
lifetime.
 2014-08-19 12:30:13 +08:00
Damyon Wiese
942501f318 MDL-18014 Atto autosave: When text is recovered, force it into the undo stack 
This allows you to use "Undo" to go back to the unaltered text in the form.
 2014-08-19 12:13:41 +08:00
Michael Wheeler
750688c741 MDL-46794 install: Fixed typo in config-dist.php 2014-08-19 11:27:40 +08:00
Marina Glancy
628b2a5cd3 Merge branch 'MDL-46796-master' of git://github.com/merrill-oakland/moodle 2014-08-19 11:24:41 +08:00
Marina Glancy
b3194ab1b2 Merge branch 'master_MDL-46775' of git://github.com/totara/moodle 2014-08-19 11:21:22 +08:00
Marina Glancy
3377a87d69 Merge branch 'wip-mdl-46327' of git://github.com/rajeshtaneja/moodle 2014-08-19 10:48:11 +08:00
Marina Glancy
efc815848d Merge branch 'wip-MDL-46791-master' of git://github.com/satrun77/moodle 2014-08-19 10:47:55 +08:00
Frederic Massart
abbee05eb3 MDL-43197 gradereport_user: Parents/mentors can see all the relevant grades 2014-08-19 10:47:34 +08:00
Rajesh Taneja
c1dc3f4793 MDL-46327 phpunit: Fixed oracle fail 2014-08-19 10:11:20 +08:00
Eloy Lafuente (stronk7)
14c38c2573 Merge branch 'wip-MDL-46691-master' of git://github.com/marinaglancy/moodle 2014-08-19 02:58:17 +02:00
James Henestofel
acf2508614 MDL-42231 auth: custom profile fields to support numbers at the end. 
For data mapping LDAP or CAS.  Change order of fieldname display checks to verify
custom profile fields first to allow custom field shortname to contain number at the end.
 2014-08-19 02:41:41 +02:00
Eloy Lafuente (stronk7)
d2e5f21625 Merge branch 'MDL-44894' of git://github.com/timhunt/moodle 2014-08-19 02:34:12 +02:00
Eloy Lafuente (stronk7)
652d886ae5 Merge branch 'wip_MDL-46552_m28_memcached' of https://github.com/skodak/moodle 2014-08-19 02:28:56 +02:00
Eloy Lafuente (stronk7)
6ea7fde09c Merge branch 'MDL-45874' of https://github.com/danielneis/moodle 2014-08-18 23:58:27 +02:00
Eloy Lafuente (stronk7)
a00678e54b Merge branch 'wip-MDL-46826-master' of git://github.com/marinaglancy/moodle 2014-08-18 20:06:16 +02:00
Eloy Lafuente (stronk7)
6ba12477ec Merge branch 'wip-MDL-46589-master' of git://github.com/marinaglancy/moodle 2014-08-18 19:47:50 +02:00
Eloy Lafuente (stronk7)
64140f93ec Merge branch 'wip-MDL-46545-master' of git://github.com/marinaglancy/moodle 2014-08-18 19:40:13 +02:00
Eric Merrill
97531d3929 MDL-46766 auth_cas: Upgrading to phpCAS 1.3.3 2014-08-18 16:39:38 +08:00
Damyon Wiese
d9ff93e36e Merge branch 'master_MDL-46669' of https://github.com/danmarsden/moodle 2014-08-18 16:21:54 +08:00
Ray Morris
f893cb44e0 MDL-46669 mod_scorm: Extraneous quotes added to scorm API values 2014-08-18 16:20:42 +08:00
Damyon Wiese
c84f1c6093 MDL-45887 mod_scorm: Note the coding style fixup issue in upgrade.txt 2014-08-18 15:11:59 +08:00
Rajesh Taneja
641459a8a5 MDL-46817 behat: Step to check if value exist/not in table column 2014-08-18 09:59:29 +08:00
nobelium
15838edb63 MDL-45887 mod_scorm : Fixing variable names 2014-08-17 22:15:04 +12:00
nobelium
4cb25b3605 MDL-45887 mod_scorm : Fixing coding standard violations 2014-08-17 22:15:04 +12:00
Dan Marsden
98c59aaab2 MDL-46760 mod_scorm: Fix js error when preview mode disabled 2014-08-17 22:14:15 +12:00
Marina Glancy
041a1de0a1 MDL-41284 stats: fix sql query from MDL-41284 2014-08-16 18:55:29 +08:00
Marina Glancy
fb71171fc6 MDL-46589 scheduled task does not send emails 
Thanks to  Luděk Šulák  for the patch
 2014-08-16 11:29:34 +08:00
Daniel Neis
e0530c2f14 MDL-45874 Fix access to users reports in navigation when using separate groups 2014-08-15 17:04:50 -03:00
Tony Butler
f84b9e65e4 MDL-46792 core_group: Check that $data->name is set before trimming 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-08-15 09:43:36 +01:00
Marina Glancy
ba9390784d MDL-46691 mod_choice: apply filters to user input 2014-08-15 15:53:10 +08:00
Damyon Wiese
924cb72b4a MDL-46846 Grades export: Some settings were not parsed from the form correctly. 
This was a regression from MDL-46548.

I also added to the behat test to cover this, and sped up the behat test while I was there.

I also restored the behaviour where usercustomfields was hardcoded to true for all
export types except XML - but the default was false.
 2014-08-15 13:53:29 +08:00
Rajesh Taneja
7d1c6a6e62 MDL-46817 behat: Table selector support css 
Previously table selector supported id and caption only.
But in few cases we don't have proper id, so added support
for css
 2014-08-15 13:11:33 +08:00
Marina Glancy
73de21ffda MDL-46826 forum: add index on field forum_discussion.course 2014-08-15 13:06:23 +08:00
Ruslan Kabalin
dfaedf0854 MDL-46833 mod_assign: Fix assignment view when available for group members only. 
When assignment is "Available for group members only" and no users with
mod/assign:submit role permision is enrolled (students),
groups_filter_users_by_course_module_visible is causing error (as $users
array is empty). The patch resolves the issue.
 2014-08-14 16:06:08 +01:00
shashirepo
c285740896 MDL-46188 course:show/hide button disappears after action 2014-08-14 20:26:28 +05:30