mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-02 06:52:36 +02:00
Code Issues Projects Releases Wiki Activity
62,091 Commits 36 Branches 528 Tags
Commit Graph

1337 Commits

Author SHA1 Message Date
Damyon Wiese
c2bee5e0d1 Merge branch 'master_MDL-37484' of git://github.com/danmarsden/moodle 2013-07-09 13:33:42 +08:00
Adrian Greeve
a327f25ef1 MDL-31776 - lib: Alternate name fields 
Add support for additional name fields and flexible formating of
user names.
 2013-07-09 11:45:50 +08:00
Dan Marsden
f2b3e82b09 MDL-37484 SCORM: disable toc in player when using direct AICC url 2013-07-05 14:37:20 +12:00
Eloy Lafuente (stronk7)
9a6a2d1ce0 Merge branch 'get_users_by_capability_fix_master' of http://github.com/timgus/moodle 2013-07-02 00:46:30 +02:00
Tim Gus
74816ad801 MDL-40259 - For SCORM reports limit fields returned from 
get_users_by_capability to user ID to decrease memory utilization
 2013-06-20 15:48:40 -04:00
Sam Hemelryk
68e33c2932 Merge branch 'm26_MDL-40095_Completion_locked_Error_on_save' of https://github.com/scara/moodle 2013-06-17 16:14:00 +12:00
Dan Poltawski
19c1e0b80a Merge branch 'master_MDL-39239' of git://github.com/danmarsden/moodle 2013-06-12 16:49:29 +08:00
Dan Marsden
93c984a829 MDL-39239 SCORM: drop old imsrepository code - it doesn't work anyway. 2013-06-12 09:47:26 +12:00
Matteo Scaramuccia
6a75660eff MDL-40095 SCORM: Trivial comments tidy up 2013-06-10 20:48:05 +02:00
Matteo Scaramuccia
82bd0c6643 MDL-40095 SCORM: Fixed DML error when saving with completion options locked 
Regression caused by MDL-38315.
 2013-06-10 20:47:48 +02:00
Sam Hemelryk
e559265c10 Merge branch 'wip-MDL-39227-master' of git://github.com/phalacee/moodle 2013-06-10 11:43:31 +12:00
David Mudrák
b60ab47cb7 MDL-39939 Fix the basic SCORM report plugin name 2013-05-30 22:42:12 +02:00
Jason Fowler
f505aab201 MDL-39227 - SCORM - repositioning the navigation panel to be visible in all themes at all resolutions 2013-05-22 15:14:56 +08:00
Eloy Lafuente (stronk7)
c9e54743ec MDL-39753 Add 2.5.0 upgrade line 2013-05-20 15:33:19 +02:00
Damyon Wiese
e872912d1c Merge branch 'MDL-39363-master' of git://github.com/ankitagarwal/moodle 2013-05-20 12:12:23 +08:00
Helen Foster
9f3e096899 MDL-39642 Merge English strings from the en_fix language pack 2013-05-13 09:58:43 +02:00
Frederic Massart
9fba869836 MDL-38757 scorm: Remove advanced settings (except for Appearance) 2013-05-09 17:20:11 +08:00
Frederic Massart
20b51a1134 MDL-38757 scorm: Reformat SCORM package module settings 2013-05-09 17:20:07 +08:00
Mark Nelson
e019dcccdf MDL-39463 forms: use the date selectors 'optional' parameter rather than creating additional logic 2013-05-08 16:36:54 +08:00
Damyon Wiese
14cd6479de Merge branch 'MDL-38315-master' of git://github.com/sammarshallou/moodle 2013-05-06 22:27:41 +08:00
Damyon Wiese
da97cfe35e Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle 2013-05-06 21:57:19 +08:00
Eloy Lafuente (stronk7)
cedb0aab5a MDL-39434 Bump all versions near 2.5 release 2013-05-01 18:03:29 +02:00
sam marshall
a9f5fc158c MDL-38315 Completion: Bugs with 'locked' status in activity form 2013-05-01 11:57:29 +01:00
Sam Hemelryk
d25103c4ef Merge branch 'MDL-39422-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	mod/wiki/mod_form.php
 2013-05-01 11:15:24 +12:00
Dan Poltawski
a74cd33160 MDL-39422 mod_forms: prevent long coruse module names 
To prevent ugly DB errors.
 2013-04-30 17:41:36 +01:00
Ankit Agarwal
d8d0b8b390 MDL-39363 scorm: Accept 0 as a valid score 2013-04-29 16:53:15 +08:00
Ankit Agarwal
325c730ba1 MDL-39365 scorm reports: Return correct track count 2013-04-29 13:26:09 +08:00
Dan Poltawski
9da8c53295 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 2013-04-24 09:08:23 +01:00
Davo Smith
c23ff8e3a5 MDL-39219 mod_scorm - make sure YUI JSON module is loaded 2013-04-23 18:58:09 +01:00
Dan Poltawski
88dbfc453e Merge branch 'MDL-39296-master' of git://github.com/ankitagarwal/moodle 2013-04-23 12:50:44 +01:00
Ankit Agarwal
647a3fc81c MDL-39296 scorm reports: Fix undefined variables in graphs report 2013-04-23 12:03:00 +08:00
Dan Poltawski
b93945e9b9 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 
Conflicts:
	mod/scorm/module.js
 2013-04-19 15:20:02 +01:00
Davo Smith
c4dccb99fb MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility 2013-04-18 12:44:24 +01:00
Dan Poltawski
f7f1465f91 Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-16 13:26:34 +01:00
Matteo Scaramuccia
5ecd13bc66 MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets 2013-04-11 22:44:29 +02:00
Matteo Scaramuccia
aefeca7793 MDL-35840 SCORM TOC: fixed a typo, improvements on getting the focus 2013-04-08 09:43:20 +12:00
Dan Marsden
c848280ad8 MDL-37844 SCORM: fix js error and highlight selected node in TOC. 2013-04-08 09:39:05 +12:00
Andrea Bicciolo
0e633595d8 MDL-38480_m Fix for messy usage of language strings in block course overview 2013-04-05 12:30:22 +02:00
Dan Poltawski
c39896e85d Revert "MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets" 
This reverts commit fe104762c9acb0e178ae1d5ffe514c8109f48f0a.
 2013-04-05 14:34:07 +08:00
Dan Poltawski
369496c31e Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-03 17:22:38 +08:00
Aparup Banerjee
b8eb2f3dc6 Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle 2013-04-03 16:48:53 +08:00
Dan Poltawski
899fd9372f Merge branch 'master_MDL-38715' of git://github.com/danmarsden/moodle 2013-04-02 16:11:01 +08:00
Matteo Scaramuccia
fd10686843 MDL-38745 SCORM: fixed appending 'API logging is on|off', once per launch 2013-03-28 22:28:06 +01:00
Matteo Scaramuccia
cc351edaf0 MDL-38745 SCORM: fixed doubling double quotes for 'even' and 'odd' 2013-03-28 22:28:03 +01:00
Matteo Scaramuccia
fe104762c9 MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets 2013-03-28 22:22:19 +01:00
Dan Marsden
1de23b7fdc MDL-38715 SCORM fix missing calls to setType and remove old call to setMaxFileSize 2013-03-28 12:38:27 +13:00
Matteo Scaramuccia
724dc929c7 MDL-38336 SCORM: incorrect TOC bulding when 'Display course structure' is on 2013-03-24 11:02:41 +01:00
Ankit Agarwal
6e9d3c19e3 MDL-38370 scorm: Fixing strict standard errors in outline report 2013-03-12 11:43:10 +08:00
Andrew Robert Nicols
5251450372 MDL-31390 Convert set_source_sql with order clauses to set_source_table 2013-03-01 11:29:01 +00:00
Dan Poltawski
61df003d53 Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle 2013-02-19 15:04:56 +08:00