mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-05 00:22:43 +01:00
Code Issues Projects Releases Wiki Activity
63,548 Commits 36 Branches 523 Tags
Commit Graph

63548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Henning Bostelmann
d0372ed6f1 MDL-29069 Data / Glossary: allow disapproving entries 2013-09-04 20:37:46 +01:00
Tim Gus
179961e8a4 MDL-38570 administration: Temporary file deletion 
Added new function "cron_delete_from_temp" to delete old files and
directories under $CFG->tempdir during cron run. Unit test included.
 2013-09-04 13:48:01 -04:00
Dan Poltawski
bc16c7a0e3 Merge branch 'MDL-41568_master-fix_behat' of git://github.com/dmonllao/moodle 2013-09-04 16:59:20 +08:00
David Monllao
93a8bc8283 MDL-41568 lang: Fix behat features after changes 2013-09-04 15:16:59 +08:00
Marina Glancy
8f0137e192 MDL-41369 Pass viewing argument to more message screens 2013-09-04 17:11:30 +10:00
Damyon Wiese
fedb0325df Merge branch 'MDL-41485-master' of git://github.com/ankitagarwal/moodle 2013-09-04 12:24:54 +08:00
Damyon Wiese
3516b82c9d Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle 2013-09-04 11:45:07 +08:00
Dan Poltawski
259dfc2521 Merge branch 'wip-MDL-41369-master' of git://github.com/marinaglancy/moodle 2013-09-04 11:09:30 +08:00
Dan Poltawski
7e2a4e1638 Merge branch 'wip-mdl-41418' of git://github.com/rajeshtaneja/moodle 2013-09-04 10:38:10 +08:00
Dan Poltawski
4f9c5f332b Merge branch 'wip-MDL-41395-master' of git://github.com/marinaglancy/moodle 2013-09-04 10:33:33 +08:00
Damyon Wiese
1f08aa6685 MDL-28579 scorm: Fix broken unit tests 2013-09-04 09:44:05 +08:00
Damyon Wiese
8a4796fbcd Merge branch 'master_MDL-28579' of git://github.com/danmarsden/moodle 2013-09-04 09:00:48 +08:00
Eloy Lafuente (stronk7)
4e6f199203 MDL-41267 fix phpunit tests 2013-09-04 01:11:54 +02:00
Eloy Lafuente (stronk7)
f875599462 Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle 
Conflicts:
	lib/upgrade.txt
 2013-09-04 01:08:37 +02:00
Eloy Lafuente (stronk7)
df7995e3a0 Merge branch 'MDL-41146-master' of git://github.com/sammarshallou/moodle 2013-09-04 01:01:19 +02:00
Dan Marsden
b565637322 MDL-41290 SCORM: Improve user report 
put descriptions in help popups instead of in table.

AMOS BEGIN
MOV [interactionscorrectcount, mod_scorm],[trackcorrectcount_help, mod_scorm]
MOV [interactionslatency, mod_scorm],[tracklatency_help, mod_scorm]
MOV [interactionsresult, mod_scorm],[trackresult_help, mod_scorm]
MOV [interactionsscoremin, mod_scorm],[trackscoremin_help, mod_scorm]
MOV [interactionsscoremax, mod_scorm],[trackscoremax_help, mod_scorm]
MOV [interactionsscoreraw, mod_scorm],[trackscoreraw_help, mod_scorm]
MOV [interactionssuspenddata, mod_scorm],[tracksuspenddata_help, mod_scorm]
MOV [interactionstime, mod_scorm],[tracktime_help, mod_scorm]
MOV [interactionsweight, mod_scorm],[trackweight_help, mod_scorm]
AMOS END

Move userreport into /report and rename parameters to be more useful

fix overcomplicated parameter handling

remove SCORM 2004 specific reporting of objectives and interactions to simplify page - these will appear in full list of tracking data instead
Also remove duplicated data - the general tracks info is repated 3 times on the page so isn't required.

remove link to player as loading scos this way is problematic

split out user tracks table into it's own file

convert tracks table to flexible table and allow export

add new interactions report

add tabs to allow navigation between reports

force wrapping of track data value even when no spaces

fix some coding guideline stuff
 2013-09-04 09:56:48 +12:00
Dan Marsden
27b87c10bf MDL-28579 SCORM: use filemanager instead of old file picker 2013-09-04 09:51:41 +12:00
Eloy Lafuente (stronk7)
58c80b03a8 Merge branch 'MDL-40566_master' of git://github.com/dmonllao/moodle 2013-09-03 20:38:53 +02:00
Eloy Lafuente (stronk7)
f82a082ae2 Merge branch 'MDL-41568-en_fix' of git://github.com/mudrd8mz/moodle 2013-09-03 15:12:19 +02:00
Helen Foster
86698a4c72 MDL-41568 Merge English strings from the en_fix language pack 2013-09-03 12:31:35 +02:00
Marina Glancy
85708da63b MDL-41395 Improved phpdocs for coursecatlib.php 2013-09-03 19:23:44 +10:00
Sam Hemelryk
1eac203343 MDL-41395 improved phpdoc's for coursecatlib.php 2013-09-03 19:09:07 +10:00
Mary Evans
156da07f92 MDL-28561 blocks_rss_client: Fixes lines between RSS feed items are not showing in all themes. 2013-09-03 09:43:06 +01:00
Damyon Wiese
be62e59a93 Merge branch 'mdl26_MDL-41403_backup_reduce_memory_usage' of https://github.com/brki/moodle 2013-09-03 16:18:36 +08:00
Damyon Wiese
050167c3e6 Merge branch 'MDL-41348' of git://github.com/timhunt/moodle 2013-09-03 16:09:29 +08:00
Dan Poltawski
1f34b19a33 Merge branch 'mdl41304-master' of git://github.com/tlock/moodle 2013-09-03 16:05:38 +08:00
Damyon Wiese
e66c84a157 Merge branch 'MDL-29954-master' of git://github.com/danpoltawski/moodle 2013-09-03 16:02:47 +08:00
Jason Fowler
199c9375d0 MDL-35925 filepicker - Fixing behat tests 2013-09-03 15:43:56 +08:00
Damyon Wiese
a28f43e8c7 Merge branch 'wip-MDL-23044-master' of git://github.com/marinaglancy/moodle 2013-09-03 15:33:25 +08:00
Damyon Wiese
9591f9bc54 Merge branch 'wip-mdl-41413-int' of git://github.com/rajeshtaneja/moodle 2013-09-03 15:16:42 +08:00
Marina Glancy
a7e505e659 MDL-23044 Use Files API functions in filesystem cron 2013-09-03 17:00:29 +10:00
Rajesh Taneja
9077fc61f7 MDL-41413 Events: replaced course_deleted event handler with observer 2013-09-03 14:55:03 +08:00
Rajesh Taneja
8525a8f0d5 MDL-41413 Events: replaced role_unassigned event handler with observer 2013-09-03 14:54:58 +08:00
Rajesh Taneja
f58915f0bb MDL-41413 Events: replaced role_assigned event handler with observer 2013-09-03 14:54:44 +08:00
Damyon Wiese
ca83aa0b99 Merge branch 'MDL-37564' of https://github.com/nebgor/moodle 2013-09-03 14:49:42 +08:00
Damyon Wiese
ed204cb514 Merge branch 'MDL-33472-master' of git://github.com/danpoltawski/moodle 2013-09-03 14:35:58 +08:00
Damyon Wiese
060615d347 Merge branch 'm26_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle 2013-09-03 14:25:43 +08:00
Damyon Wiese
3e248a7dc8 Merge branch 'MDL-32690_restoreMissingAssignment_master' of https://github.com/moodlerooms/moodle 2013-09-03 14:13:00 +08:00
Dan Poltawski
5c1ba238d2 Merge branch 'MDL-41440_master' of https://github.com/markn86/moodle 2013-09-03 14:10:02 +08:00
Ankit Agarwal
f5c263836d MDL-41558 cache: Identifiers should never be passed as null to cache::make() 2013-09-03 13:37:50 +08:00
Ankit Agarwal
06f6885b27 MDL-41558 cache: Improve performance of cache::make() by using isset instead of array_key_exist() 2013-09-03 13:36:59 +08:00
Dan Poltawski
f3549a51a7 Merge branch 'w36_MDL-41255_m26_changepw' of https://github.com/skodak/moodle 2013-09-03 12:58:27 +08:00
Dan Poltawski
c247756b0c Merge branch 'MDL-41428-master' of git://github.com/FMCorz/moodle 2013-09-03 12:27:26 +08:00
Dan Poltawski
4ffd70f315 Merge branch 'wip-MDL-41179-master' of git://github.com/marinaglancy/moodle 2013-09-03 11:48:45 +08:00
Marina Glancy
24f824b924 MDL-41517 Do not call fix_course_sortorder unnecessarily 
Thanks to Thomas Worthington
 2013-09-03 13:45:00 +10:00
Adrian Greeve
146893d62f MDL-41556 - workshop: undefined constant FILE_INTERNAL message fixed. 2013-09-03 11:44:30 +08:00
Dan Poltawski
2793260fc0 MDL-41256 course tests: improve robustness 
* Fail if an exception isn't recieved
* Don't allow the possibility of an undefined variable being tested
 2013-09-03 11:01:15 +08:00
Dan Poltawski
c6569641e7 Merge branch 'MDL-41256-master' of https://github.com/mackensen/moodle 2013-09-03 10:51:27 +08:00
Dan Poltawski
29db803ac7 Merge branch 'wip-MDL-41317-master' of git://github.com/marinaglancy/moodle 2013-09-03 10:40:28 +08:00
David Monllao
fcc0b5b920 MDL-40566 behat: Update features using the new options 2013-09-03 10:31:57 +08:00