mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-04 08:06:30 +01:00
Code Issues Projects Releases Wiki Activity
48,623 Commits 36 Branches 523 Tags
Commit Graph

10879 Commits

Author SHA1 Message Date
Petr Skoda
f08e5e984a MDL-28337 add parameters explanation in URL resource configuration 2011-07-22 22:16:52 +02:00
Petr Skoda
5e85f7b50b MDL-27523 fix phpdocs packages 2011-07-18 16:03:15 +02:00
Petr Skoda
d6a1c91bee Merge branch 'master_MDL-27523' of git://github.com/danmarsden/moodle 2011-07-18 15:58:59 +02:00
Petr Skoda
7856cd8b8c Merge branch 'wip-MDL-27305-master' of git://github.com/samhemelryk/moodle 2011-07-18 15:13:44 +02:00
Sam Hemelryk
a4c3145984 Merge branch 'MDL-27555' of git://github.com/rwijaya/moodle 2011-07-18 21:50:50 +10:00
Sam Hemelryk
47fa86b306 Merge branch 'w28_MDL-28344_m22_clickjacking' of git://github.com/skodak/moodle 2011-07-18 19:47:59 +10:00
Sam Hemelryk
761a000f73 Merge branch 'MDL-28298-workshop-constant' of git://github.com/mudrd8mz/moodle 2011-07-19 00:39:02 +10:00
Sam Hemelryk
5f65d37cd2 Merged branch 'master_MDL-26482' of git://github.com/danmarsden/moodle.git 2011-07-19 00:25:13 +10:00
Ankit Kumar Agarwal
4942a84bd6 MDL-27523 Fixing get_string issues 2011-07-15 09:27:02 +12:00
Petr Skoda
595646d15b MDL-28344 remove the unused $CFG->framename 2011-07-14 21:40:50 +02:00
Dan Marsden
99da7a9523 MDL-26482 SCORM add option to disable TOC completely - thanks to Clark Burns for some help! 2011-07-14 11:06:49 +12:00
Dan Marsden
7b6f5c8d1e MDL-28300 SCORM Fix check for SCORM 2004 thanks to Silvia Bastos for report/patch 2011-07-14 11:01:16 +12:00
Ankit Kumar Agarwal
219f919c24 MDL-27523 Small Fixes 2011-07-14 10:57:29 +12:00
Ankit Kumar Agarwal
f8f34f823d MDL-27523 Minor Edits 2011-07-14 10:57:29 +12:00
Dan Marsden
5e3014df9e MDL-27523 tidy up links to download files, shift logic for set_page to allow mode to be set correctly 2011-07-14 10:57:29 +12:00
Dan Marsden
b2614417a5 MDL-27523 SCORM move plugin links to tabs page and only show if more than one plugin is installed, move delete attempts code into plugin as it may not be supported in all plugins, general tidy up - good work Ankit! 2011-07-14 10:57:29 +12:00
Ankit Kumar Agarwal
62b82cbcff MDL27522 First version Push 
modified:   mod/scorm/report.php
	new file:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports-remove users report to seperate files for better re-use

	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports validated reportuser.php

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM REPORT - updating reportuser.php to use MUST_EXIST parameter

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- Cleaning of codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports- update formating

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reports removed unwanted codes from reportuser.php

	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports - optimising codes

	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 Scorm Reports-Formating report.php
	modified:   mod/scorm/report.php

MDL-27522 Scorm Reporting - removing unsed variables

	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/reportuser.php

MDL-27522 SCORM Reporting - Renaming reportuser.php to userreport.php
	new file:   mod/scorm/userreport.php

MDL-27522 SCORM Reporting - deleting old reportuser.php

	deleted:    mod/scorm/reportuser.php

MDL-27522 Scorm Reporting - updated version number

MDL-27522 Scorm Reporting - Discarding version changes

MDL-27523 Scorm Reporting - Basic reporting plugin
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Database Table structure pushed
	new file:   mod/scorm/db/subplugins.php

MDL-27523 Scorm Reporting - Plugin container codes
	modified:   mod/scorm/report.php
	modified:   mod/scorm/tabs.php

MDL-27523 Scorm Reporting - Capability update
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - commenting files
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/version.php

MDL-27523 Scorm Reporting - Formating codes
	modified:   mod/scorm/report/basic/db/install.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/basic/version.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - fixing small bugs
	modified:   mod/scorm/report/basic/report.php

MDL-27523 Scorm Reporting - added databse upgrade code to scorm/db/upgrade.php

MDL-27523 Scorm Reporting - small optimisations

MDL-27523 SCorm Reporting - Removing Mod.php

MDL-27523 Scorm Reporting - Minor Fixes

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php

	modified:   mod/scorm/db/install.xml
	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/db/install.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php

MDL-27523 Scorm Reporting - Removing Database Refereneces

MDL-27523 Scorm Reporting - Updating structure to remove DB usage
	modified:   mod/scorm/db/upgrade.php
	modified:   mod/scorm/report.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

MDL-27523 Scorm Reporting - Minor fixes

MDL-27523 Scorm Reporting - Formating codes

MDL-27523 Scorm Reporting - Foramting Codes
	modified:   mod/scorm/report/basic/lang/en/scorm_basic.php
	modified:   mod/scorm/report/basic/report.php
	modified:   mod/scorm/report/default.php
	modified:   mod/scorm/report/reportlib.php

	new file:   mod/scorm/db/subplugins.php
	modified:   mod/scorm/lang/en/scorm.php
	modified:   mod/scorm/report.php
	new file:   mod/scorm/report/basic/lang/en/scorm_basic.php
	new file:   mod/scorm/report/basic/report.php
	new file:   mod/scorm/report/basic/version.php
	new file:   mod/scorm/report/default.php
	new file:   mod/scorm/report/reportlib.php
	modified:   mod/scorm/tabs.php
	modified:   mod/scorm/userreport.php
	modified:   mod/scorm/version.php
 2011-07-14 10:57:29 +12:00
David Mudrak
c8ea2c4572 MDL-28298 workshop: do not use a constant without explicit inclusion of the library 
Instead of including whole formslib just to get the constant defined, I
decided to hard-code the value and put the reference to the comment so
that eventual grep would spot it. Of course that is is not nice at all
but it's lesser of two evils imho.
 2011-07-13 10:28:28 +02:00
Chris Follin
84b2b9aa77 MDL-27305 forum: Added missing item to forum_get_view_actions 2011-07-13 14:22:18 +08:00
Eloy Lafuente (stronk7)
e62a947eec Merge branch 'MDL-28221-resource-conversion' of git://github.com/mudrd8mz/moodle 2011-07-12 16:57:54 +02:00
Eloy Lafuente (stronk7)
dd8f2538b6 Merge branch 'master_MDL-28017' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/version.php
 2011-07-12 16:28:36 +02:00
Dan Marsden
59cdcb9770 MDL-28017 - SCORM unset old config var 2011-07-12 09:46:23 +12:00
David Mudrak
47f5964381 MDL-28221 Legacy resource URL pointing to the course itself are migrated as File module 
This patch replays the logic of resource_20_migrate() function. If a
file is referred via URL to the course files of the course being
backed up, then such a resource is converted to the File module
(mod/resource) rather than URL module.
 2011-07-11 23:30:28 +02:00
David Mudrak
498c722d0f MDL-28221 resource: improved file not found handling 
When the referenced file is not found, do not rely on the record in
resource_old as the resource can be actually restored from a 1.9 backup.
 2011-07-11 23:30:28 +02:00
David Mudrak
c6c9a3bcdb MDL-28221 resource: fixed a typo in variable names 2011-07-11 23:30:28 +02:00
Eloy Lafuente (stronk7)
701570b5e4 Merge branch 'master_MDL-26942' of git://github.com/danmarsden/moodle 2011-07-11 19:47:14 +02:00
Eloy Lafuente (stronk7)
7660f09ee6 Merge branch 'MDL-27741' of git://github.com/rwijaya/moodle 2011-07-11 19:35:41 +02:00
Eloy Lafuente (stronk7)
3fe120a6c6 Merge branch 'MDL-26165' of git://github.com/timhunt/moodle 2011-07-11 16:32:17 +02:00
Eloy Lafuente (stronk7)
cf5b3dad05 Merge branch 'MDL-27483' of git://github.com/timhunt/moodle 2011-07-11 16:25:42 +02:00
Eloy Lafuente (stronk7)
d5497dcc86 MDL-28109 scorm - new settings => version bump 2011-07-11 15:54:11 +02:00
Eloy Lafuente (stronk7)
2abfc1c630 Merge branch 'master_MDL-28109' of git://github.com/danmarsden/moodle 2011-07-11 15:42:21 +02:00
Rossiani Wijaya
0d3780a1e8 MDL-27741 forum subscribe link: Removed 'no' string in social course format to display a subscribe link if user is not enrolled 2011-07-11 17:07:55 +08:00
Sam Hemelryk
59772e4749 Merge branch 'wip-mdl-27954' of git://github.com/rajeshtaneja/moodle 2011-07-11 16:01:26 +08:00
Dan Marsden
6eca9e1c63 MDL-28017 SCORM - remove admin setting incorrectly added as it was never used. 2011-07-11 15:42:53 +12:00
Sam Hemelryk
7a5c6b98e1 Merge branch 'master_MDL-27947' of git://github.com/danmarsden/moodle 2011-07-11 11:31:13 +08:00
Sam Hemelryk
f7776c0fc8 Merge branch 'glossary_multilang_master' of git://github.com/stronk7/moodle 2011-07-11 11:14:44 +08:00
Rajesh Taneja
ea2052ab8e MDL-27954 mod_database - fixed search navigation link 2011-07-11 10:09:44 +08:00
Eloy Lafuente (stronk7)
b86f930647 MDL-28048 glossary - fix double ampersand & missing string 2011-07-11 01:36:30 +02:00
Eloy Lafuente (stronk7)
bce3e3dca5 MDL-28048 glossary - add multilang support to categories 2011-07-11 01:02:06 +02:00
Dan Marsden
3c0b04c440 MDL-28109 - allow admin to decide which scorm settings are advanced, tidy up order of settings 2011-07-11 10:18:16 +12:00
Dan Marsden
0ffaa76be3 MDL-28109 - allow adming to decide which scorm settings are advanced, tidy up order of settings 2011-07-10 11:10:56 +12:00
Eloy Lafuente (stronk7)
aef91ddfa7 MDL-27018 restore - decode links missing url->externalurl support 2011-07-09 13:33:50 +02:00
Dan Marsden
c5803aaa7f MDL-27947 - fix TOC display on skipview - use correct org in TOC title 2011-07-09 11:40:32 +12:00
Dan Marsden
8a4561accc SCORM MDL-26942 - get first scoid if not set 2011-07-09 11:06:36 +12:00
Dan Marsden
8cb7096bc5 SCORM MDL-26942 - fix ending of lists. 2011-07-09 11:06:35 +12:00
Dan Marsden
b6c88d755b SCORM MDL-26942 - initial fix for list in toc 2011-07-09 11:06:35 +12:00
Dan Marsden
0797000aa9 SCORM MDL-26942 - move scorm_get_toc to locallib.php 2011-07-09 11:06:35 +12:00
Dan Marsden
27a9658f97 SCORM MDL-26942 remove empty file and add todo 2011-07-09 11:06:35 +12:00
Dan Marsden
db0a77cc1a SCORM MDL-26942 merge scorm_get_toc to decrease duplicated code and simplify toc display 2011-07-09 11:05:54 +12:00
Eloy Lafuente (stronk7)
7e1fa4f019 fix permissions 2011-07-08 11:13:19 +02:00