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 19: Line 19:
  > <?PHP  // $Id: view.php,v 1.9.2.8 2005/07/15 07:15:42 bobopinna Exp $
  > <?PHP  // $Id: view.php,v 1.9.2.8 2005/07/15 07:15:42 bobopinna Exp $


==Files with MOODLE_15_MERGED tag not updated - Thu Mar 16 01:44:04 CET 2006 ==
==Files with MOODLE_15_MERGED tag not updated - Mon Mar 27 00:59:39 CEST 2006 ==
    
    
  RCS file: /cvsroot/moodle/moodle/config-dist.php,v  
  RCS file: /cvsroot/moodle/moodle/config-dist.php,v  
Line 43: Line 43:
  RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js,v  
  RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js,v  
    
    
  RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v  
  RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v  
  < <?php // $Id: weblib.php,v 1.469.2.32 2006/03/08 06:22:53 moodler Exp $  
  < <?php // $Id: moodlelib.php,v 1.565.2.55 2006/02/28 03:53:59 moodler Exp $  
  > <?php // $Id: weblib.php,v 1.469.2.35 2006/03/15 08:43:51 vyshane Exp $  
  > <?php // $Id: moodlelib.php,v 1.565.2.56 2006/03/20 09:36:09 moodler Exp $  
  <  * @version $Id: weblib.php,v 1.469.2.32 2006/03/08 06:22:53 moodler Exp $  
  <  * @version $Id: moodlelib.php,v 1.565.2.55 2006/02/28 03:53:59 moodler Exp $  
  >  * @version $Id: weblib.php,v 1.469.2.35 2006/03/15 08:43:51 vyshane Exp $  
  >  * @version $Id: moodlelib.php,v 1.565.2.56 2006/03/20 09:36:09 moodler Exp $  
    
    
  RCS file: /cvsroot/moodle/moodle/login/change_password.php,v  
  RCS file: /cvsroot/moodle/moodle/login/change_password.php,v  
Line 70: Line 70:
  < <?PHP  // $Id: view.php,v 1.52.2.7 2005/07/25 18:50:39 michaelpenne Exp $  
  < <?PHP  // $Id: view.php,v 1.52.2.7 2005/07/25 18:50:39 michaelpenne Exp $  
  > <?PHP  // $Id: view.php,v 1.52.2.12 2006/02/24 20:25:36 michaelpenne Exp $  
  > <?PHP  // $Id: view.php,v 1.52.2.12 2006/02/24 20:25:36 michaelpenne Exp $  
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/regrade/report.php,v
< <?php  // $Id: report.php,v 1.5.2.9 2005/09/26 12:31:23 mindforge Exp $
> <?php  // $Id: report.php,v 1.5.2.10 2006/03/26 08:16:18 gustav_delius Exp $
    
    
  RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v  
  RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v  

Revision as of 22:59, 26 March 2006


Files with MOODLE_14_MERGED tag not updated - Mon Mar 27 00:58:50 CEST 2006

RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v 
< <?PHP  // $Id: lib.php,v 1.13.2.10 2005/05/10 00:28:45 martinlanghoff Exp $ 
> <?PHP  // $Id: lib.php,v 1.13.2.11 2005/06/29 07:00:16 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/Attic/playscorm.php,v 
< <?PHP  // $Id: playscorm.php,v 1.11.2.3 2004/11/22 23:29:17 martinlanghoff Exp $ 
> <?PHP  // $Id: playscorm.php,v 1.11.2.7 2005/07/15 07:15:42 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/restorelib.php,v 
< <?PHP //$Id: restorelib.php,v 1.3 2004/07/19 14:53:43 bobopinna Exp $ 
> <?PHP //$Id: restorelib.php,v 1.3.2.1 2005/06/29 07:00:16 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/view.php,v 
< <?PHP  // $Id: view.php,v 1.9.2.7 2005/05/10 23:45:58 mjollnir_ Exp $ 
> <?PHP  // $Id: view.php,v 1.9.2.8 2005/07/15 07:15:42 bobopinna Exp $

Files with MOODLE_15_MERGED tag not updated - Mon Mar 27 00:59:39 CEST 2006

RCS file: /cvsroot/moodle/moodle/config-dist.php,v 
< <?PHP // $Id: config-dist.php,v 1.82.2.3 2006/03/01 09:09:03 moodler Exp $ 
> <?PHP // $Id: config-dist.php,v 1.82.2.4 2006/03/01 09:12:43 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/index.php,v 
< <?php  // $Id: index.php,v 1.156.2.1 2005/12/22 00:13:43 ikawhero Exp $ 
> <?php  // $Id: index.php,v 1.156.2.2 2006/02/08 04:19:56 patrickslee Exp $ 
 
RCS file: /cvsroot/moodle/moodle/auth/ldap/lib.php,v 
<  * @version $Id: lib.php,v 1.61.2.15 2005/11/07 00:38:23 martinlanghoff Exp $ 
>  * @version $Id: lib.php,v 1.61.2.17 2005/12/12 04:57:23 martinlanghoff Exp $ 
 
RCS file: /cvsroot/moodle/moodle/blocks/course_list/block_course_list.php,v 
< <?PHP //$Id: block_course_list.php,v 1.24 2006/02/08 04:21:22 patrickslee Exp $ 
> <?PHP //$Id: block_course_list.php,v 1.20.2.3 2006/02/08 04:19:56 patrickslee Exp $ 
 
RCS file: /cvsroot/moodle/moodle/course/index.php,v 
< <?php // $Id: index.php,v 1.43 2006/02/08 04:21:22 patrickslee Exp $ 
> <?php // $Id: index.php,v 1.39.2.2 2006/02/08 04:19:56 patrickslee Exp $ 
 
RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js,v 
 
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v 
< <?php // $Id: moodlelib.php,v 1.565.2.55 2006/02/28 03:53:59 moodler Exp $ 
> <?php // $Id: moodlelib.php,v 1.565.2.56 2006/03/20 09:36:09 moodler Exp $ 
<  * @version $Id: moodlelib.php,v 1.565.2.55 2006/02/28 03:53:59 moodler Exp $ 
>  * @version $Id: moodlelib.php,v 1.565.2.56 2006/03/20 09:36:09 moodler Exp $ 
 
RCS file: /cvsroot/moodle/moodle/login/change_password.php,v 
< <?PHP // $Id: change_password.php,v 1.30.2.6 2005/11/26 01:01:56 defacer Exp $ 
> <?PHP // $Id: change_password.php,v 1.30.2.9 2005/12/04 22:59:39 mjollnir_ Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/choice/report.php,v 
< <?php  // $Id: report.php,v 1.33 2005/08/14 21:59:09 danmarsden Exp $ 
> <?php  // $Id: report.php,v 1.32.2.1 2005/08/14 21:56:16 danmarsden Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/choice/view.php,v 
< <?php  // $Id: view.php,v 1.73 2005/08/14 21:59:09 danmarsden Exp $ 
> <?php  // $Id: view.php,v 1.69.2.2 2005/08/14 21:56:16 danmarsden Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/index.php,v 
< <?PHP // $Id: index.php,v 1.10.2.1 2005/06/07 20:48:41 michaelpenne Exp $ 
> <?PHP // $Id: index.php,v 1.10.2.2 2006/02/24 21:27:51 michaelpenne Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/report.php,v 
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/view.php,v 
< <?PHP  // $Id: view.php,v 1.52.2.7 2005/07/25 18:50:39 michaelpenne Exp $ 
> <?PHP  // $Id: view.php,v 1.52.2.12 2006/02/24 20:25:36 michaelpenne Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/report/regrade/report.php,v 
< <?php  // $Id: report.php,v 1.5.2.9 2005/09/26 12:31:23 mindforge Exp $ 
> <?php  // $Id: report.php,v 1.5.2.10 2006/03/26 08:16:18 gustav_delius Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v 
< <?php  // $Id: lib.php,v 1.47.2.6 2005/07/26 06:18:23 bobopinna Exp $ 
> <?php  // $Id: lib.php,v 1.47.2.9 2006/02/03 08:51:13 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/Attic/playscorm.php,v 
< <?PHP  // $Id: playscorm.php,v 1.34.2.2 2005/07/26 06:18:23 bobopinna Exp $ 
> <?PHP  // $Id: playscorm.php,v 1.34.2.3 2006/02/03 08:51:13 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/report.php,v 
< <?php  // $Id: report.php,v 1.20 2005/05/23 06:56:10 bobopinna Exp $ 
> <?php  // $Id: report.php,v 1.20.2.1 2006/02/03 08:51:13 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/validate.php,v 
< <?php // $Id: validate.php,v 1.9 2005/05/23 06:56:10 bobopinna Exp $ 
> <?php // $Id: validate.php,v 1.9.2.1 2005/09/20 06:43:26 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/scorm/view.php,v 
< <?php  // $Id: view.php,v 1.28.2.1 2005/07/03 07:12:36 bobopinna Exp $ 
> <?php  // $Id: view.php,v 1.28.2.3 2006/02/03 08:51:13 bobopinna Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/workshop/db/postgres7.php,v 
< <?php // $Id: postgres7.php,v 1.16 2005/10/12 02:15:42 mjollnir_ Exp $ 
> <?php // $Id: postgres7.php,v 1.14.2.2 2005/10/12 02:15:23 mjollnir_ Exp $ 
 
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v 
 
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v