10448 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
97fefd2386 Merge branch 'w16_MDL-27148_m21_stringinc' of git://github.com/skodak/moodle 2011-04-18 01:15:56 +02:00
Petr Skoda
af4378aee9 Merge branch 'master_MDL-26880_SCORM2004_tracking_fix' of git://github.com/danmarsden/moodle 2011-04-17 17:16:03 +02:00
Petr Skoda
13516b7c1f Merge branch 'master_MDL-24734_gradefix' of git://github.com/danmarsden/moodle 2011-04-17 17:09:05 +02:00
Petr Skoda
6b7fb33661 Merge branch 'master_MDL-18392_slash_cleanup' of git://github.com/danmarsden/moodle 2011-04-17 17:02:15 +02:00
Dan Marsden
4f4a8acf3b SCORM MDL-24734 - fix display of grade information on view.php page - also fixes some XHTML in the same function. 2011-04-16 19:34:04 +12:00
Petr Skoda
cf717dc26b MDL-27148 use new get_in_or_equal() param prefix instead of start 2011-04-14 15:15:01 +02:00
Nadav Kavalerchik
b41fc49c26 CSS MDL-26013 Fixed several display bugs when using right to left languages 2011-04-14 15:56:10 +08:00
Matteo Scaramuccia
74ef6bd82d PULL-498 - Fixed potential issues about UTF-8 and multilang filter by adopting pure ASCII chars, the SCO primary key 2011-04-14 10:28:36 +12:00
Matteo Scaramuccia
0ec0224b9a MDL-26880 - Fixed missing of activity id
Moved errorCode as global, to allow GetLastError() to work
Applied MDL-17891 mechanism against AJAX failures, "true if true, false otherwise"
Limited what added to log when in debug, to be compliant with mdl_log.action as VARCHAR(40)
2011-04-14 10:28:31 +12:00
Dan Marsden
4f6e39db5e Merge remote branch 'moodle/master' into master_MDL-18392_slash_cleanup 2011-04-14 09:15:48 +12:00
Dan Marsden
3825bed0e8 SCORM MDL-18392 - remove old call to stripslashes 2011-04-13 20:05:30 +12:00
Matteo Scaramuccia
454f5aeef6 SCORM MDL-18392 MDL-26282 - Fixed calls to add/strip slashes 2011-04-13 20:05:19 +12:00
Eloy Lafuente (stronk7)
9ff913b716 Merge branch 'MDL-26778-master' of git://github.com/sammarshallou/moodle 2011-04-11 17:48:29 +02:00
Petr Skoda
337d8b1489 Merge branch 'wip-MDL-26599' of git://github.com/samhemelryk/moodle 2011-04-11 14:09:15 +02:00
sam marshall
6553cda7c9 MDL-26778 Change to completion should immediately affect nav block
Includes change so that updating completion resets the cache, and a debugging
warning if any module calls the completion viewed thing after it's already
printed navigation (which will mean navigation obviously doesn't update right
away). All existing modules that currently update after printing navigation
were updated.
2011-04-11 12:40:13 +01:00
Sam Hemelryk
2e79cd117a Merge branch 'MDL-25746' of git://github.com/nebgor/moodle 2011-04-11 15:35:03 +08:00
Aparup Banerjee
16265f06d1 MDL-25746 fixed db tempate page layout to prevent hidden content layers 2011-04-11 15:15:58 +08:00
Sam Hemelryk
65f2fad9a0 mod-lesson MDL-26599 Fixed echo causing incorrect nesting. 2011-04-11 10:16:35 +08:00
Eloy Lafuente (stronk7)
b34324a73e Merge branch 'w15_MDL-27094_m21_assval' of git://github.com/skodak/moodle 2011-04-11 01:33:17 +02:00
Eloy Lafuente (stronk7)
b5f9a6d302 Merge branch 'mdl27084' of git://github.com/tlevi/moodle 2011-04-10 23:41:01 +02:00
Petr Skoda
aa25e42ba2 MDL-27094 fix incorrect assignment form validation method name
Credit goes to H. Hanna
2011-04-10 21:03:02 +02:00
Tony Levi
05edae9f89 MDL-27084: mod/feedback fix bad syntax in database query 2011-04-05 12:14:16 +09:30
David Mudrak
91dedc324f MDL-26784 Strings for the new plugin manager
The new strings file core_plugin defines names of all plugin types
supported by Moodle. Some strings have already been defined elsewhere
and we use AMOS script here to copy their translation, if it is
available.

AMOS BEGIN
 CPY [settings,core],[settings,core_plugin]
 CPY [status,core],[status,core_plugin]
 CPY [missingfromdisk,core],[status_missing,core_plugin]
 CPY [nodatabase,core_admin],[status_nodb,core_plugin]
 CPY [authenticationplugins,core],[type_auth_plural,core_plugin]
 CPY [block,core],[type_block,core_plugin]
 CPY [blocks,core],[type_block_plural,core_plugin]
 CPY [coursereport,core],[type_coursereport,core_plugin]
 CPY [coursereports,core],[type_coursereport_plural,core_plugin]
 CPY [filter,core],[type_filter,core_plugin]
 CPY [courseformats,core],[type_format_plural,core_plugin]
 CPY [activitymodule,core],[type_mod,core_plugin]
 CPY [activitymodules,core],[type_mod_plural,core_plugin]
 CPY [plagiarism,core_plagiarism],[type_plagiarism,core_plugin]
 CPY [portfolio,core_portfolio],[type_portfolio,core_plugin]
 CPY [portfolios,core_portfolio],[type_portfolio_plural,core_plugin]
 CPY [questiontype,core_admin],[type_qtype,core_plugin]
 CPY [questiontypes,core_admin],[type_qtype_plural,core_plugin]
 CPY [repository,core_repository],[type_repository,core_plugin]
 CPY [theme,core],[type_theme,core_plugin]
 CPY [themes,core],[type_theme_plural,core_plugin]
 CPY [uninstallplugin,core_admin],[uninstall,core_plugin]
 CPY [version,core],[version,core_plugin]
 CPY [assignmenttype,mod_assignment],[subplugintype_assignment,mod_assignment]
 CPY [presets,mod_data],[subplugintype_datapreset_plural,mod_data]
 CPY [evaluationmethod,mod_workshop],[subplugintype_workshopeval,mod_workshop]
 CPY [strategy,mod_workshop],[subplugintype_workshopform,mod_workshop]
AMOS END
2011-03-31 13:59:05 +02:00
Petr Skoda
b2b9320570 Merge branch 'MDL-26425' of git://github.com/timhunt/moodle 2011-03-28 16:49:49 +02:00
Eloy Lafuente (stronk7)
e1feb94cd1 Merge branch 's8_MDL-26213_wiki_rewrite_file_url' of git://github.com/dongsheng/moodle 2011-03-28 11:48:58 +02:00
Dongsheng Cai
cfdac90f2b MOD-WIKI MDL-26213
1. Rewrite the image urls in diff.php and viewdiff.php
2. Fxied image urls in search.php
3. Add modcontext variable to avoid using duplicated
get_context_instance calls
2011-03-28 17:31:01 +08:00
Tim Hunt
a208aefbc4 MDL-26425 change all table subclasses to use parent::__construct 2011-03-27 20:06:45 +01:00
Dan Marsden
6d64106306 Forum Overview MDL-26957 add classes to allow better control by theme 2011-03-24 14:42:57 +13:00
Eloy Lafuente (stronk7)
34c0b5bd86 MDL-26848 I left one remaining "xxx" there, grrr 2011-03-22 12:28:57 +01:00
Eloy Lafuente (stronk7)
18e3cba749 MDL-26848 fixing some "stupid" comments and specs of 1 field 2011-03-21 22:20:17 +01:00
Eloy Lafuente (stronk7)
c6f7c3e7f3 Merge branch 'MDL-26848' of git://github.com/timhunt/moodle 2011-03-21 21:56:46 +01:00
Eloy Lafuente (stronk7)
b9c6ce2d19 Merge branch 'm20_MDL-26905_AICC_API_missing_currentorg_init' of git://github.com/scara/moodle 2011-03-21 21:38:23 +01:00
Eloy Lafuente (stronk7)
be5eb0013e Merge branch 'MDL-26863_wrong_appendtolog_statement' of git://github.com/scara/moodle 2011-03-21 21:15:54 +01:00
Eloy Lafuente (stronk7)
63187a6887 Merge branch 'm20_MDL-26894_SCORM13_PHP_notice_undefined_prop_id' of git://github.com/scara/moodle 2011-03-21 21:03:15 +01:00
Eloy Lafuente (stronk7)
1595b8120f Merge branch 'MDL-26861' of git://github.com/timhunt/moodle 2011-03-21 20:59:32 +01:00
Petr Skoda
dca072aedc Merge branch 'MDL-26571_lesson_scale' of git://github.com/andyjdavis/moodle 2011-03-21 14:52:11 +01:00
Petr Skoda
e5be555c27 Merge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle 2011-03-21 14:49:18 +01:00
Matteo Scaramuccia
c6e46d37bc MDL-26905 - Fixed missing of currentorg initialization in AICC API 2011-03-20 23:54:39 +01:00
Matteo Scaramuccia
36c0108a2f MDL-26894: merged from SCORM 1.2 (scorm_12lib.php) after an XDebug audit session 2011-03-19 11:15:10 +01:00
Tim Hunt
8c448e1c83 MDL-26861 quiz view align Summary of your previous attempts table consistenty
Fix thanks to Joseph Rézeau.
2011-03-19 09:31:27 +00:00
Matteo Scaramuccia
77e889a0ef MDL-26863: fixed regression by an appropriate Merging From Branch using 1.9 2011-03-17 18:15:42 +01:00
Tim Hunt
ea003cd59a MDL-26848 get rid of stupid unsigned columns in the quiz statistics report. 2011-03-17 12:48:01 +00:00
Petr Skoda
72650054f4 MDL-26833 send forum notifications to active enrolled users only 2011-03-16 23:26:00 +01:00
Andrew Davis (andyjdavis)
f51cda3d09 lesson MDL-26571 made lesson accept a custom scale 2011-03-16 17:27:59 +08:00
Andrew Davis (andyjdavis)
76027a9f65 lesson MDL-26768 lesson was inserting a grade of 0 when a user id and a null raw grade were supplied 2011-03-16 10:26:12 +08:00
Eloy Lafuente (stronk7)
e5e64a4886 Merge branch 'w11_MDL-26697_20_media' of git://github.com/skodak/moodle
Conflicts:
	theme/formal_white/config.php
2011-03-15 15:21:02 +01:00
Petr Skoda
b0b4ab1aff Merge branch 'MDL-26464_m20_v2' of github.com:skodak/moodle 2011-03-14 20:55:04 +01:00
Petr Skoda
0393a8b706 MDL-26464 improve coding style and fix phpdocs 2011-03-14 20:54:00 +01:00
Eloy Lafuente (stronk7)
6326817e0f Merge branch 'MDL-26767' of git://github.com/timhunt/moodle 2011-03-14 12:07:41 +01:00
Eloy Lafuente (stronk7)
9f091bcd45 Merge branch 's7_MDL-9376_qaforum' of git://github.com/dongsheng/moodle 2011-03-14 01:22:10 +01:00