mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-31 05:52:51 +02:00
Code Issues Projects Releases Wiki Activity
54,960 Commits 36 Branches 527 Tags
Commit Graph

12460 Commits

Author SHA1 Message Date
Sam Hemelryk
bd1fdb6a1b Revert "MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results" 
This reverts commit 440821205aa03cf1a415f491296a0022abe64a8b.
 2012-07-12 18:20:48 +12:00
Dan Poltawski
2c0c3379fc Merge branch 'MDL-30844-master' of https://github.com/FMCorz/moodle 2012-07-10 14:47:35 +08:00
Dan Poltawski
e1980f8bb9 Merge branch 'w28_MDL-8249_m24_roletranslations' of git://github.com/skodak/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2012-07-10 09:43:23 +08:00
Sam Hemelryk
1ef3f066ee Merge branch 'w28_MDL-34175_m24_admin' of git://github.com/skodak/moodle 2012-07-10 12:43:48 +12:00
Dan Poltawski
5c509b058e Merge branch 'master_MDL-34198' of git://github.com/danmarsden/moodle 2012-07-10 08:34:18 +08:00
Sam Hemelryk
0f36bce51e Merge branch 'MDL-34061' of git://github.com/danpoltawski/moodle 2012-07-10 11:40:18 +12:00
Dan Poltawski
4e85084148 Merge branch 'MDL-18301-master' of git://github.com/FMCorz/moodle 2012-07-09 14:27:10 +08:00
Dan Poltawski
5e1e213707 Merge branch 'MDL-33030' of git://github.com/rwijaya/moodle 2012-07-09 13:42:26 +08:00
Sam Hemelryk
357f4d8ed7 Merge branch 'master_MDL-33822' of git://github.com/danmarsden/moodle 2012-07-09 17:24:13 +12:00
Sam Hemelryk
46bc0e2238 Merge branch 'MDL-33702-master' of git://github.com/ankitagarwal/moodle 2012-07-09 16:27:30 +12:00
Ankit Agarwal
9381c28084 MDL-33702 scorm: refactoring interraction report to use '2004 SCORM' score elements 2012-07-09 11:27:34 +08:00
Ankit Agarwal
57a32d3eb6 MDL-33702 scorm: Adding support for '2004 SCORM' progress status elements 2012-07-09 11:27:34 +08:00
Ankit Agarwal
d875cf9cdf MDL-33702 scorm: Adding support for '2004 SCORM' objectives status elements 2012-07-09 11:27:34 +08:00
Ankit Agarwal
1c2b2132e5 MDL-33702 scorm: Adding suppport for '2004 SCORM standard' score elements 2012-07-09 11:27:34 +08:00
Sam Hemelryk
440821205a MDL-33575 choice module: add label to checkbox element when privacy of results is set to publish full results 2012-07-09 10:56:14 +12:00
Sam Hemelryk
5261dab607 Merge branch 'MDL-30816' of git://github.com/rwijaya/moodle 2012-07-09 10:45:14 +12:00
Petr Skoda
c52551dc3c MDL-8249 localise standard role names and descriptions if empty 2012-07-06 08:22:34 +02:00
Petr Škoda
d6fc8d94e2 MDL-34175 a few more renamed admin fixes 2012-07-06 07:53:44 +02:00
Frederic Massart
455dc0de61 MDL-18301 Gradebook: Added feature for components to control grade visibility 2012-07-06 09:52:46 +08:00
Dan Marsden
c24bdac7dd MDL-34198 SCORM remove unecessary get_records call 2012-07-06 09:53:59 +12:00
Gilles-Philippe Leblanc
f007c032be MDL-33822 SCORM Interactions report - fix formatting of empty cells. 2012-07-06 09:45:44 +12:00
Eloy Lafuente (stronk7)
8049a5c413 Merge branch 'wip-MDL-33746-master' of git://github.com/marinaglancy/moodle 2012-07-05 14:19:06 +02:00
Marina Glancy
4b8d51d79a MDL-33746 make folder view look like filemanager tree view 2012-07-05 16:50:46 +08:00
Rossiani Wijaya
a50f89ecf5 MDL-30816 Choice module: add format_string() for choice name. 2012-07-05 12:16:30 +08:00
Rossiani Wijaya
0ed9c7456d MDL-30816 choice module: fixed accessibility for responses table and make it easier for screenreader to read it 2012-07-05 10:19:55 +08:00
Dan Poltawski
a274df85f9 MDL-34061 mod_resource: filter settings weren't coming from defaults 2012-07-04 14:06:58 +08:00
Sam Hemelryk
5804a2a31e Merge branch 'MDL-32614' of git://github.com/stronk7/moodle 2012-07-04 13:30:58 +12:00
Eloy Lafuente (stronk7)
b666885397 MDL-32614 lti: on restore, clean any typeid to convert the tool to selfcontained. 
This is known to be imperfect, awaiting for MDL-34161 to fix the whole thing. Also,
unrelated, there are some basiclti => lti replacements.
 2012-07-04 02:01:21 +02:00
Chris Scribner
420e6740e9 MDL-32614: Removing code which disassociated LTI instances from their tool types upon restore. 2012-07-04 01:34:20 +02:00
Sam Hemelryk
3778f990cc Merge branch 'MDL-31692' of git://github.com/danpoltawski/moodle 2012-07-04 10:07:54 +12:00
Sam Hemelryk
e537a588d8 Merge branch 'MDL-33828-master' of git://github.com/FMCorz/moodle 2012-07-03 16:35:32 +12:00
Dan Poltawski
d4c16e8b63 Merge branch 'master_MDL-33938' of git://github.com/danmarsden/moodle 
Conflicts:
	mod/scorm/db/upgrade.php
 2012-07-03 12:19:07 +08:00
Frederic Massart
c31dc0b695 MDL-33828 Portfolio: prevent notices while exporting to portfolios 2012-07-03 09:33:17 +08:00
Eloy Lafuente (stronk7)
9039021b25 Merge branch 'MDL-33499' of git://github.com/netspotau/moodle-mod_assign 2012-07-03 02:15:57 +02:00
Eloy Lafuente (stronk7)
f1d9ceb0e4 Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle 2012-07-03 01:58:48 +02:00
Eloy Lafuente (stronk7)
5d16ab2bba Merge branch 'MDL-33796-master' of git://github.com/FMCorz/moodle 2012-07-03 01:04:47 +02:00
Sam Hemelryk
4f5263d969 Merge branch 'MDL-34029_upgrade_documentation' of git://github.com/davosmith/moodle 2012-07-03 10:55:29 +12:00
Sam Hemelryk
a0c400598e Merge branch 'MDL-33848' of git://github.com/netspotau/moodle-mod_assign 2012-07-03 10:20:56 +12:00
Dan Poltawski
79121bb8ef Merge branch 'wip-MDL-33948-master' of git://github.com/marinaglancy/moodle 2012-07-02 17:44:01 +08:00
Dan Poltawski
0acd31fba8 Merge branch 'MDL-34109' of git://github.com/timhunt/moodle 2012-07-02 16:42:56 +08:00
Dan Poltawski
73c672f593 Merge branch 'MDL-34025_master' of https://github.com/markn86/moodle 2012-07-02 16:28:05 +08:00
Dan Poltawski
bfcc865709 Merge branch 'MDL-33924' of git://github.com/timhunt/moodle 2012-07-02 16:19:14 +08:00
Dan Poltawski
6a84f5ae74 Merge branch 'master_MDL-33914' of git://github.com/danmarsden/moodle 2012-07-02 16:14:07 +08:00
Dan Poltawski
637406f3c0 Merge branch 'm23_MDL-33053_AICC_flattened_TOC' of git://github.com/scara/moodle 2012-07-02 15:50:09 +08:00
Rossiani Wijaya
32bb764891 MDL-33030 Lesson module: fixed progress bar 2012-07-02 15:43:32 +08:00
Dan Poltawski
ba17a42133 Merge branch 'MDL-9073-master' of github.com:FMCorz/moodle 2012-07-02 15:33:31 +08:00
Dan Poltawski
977f05940d Merge branch 'master_MDL-31203_advanced_forum_search_always_reverts_date_from_and_to' of git://github.com/kanikagoyal/moodle 2012-07-02 15:23:52 +08:00
Dan Poltawski
eca8e9aca1 Merge branch 'MDL-26465' of git://github.com/rwijaya/moodle 2012-07-02 15:18:26 +08:00
Dan Poltawski
1e1af1cd15 Merge branch 'MDL-31987_assignment' of git://github.com/rwijaya/moodle 2012-07-02 15:12:39 +08:00
Dan Poltawski
337b34fac0 Merge branch 'MDL-34054' of git://github.com/timhunt/moodle 2012-07-02 14:56:50 +08:00