1
0
mirror of https://github.com/moodle/moodle.git synced 2025-04-10 10:52:14 +02:00

69377 Commits

Author SHA1 Message Date
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
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
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
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
Marina Glancy
ba9390784d MDL-46691 mod_choice: apply filters to user input 2014-08-15 15:53:10 +08:00
Marina Glancy
73de21ffda MDL-46826 forum: add index on field forum_discussion.course 2014-08-15 13:06:23 +08:00
Tim Hunt
f276267d93 MDL-44894 question editing: fix validation with odd permissions
For users with edit permissions, but not add permissions, it was
impossible to save the editing form. The validation assuemd this value
was present, but it was not. Other code checks this field too, so I
added it rather than changing the validation and all the other uses.
2014-08-14 11:25:18 +01:00
Marina Glancy
e1eb180806 weekly release 2.8dev 2014-08-14 14:52:07 +08:00
Marina Glancy
7d90b9b9f9 NOBUG: Fixed file access permissions 2014-08-14 14:52:07 +08:00
Marina Glancy
39db49c237 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-08-14 14:52:01 +08:00
Eloy Lafuente (stronk7)
3376dae082 MDL-45031 theme: fix tabs base line alignment by 1px.
Credit goes to Damyon Wiese, thanks!
2014-08-13 21:31:11 +02:00
AMOS bot
49913cbda9 Automatically generated installer lang files 2014-08-14 00:05:40 +08:00
Eric Merrill
e75becf3b3 MDL-46796 caching: Fix missing property error for memcache(d) 2014-08-13 08:24:04 -04:00
Eloy Lafuente (stronk7)
ccef4eec67 Merge branch 'MDL-45932-fixes' of git://github.com/danpoltawski/moodle 2014-08-13 12:03:17 +02:00
Dan Poltawski
aa53347409 MDL-45932 enrol_imsenterprise: lang string fixes 2014-08-13 10:35:52 +01:00
Marina Glancy
a2a4ad8928 MDL-46643 calendar: improved tab order of calendar detail pages 2014-08-13 16:29:45 +08:00
Marina Glancy
fa386d6172 Merge branch 'MDL-45759-master-2' of git://github.com/andrewnicols/moodle 2014-08-13 16:23:12 +08:00
Andrew Nicols
5afbca2485 MDL-45759 mod_quiz: Correct behat test to reflect changes from a translation fix 2014-08-13 15:44:52 +08:00
Dan Poltawski
60127c84b5 Revert "Merge branch 'wip_MDL-46660_m28_memcache' of https://github.com/skodak/moodle"
This reverts commit 57fdca8cec16f0018537cca9e07581cca601876f, reversing
changes made to 62e30bfbcd14772aa1c2f7ffe990e4b609098549.
2014-08-13 08:36:44 +01:00
Mohamed Alsharaf
6d0361ff25 MDL-46791 question: fixed incorrect 5th param for tag_set() 2014-08-13 13:57:12 +12:00
Marina Glancy
38a5c6861e Merge branch 'MDL-46565_master' of git://github.com/markn86/moodle 2014-08-13 09:25:38 +08:00
Eloy Lafuente (stronk7)
179eb9cabd Merge branch 'MDL-46697' of git://github.com/aolley/moodle 2014-08-13 02:08:07 +02:00
Eloy Lafuente (stronk7)
9ab115bbee Merge branch 'MDL-45031_M28' of git://github.com/lazydaisy/moodle 2014-08-13 00:34:03 +02:00
Eloy Lafuente (stronk7)
b8475d375c Merge branch 'wip-MDL-46470-master' of git://github.com/marinaglancy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-08-13 00:24:51 +02:00
Mark Nelson
67ab0ff089 MDL-46565 gradereport_*: moved report viewed event to bottom of page 2014-08-12 12:27:50 -07:00
Mark Nelson
44263d9c1c MDL-46565 gradereport_*: renamed event string names
This makes the strings more descriptive and consistent.

AMOS START
  MOV [eventreportviewed, gradereport_grader],[eventgradereportviewed, gradereport_grader]
  MOV [eventreportviewed, gradereport_outcomes],[eventgradereportviewed, gradereport_outcomes]
  MOV [eventreportviewed, gradereport_overview],[eventgradereportviewed, gradereport_overview]
  MOV [eventreportviewed, gradereport_user],[eventgradereportviewed, gradereport_user]
AMOS END
2014-08-12 12:19:18 -07:00
Dan Poltawski
023d758513 Merge branch 'wip_MDL-46561_m28_sessexists' of https://github.com/skodak/moodle 2014-08-12 14:28:22 +01:00
Dan Poltawski
231520807e Merge branch 'MDL-37401' of git://github.com/nobelium/moodle 2014-08-12 13:58:38 +01:00