Note: You are currently viewing documentation for Moodle 2.3. Up-to-date documentation for the latest stable version is available here: Unmerged files.

Development:Unmerged files: Difference between revisions

From MoodleDocs
Line 77: Line 77:
  RCS file: /cvsroot/moodle/moodle/user/messageselect.php,v
  RCS file: /cvsroot/moodle/moodle/user/messageselect.php,v


==Files with MOODLE_17_MERGED tag not updated - Fri Mar 30 19:34:49 CEST 2007 ==
==Files with MOODLE_17_MERGED tag not updated - Sat Mar 31 00:33:24 CEST 2007 ==
 
RCS file: /cvsroot/moodle/moodle/admin/oacleanup.php,v
< <?php // $Id: oacleanup.php,v 1.6 2006/09/25 20:22:56 skodak Exp $
> <?php // $Id: oacleanup.php,v 1.6.2.1 2007/02/28 00:07:22 martinlanghoff Exp $
 
RCS file: /cvsroot/moodle/moodle/admin/roles/assign.html,v
 
RCS file: /cvsroot/moodle/moodle/admin/roles/manage.php,v
< <?php //$Id: manage.php,v 1.32.2.5 2006/11/20 17:40:45 skodak Exp $
> <?php //$Id: manage.php,v 1.32.2.6 2007/02/16 02:39:28 moodler Exp $
 
RCS file: /cvsroot/moodle/moodle/admin/settings/appearance.php,v
< <?php // $Id: appearance.php,v 1.10.2.4 2006/10/29 14:59:44 moodler Exp $
> <?php // $Id: appearance.php,v 1.10.2.5 2007/03/19 06:40:59 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/backup/restorelib.php,v
 
RCS file: /cvsroot/moodle/moodle/blocks/moodleblock.class.php,v
< <?php  // $Id: moodleblock.class.php,v 1.73.2.2 2006/11/15 03:34:09 vyshane Exp $
> <?php  // $Id: moodleblock.class.php,v 1.73.2.3 2007/02/16 01:24:30 moodler Exp $
<  * @version  $Id: moodleblock.class.php,v 1.73.2.2 2006/11/15 03:34:09 vyshane Exp $
>  * @version  $Id: moodleblock.class.php,v 1.73.2.3 2007/02/16 01:24:30 moodler Exp $
 
RCS file: /cvsroot/moodle/moodle/blocks/admin_bookmarks/block_admin_bookmarks.php,v
< <?php  // $Id: block_admin_bookmarks.php,v 1.12 2006/09/26 09:25:37 skodak Exp $
> <?php  // $Id: block_admin_bookmarks.php,v 1.12.2.2 2007/03/14 16:35:10 poltawski Exp $
    
    
  RCS file: /cvsroot/moodle/moodle/blocks/db/Attic/migrate2utf8.php,v  
  RCS file: /cvsroot/moodle/moodle/blocks/db/Attic/migrate2utf8.php,v  
Line 109: Line 83:
  > <?php // $Id: migrate2utf8.php,v 1.9.4.1 2007/02/28 00:10:12 martinlanghoff Exp $  
  > <?php // $Id: migrate2utf8.php,v 1.9.4.1 2007/02/28 00:10:12 martinlanghoff Exp $  
    
    
RCS file: /cvsroot/moodle/moodle/blog/index.php,v
  RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php,v
< <?php // $Id: index.php,v 1.29 2006/10/06 10:11:53 skodak Exp $
> <?php // $Id: index.php,v 1.29.2.1 2007/03/15 06:14:08 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/blog/lib.php,v
< <?php //$Id: lib.php,v 1.50.2.4 2006/11/03 08:37:46 moodler Exp $
> <?php //$Id: lib.php,v 1.50.2.6 2007/03/23 01:42:19 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/calendar/lib.php,v
< <?php // $Id: lib.php,v 1.151.2.6 2007/02/27 14:30:33 defacer Exp $
> <?php // $Id: lib.php,v 1.151.2.7 2007/03/06 01:37:54 moodler Exp $
 
RCS file: /cvsroot/moodle/moodle/course/category.php,v
< <?php // $Id: category.php,v 1.80.2.5 2007/02/16 08:15:06 vyshane Exp $
> <?php // $Id: category.php,v 1.80.2.6 2007/03/14 04:34:54 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/course/lib.php,v
< <?php  // $Id: lib.php,v 1.446.2.8 2007/02/16 08:15:10 vyshane Exp $
> <?php  // $Id: lib.php,v 1.446.2.9 2007/03/19 06:40:59 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/course/import/groups/index.php,v
 
RCS file: /cvsroot/moodle/moodle/course/report/stats/graph.php,v
< <?php  //$Id: graph.php,v 1.9 2006/09/24 07:13:33 mjollnir_ Exp $
> <?php  //$Id: graph.php,v 1.9.2.1 2007/02/28 00:32:16 martinlanghoff Exp $
 
RCS file: /cvsroot/moodle/moodle/enrol/database/enrol.php,v
< <?php  // $Id: enrol.php,v 1.26.2.6 2007/03/01 07:28:20 nicolasconnault Exp $
> <?php  // $Id: enrol.php,v 1.26.2.7 2007/03/26 06:50:56 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/filter/mediaplugin/filter.php,v
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/admin.php,v
< <?PHP // $Id: admin.php,v 1.55.2.21 2007/03/08 15:24:44 skodak Exp $ 
> <?PHP // $Id: admin.php,v 1.55.2.22 2007/03/19 06:40:59 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/currencies.php,v
< <?PHP // $Id: currencies.php,v 1.4.2.1 2006/11/01 09:37:07 moodler Exp $ 
> <?PHP // $Id: currencies.php,v 1.4.2.2 2007/02/17 23:37:03 koenr Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/forum.php,v
< <?PHP // $Id: forum.php,v 1.11.2.5 2007/02/14 02:55:18 vyshane Exp $ 
> <?PHP // $Id: forum.php,v 1.11.2.7 2007/03/21 06:19:08 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/moodle.php,v
< <?PHP // $Id: moodle.php,v 1.65.2.14 2007/03/02 17:05:30 skodak Exp $ 
> <?PHP // $Id: moodle.php,v 1.65.2.15 2007/03/30 02:27:27 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/accesslib.php,v
 
RCS file: /cvsroot/moodle/moodle/lib/adminlib.php,v
<  * @version  $Id: adminlib.php,v 1.82.2.20 2007/02/27 12:17:58 defacer Exp $
>  * @version  $Id: adminlib.php,v 1.82.2.21 2007/03/19 06:40:59 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v
 
RCS file: /cvsroot/moodle/moodle/lib/statslib.php,v
 
RCS file: /cvsroot/moodle/moodle/lib/db/access.php,v
 
RCS file: /cvsroot/moodle/moodle/lib/db/upgrade.php,v
< <?PHP  //$Id: upgrade.php,v 1.3.2.4 2007/01/26 19:25:53 stronk7 Exp $
> <?PHP  //$Id: upgrade.php,v 1.3.2.5 2007/02/28 00:25:46 martinlanghoff Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/forum/discuss.php,v
< <?php // $Id: discuss.php,v 1.84.2.6 2006/12/14 08:15:11 skodak Exp $
> <?php // $Id: discuss.php,v 1.84.2.10 2007/03/19 02:46:33 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php,v
< <?php  // $Id: lib.php,v 1.489.2.35 2007/03/19 10:11:30 skodak Exp $
> <?php  // $Id: lib.php,v 1.489.2.36 2007/03/21 06:05:13 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/forum/user.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/forum/version.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/forum/db/access.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/html/resource.class.php,v
< <?php // $Id: resource.class.php,v 1.25.4.1 2006/10/23 13:41:28 moodler Exp $
> <?php // $Id: resource.class.php,v 1.25.4.2 2007/03/30 08:04:07 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/backuplib.php,v
< <?php //$Id: backuplib.php,v 1.17.2.1 2006/10/31 11:37:40 bobopinna Exp $
> <?php //$Id: backuplib.php,v 1.17.2.2 2007/03/28 15:04:57 csantossaenz Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v
< <?php  // $Id: lib.php,v 1.76.2.1 2006/11/02 15:19:40 bobopinna Exp $
> <?php  // $Id: lib.php,v 1.76.2.2 2007/03/29 08:18:35 csantossaenz Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13.js.php,v
 
  RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php,v  
 
RCS file: /cvsroot/moodle/moodle/question/format/xml/format.php,v
< <?php // $Id: format.php,v 1.16.2.5 2007/02/07 10:27:13 thepurpleblob Exp $
> <?php // $Id: format.php,v 1.16.2.8 2007/03/21 11:13:48 thepurpleblob Exp $
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v
 
RCS file: /cvsroot/moodle/moodle/user/edit.php,v
< <?php // $Id: edit.php,v 1.126.2.4 2007/01/09 04:58:46 moodler Exp $
> <?php // $Id: edit.php,v 1.126.2.5 2007/03/16 01:35:34 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/user/tabs.php,v
< <?php  // $Id: tabs.php,v 1.24.2.6 2007/02/14 02:54:48 vyshane Exp $
> <?php  // $Id: tabs.php,v 1.24.2.7 2007/03/26 04:11:48 toyomoyo Exp $
 
RCS file: /cvsroot/moodle/moodle/user/view.php,v
< <?PHP // $Id: view.php,v 1.123.2.6 2007/02/13 08:30:25 moodler Exp $
> <?PHP // $Id: view.php,v 1.123.2.8 2007/03/12 01:20:32 moodler Exp $


==Files with MOODLE_18_MERGED tag not updated - Fri Mar 30 19:33:40 CEST 2007 ==
==Files with MOODLE_18_MERGED tag not updated - Fri Mar 30 19:33:40 CEST 2007 ==

Revision as of 22:50, 30 March 2007


Files with MOODLE_16_MERGED tag not updated - Sun Mar 18 23:51:39 CET 2007

RCS file: /cvsroot/moodle/moodle/admin/Attic/utfdbmigrate.php,v 
< <?php //$Id: utfdbmigrate.php,v 1.47.2.12 2006/07/29 09:43:36 skodak Exp $ 
> <?php //$Id: utfdbmigrate.php,v 1.47.2.13 2006/09/29 03:16:51 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/backup/restorelib.php,v 
< <?php //$Id: restorelib.php,v 1.166.2.9 2006/10/04 17:33:48 stronk7 Exp $ 
> <?php //$Id: restorelib.php,v 1.166.2.10 2007/03/13 17:43:10 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/header.php,v 
< <?php //$Id: header.php,v 1.19.2.3 2006/06/18 07:44:21 moodler Exp $ 
> <?php //$Id: header.php,v 1.19.2.4 2006/11/02 03:19:37 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blog/lib.php,v 
< <?php //$Id: lib.php,v 1.38.2.2 2006/10/07 16:34:20 gustav_delius Exp $ 
> <?php //$Id: lib.php,v 1.38.2.3 2006/11/02 05:52:48 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/filter/mediaplugin/filter.php,v 
 
RCS file: /cvsroot/moodle/moodle/grade/index.php,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/currencies.php,v 
< <?PHP // $Id: currencies.php,v 1.1.2.1 2006/12/29 19:20:29 skodak Exp $  
> <?PHP // $Id: currencies.php,v 1.1.2.2 2007/02/17 23:37:26 koenr Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/hotpot.php,v 
< <?PHP // $Id: hotpot.php,v 1.1.2.1 2006/05/24 11:22:07 gbateson Exp $  
> <?PHP // $Id: hotpot.php,v 1.1.2.3 2006/10/05 06:21:26 gbateson Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/hotpot/reportcontent.html,v 
 
RCS file: /cvsroot/moodle/moodle/lib/statslib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/data/backuplib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/data/restorelib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/post.php,v 
< <?php // $Id: post.php,v 1.112.2.14 2007/01/12 05:03:57 vyshane Exp $ 
> <?php // $Id: post.php,v 1.94.2.9 2007/02/09 07:32:21 vyshane Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/action/continue.php,v 
< <?php // $Id: continue.php,v 1.19.2.4 2006/09/09 17:25:21 mark-nielsen Exp $ 
> <?php // $Id: continue.php,v 1.19.2.6 2006/12/06 01:45:31 mark-nielsen Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/report.php,v 
< <?php  // $Id: report.php,v 1.26.2.2 2006/09/19 09:07:44 bobopinna Exp $ 
> <?php  // $Id: report.php,v 1.26.2.3 2007/01/18 20:32:33 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/question/type/multianswer/questiontype.php,v 
< <?php  // $Id: questiontype.php,v 1.7.2.9 2007/03/15 12:58:38 tjhunt Exp $ 
> <?php  // $Id: questiontype.php,v 1.7.2.10 2007/03/17 22:58:30 poltawski Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/config.php,v 
< <?PHP // $Id: config.php,v 1.4 2006/04/29 19:46:41 gustav_delius Exp $ 
> <?PHP // $Id: config.php,v 1.4.2.1 2006/11/02 18:10:14 watcanz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/header.html,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_fonts.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/styles_layout.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/images/logo.jpg,v 
 
RCS file: /cvsroot/moodle/moodle/theme/cornflower/images/logo.psd,v 
 
RCS file: /cvsroot/moodle/moodle/theme/oceanblue/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v 
 
RCS file: /cvsroot/moodle/moodle/user/messageselect.php,v

Files with MOODLE_17_MERGED tag not updated - Sat Mar 31 00:33:24 CEST 2007

RCS file: /cvsroot/moodle/moodle/blocks/db/Attic/migrate2utf8.php,v 
< <?php // $Id: migrate2utf8.php,v 1.9 2006/06/08 04:08:04 toyomoyo Exp $ 
> <?php // $Id: migrate2utf8.php,v 1.9.4.1 2007/02/28 00:10:12 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php,v

Files with MOODLE_18_MERGED tag not updated - Fri Mar 30 19:33:40 CEST 2007

RCS file: /cvsroot/moodle/moodle/tags,v 
 
RCS file: /cvsroot/moodle/moodle/admin/register.php,v 
 
RCS file: /cvsroot/moodle/moodle/blog/footer.php,v 
 
RCS file: /cvsroot/moodle/moodle/filter/emailprotect/filter.php,v 
< <?PHP // $Id: filter.php,v 1.1 2004/09/02 04:14:06 moodler Exp $ 
> <?PHP // $Id: filter.php,v 1.1.24.1 2007/03/20 07:08:04 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/block_course_list.php,v 
< <?PHP // $Id: block_course_list.php,v 1.2 2006/11/01 09:44:02 moodler Exp $  
> <?PHP // $Id: block_course_list.php,v 1.2.4.1 2007/02/26 15:13:05 andreabix Exp $  
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php,v 
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/moodle.php,v 
< <?PHP // $Id: moodle.php,v 1.105.2.9 2007/03/26 06:44:40 toyomoyo Exp $ 
> <?PHP // $Id: moodle.php,v 1.105.2.10 2007/03/26 06:55:17 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js,v 
 
RCS file: /cvsroot/moodle/moodle/lib/setuplib.php,v 
< <?php // $Id: setuplib.php,v 1.19 2007/01/13 10:44:58 stronk7 Exp $  
> <?php // $Id: setuplib.php,v 1.19.2.4 2007/03/28 17:13:17 sam_marshall Exp $  
 
RCS file: /cvsroot/moodle/moodle/lib/simpletest/testmodforumlib.php,v 
< <?php // $Id: testmodforumlib.php,v 1.1.2.1 2007/03/12 05:27:43 nicolasconnault Exp $ 
> <?php // $Id: testmodforumlib.php,v 1.1.2.2 2007/03/14 00:45:10 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mnet/environment.php,v 
 
RCS file: /cvsroot/moodle/moodle/mnet/lib.php,v 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php,v 
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/data/lib.php,v 
< <?php  // $Id: lib.php,v 1.113.2.2 2007/03/01 06:32:35 toyomoyo Exp $ 
> <?php  // $Id: lib.php,v 1.113.2.3 2007/03/13 01:20:19 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/resource/config.html,v 
 
RCS file: /cvsroot/moodle/moodle/mod/resource/type/repository/resource.class.php,v 
< <?php // $Id: resource.class.php,v 1.17.2.1 2007/02/28 05:36:37 nicolasconnault Exp $ 
> <?php // $Id: resource.class.php,v 1.17.2.2 2007/03/20 07:08:07 nicolasconnault Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/backuplib.php,v 
< <?php //$Id: backuplib.php,v 1.18 2006/11/21 16:12:20 bobopinna Exp $ 
> <?php //$Id: backuplib.php,v 1.18.4.1 2007/03/23 10:53:24 csantossaenz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodel.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v 
< <?php  // $Id: lib.php,v 1.83 2007/01/25 13:49:50 bobopinna Exp $ 
> <?php  // $Id: lib.php,v 1.83.2.1 2007/03/29 10:47:43 csantossaenz Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/version.php,v 
< <?php // $Id: version.php,v 1.49 2007/02/02 13:02:31 moodler Exp $ 
> <?php // $Id: version.php,v 1.49.2.1 2007/03/13 22:09:24 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13.js.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/db/upgrade.php,v 
< <?php  //$Id: upgrade.php,v 1.8 2007/01/24 20:24:51 bobopinna Exp $ 
> <?php  //$Id: upgrade.php,v 1.8.2.2 2007/03/15 07:45:32 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/lib.php,v 
< <?php  // $Id: lib.php,v 1.49 2007/02/22 17:46:27 sam_marshall Exp $ 
> <?php  // $Id: lib.php,v 1.48.2.1 2007/02/22 17:46:13 sam_marshall Exp $

To generate this information yourself

Run the following commandline at the top level of your CVS sandbox: 

cvs diff -r MOODLE_17_MERGED -r MOODLE_17_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] \/\/ \$Id)' > unmergedfiles.txt; cat unmergedfiles.txt

Some useful links

Retrieved from "https://docs.moodle.org/23/en/index.php?title=Development:Unmerged_files&oldid=21995"
Powered by MediaWiki