Commit graph

1916 commits

Author SHA1 Message Date
Dan Marsden
eef4c4c175 MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db 2013-11-19 13:23:06 +13:00
Damyon Wiese
67016a4d39 Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle 2013-11-18 15:12:56 +08:00
Dan Poltawski
728f924ec1 Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle
Conflicts:
	mod/scorm/db/upgrade.php
2013-11-18 14:32:55 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +08:00
Dan Marsden
0d7eb69164 MDL-41695 SCORM: allow unlimited decimal places in CMIDecimal 2013-11-18 10:27:10 +13:00
Dan Marsden
27c58e5583 MDL-40223 SCORM: update scorm->launch param after restore - also check that scorm->launch is valid. 2013-11-18 09:44:54 +13:00
Eloy Lafuente (stronk7)
aa7bc816d9 Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle 2013-11-12 20:07:05 +01:00
Adrian Greeve
e351bed5c1 MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything. 2013-11-12 11:30:16 +08:00
Damyon Wiese
16fafb9aed Merge branch 'MDL-42803-master' of git://github.com/ankitagarwal/moodle 2013-11-11 17:16:51 +08:00
Ankit Agarwal
ddea17fc22 MDL-42803 behat: Fix random behat errors in CI 2013-11-11 14:03:26 +08:00
Sam Hemelryk
0fd6069ecd Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle 2013-11-11 13:10:44 +08:00
Adrian Greeve
5b1944bbba MDL-40612 libraries: Tidy up and improvement of the code for additional name fields.
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
2013-11-11 11:01:14 +08:00
Damyon Wiese
c8868cefe2 MDL-42679 Scorm: Remove stale yui shifted css files. 2013-11-08 11:54:48 +08:00
Andrew Nicols
1ef33d5914 MDL-42679 mod_scorm: Include gallery-sm-treeview for https support 2013-11-07 15:58:22 +08:00
Marina Glancy
09af1e2864 MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course 2013-11-06 14:21:24 +11:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Marina Glancy
8be0ca758c Merge branch 'MDL-42604-master' of git://github.com/ankitagarwal/moodle 2013-11-04 19:16:23 +11:00
Ankit Agarwal
e5eff0b626 MDL-42287 behat: Use string from scorm content, instead of scorm structure 2013-11-04 15:52:42 +08:00
Damyon Wiese
e0c14e5018 Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle 2013-11-02 22:24:19 +08:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00
Ankit Agarwal
fa3f7b972c MDL-42604 scorm: Minor coding style fixes 2013-10-31 14:29:15 +08:00
Ankit Agarwal
a0c779c198 MDL-42604 scorm: Fix division by zero warnings in error logs 2013-10-30 10:47:53 +08:00
Ankit Agarwal
fb6ce191a6 MDL-42287 behat: Add an autoamted test to test MDLQA-82 2013-10-29 10:38:35 +08:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
2013-10-07 13:10:36 +02:00
Sam Hemelryk
00a2879412 Merge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle 2013-09-30 12:09:50 +13:00
Sam Hemelryk
322d9c8cda Merge branch 'master_MDL-39910' of https://github.com/danmarsden/moodle
Conflicts:
	mod/scorm/db/upgrade.php
2013-09-27 11:32:05 +12:00
Dan Marsden
8d29a8c3bc MDL-39910 SCORM: set correct site level defaults. 2013-09-27 10:49:54 +12:00
Dan Marsden
18784adb12 MDL-39910 SCORM: set correct site level defaults. 2013-09-26 11:36:44 +02:00
Sam Hemelryk
bc29e8f07a Merge branch 'master_MDL-39910' of https://github.com/mayankgupta/moodle 2013-09-26 10:13:01 +12:00
Mayank Gupta
1680c75c88 MDL-39910 mod_scorm: fix enable/disable navigation buttons 2013-09-26 00:10:10 +12:00
Mayank Gupta
bb22cd80b7 MDL-39910 mod_scorm: fix enable/disable navigation buttons 2013-09-25 16:41:33 +05:30
Dan Marsden
6db676bfa1 MDL-39910 SCORM: hide toggle button when course structure disabled and fix upgrade of old settings 2013-09-25 19:25:37 +12:00
Sam Hemelryk
a78e39e3d3 Merge branch 'master_MDL-41580' of git://github.com/danmarsden/moodle 2013-09-25 09:27:44 +12:00
Dan Marsden
b64bc10cb7 MDL-41848 SCORM: Drag drop SCORM upload fix 2013-09-24 22:50:30 +12:00
Dan Marsden
361a47d409 MDL-41580 SCORM: allow imsmanifest.xml to be used in file system repos 2013-09-24 12:08:38 +12:00
Sam Hemelryk
c51fda57a9 MDL-39910 mod_scorm: fixed install.xml not nulls 2013-09-24 10:58:46 +12:00
Mayank Gupta
df5c7086c8 MDL-39910 mod_scorm: rewrite SCORM code in YUI3, use responsive grids, add new nav setting; squashing commits 2013-09-20 22:45:36 +12:00
Sam Hemelryk
0546f1bf8f NOBUG: fixed file permissions 2013-09-20 14:37:30 +12:00
Sam Hemelryk
669755a423 Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle 2013-09-19 09:49:31 +12:00
Dan Marsden
d6d0c4e00b MDL-38489 SCORM: obtain correct section number when getting course_url 2013-09-19 09:36:52 +12:00
Eloy Lafuente (stronk7)
e79ca991fb Merge branch 'master_MDL-32506' of git://github.com/danmarsden/moodle 2013-09-17 21:11:26 +02:00
Marina Glancy
9f21d24895 Merge branch 'MDL-41612_b' of git://github.com/rwijaya/moodle 2013-09-17 11:10:44 +10:00
Sam Hemelryk
29b56cfd09 MDL-38489 mod_scorm: added require to be explicit 2013-09-17 09:12:02 +12:00
Sam Hemelryk
77365f7ff6 Merge branch 'master_MDL-38489' of git://github.com/danmarsden/moodle 2013-09-17 09:02:32 +12:00
Rossiani Wijaya
b2970f963a MDL-41612 scorm: fix heading levels 2013-09-16 15:40:01 +08:00
Sam Hemelryk
31dea4fea4 Merge branch 'master_MDL-41434' of https://github.com/danmarsden/moodle 2013-09-16 15:07:57 +12:00
Dan Marsden
b98dcd7dd6 MDL-38489 SCORM: use course_get_format to obtain info 2013-09-16 10:17:51 +12:00
Vinnie Monaco
011ae52a91 MDL-38489 SCORM: added check for course display format 2013-09-16 10:17:51 +12:00
Dan Marsden
36136454b7 MDL-32506 SCORM: remove obsolete setting. 2013-09-16 10:16:16 +12:00
Dan Marsden
39355b46f9 MDL-37524 SCORM: mode not calculated correctly. 2013-09-16 10:12:49 +12:00