|
|
| (329 intermediate revisions by 5 users not shown) |
| Line 1: |
Line 1: |
| | __NOEDITSECTION__ |
| | ==Unmerged Files Report== |
|
| |
|
| | | __UNMERGED_FILES_REPORT__ |
| | |
| ==Files with MOODLE_17_MERGED tag not updated - Mon Aug 6 19:56:42 CEST 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/lib.php /cvsroot/moodle/moodle/course/lib.php],v
| |
| < <?php // $Id: lib.php,v 1.446.2.10 2007/04/01 15:51:05 moodler Exp $
| |
| > <?php // $Id: lib.php,v 1.446.2.11 2007/07/27 18:45:24 mchurch Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/scorm.php /cvsroot/moodle/moodle/lang/en_utf8/scorm.php],v
| |
| < <?PHP // $Id: scorm.php,v 1.9.2.2 2007/03/13 08:47:52 moodler Exp $
| |
| > <?PHP // $Id: scorm.php,v 1.9.2.3 2007/07/03 08:05:57 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/docs/README.txt /cvsroot/moodle/moodle/lang/en_utf8/docs/README.txt],v
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/accesslib.php /cvsroot/moodle/moodle/lib/accesslib.php],v
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/lib.php /cvsroot/moodle/moodle/mod/scorm/lib.php],v
| |
| < <?php // $Id: lib.php,v 1.76.2.2 2007/03/29 08:18:35 csantossaenz Exp $
| |
| > <?php // $Id: lib.php,v 1.76.2.3 2007/07/03 14:11:20 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/player.php /cvsroot/moodle/moodle/mod/scorm/player.php],v
| |
| < <?PHP // $Id: player.php,v 1.16.2.4 2007/03/15 15:25:51 bobopinna Exp $
| |
| > <?PHP // $Id: player.php,v 1.16.2.5 2007/07/08 00:15:39 poltawski Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php],v
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php],v
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/chameleon/config.php /cvsroot/moodle/moodle/theme/chameleon/config.php],v
| |
| < <?PHP // $Id: config.php,v 1.5 2006/09/28 10:32:25 jamiesensei Exp $
| |
| > <?PHP // $Id: config.php,v 1.5.2.1 2007/06/25 12:21:58 urs_hunkler Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/standard/styles_color.css /cvsroot/moodle/moodle/theme/standard/styles_color.css],v
| |
| | |
| ==Files with MOODLE_18_MERGED tag not updated - Mon Aug 6 23:13:42 CEST 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mnet/index.php /cvsroot/moodle/moodle/admin/mnet/index.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/README-CAS /cvsroot/moodle/moodle/auth/cas/README-CAS]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/auth.php /cvsroot/moodle/moodle/auth/cas/auth.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/cas_form.html /cvsroot/moodle/moodle/auth/cas/cas_form.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/config.html /cvsroot/moodle/moodle/auth/cas/config.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/languages.php /cvsroot/moodle/moodle/auth/cas/languages.php]
| |
| < // version $Id: languages.php,v 1.2.20.1 2007/04/29 13:57:58 skodak Exp $
| |
| > // version $Id: languages.php,v 1.2.20.5 2007/07/17 11:55:09 jgutierr25 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/CAS.php /cvsroot/moodle/moodle/auth/cas/CAS/CAS.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/client.php /cvsroot/moodle/moodle/auth/cas/CAS/client.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/domxml-php4-php5.php /cvsroot/moodle/moodle/auth/cas/CAS/domxml-php4-php5.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-db.php /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-db.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-file.php /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-file.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-main.php /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-main.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/languages/english.php /cvsroot/moodle/moodle/auth/cas/CAS/languages/english.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/languages/french.php /cvsroot/moodle/moodle/auth/cas/CAS/languages/french.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/languages/german.php /cvsroot/moodle/moodle/auth/cas/CAS/languages/german.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/languages/greek.php /cvsroot/moodle/moodle/auth/cas/CAS/languages/greek.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/languages/japanese.php /cvsroot/moodle/moodle/auth/cas/CAS/languages/japanese.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/CAS/languages/languages.php /cvsroot/moodle/moodle/auth/cas/CAS/languages/languages.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/mnet/auth.php /cvsroot/moodle/moodle/auth/mnet/auth.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/report/log/index.php /cvsroot/moodle/moodle/course/report/log/index.php]
| |
| < <?php // $Id: index.php,v 1.13.2.1 2007/02/28 05:36:26 nicolasconnault Exp $
| |
| > <?php // $Id: index.php,v 1.13.2.2 2007/08/03 13:18:00 donal72 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/report/log/lib.php /cvsroot/moodle/moodle/course/report/log/lib.php]
| |
| < <?php // $Id: lib.php,v 1.18.2.2 2007/03/15 16:02:32 poltawski Exp $
| |
| > <?php // $Id: lib.php,v 1.18.2.3 2007/08/03 13:18:01 donal72 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/role.php /cvsroot/moodle/moodle/lang/en_utf8/role.php]
| |
| < <?PHP // $Id: role.php,v 1.23.2.8 2007/04/05 09:16:35 skodak Exp $
| |
| > <?PHP // $Id: role.php,v 1.23.2.9 2007/05/18 12:47:24 jmg324 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/scorm.php /cvsroot/moodle/moodle/lang/en_utf8/scorm.php]
| |
| < <?PHP // $Id: scorm.php,v 1.11.2.3 2007/06/22 05:45:20 moodler Exp $
| |
| > <?PHP // $Id: scorm.php,v 1.11.2.6 2007/07/03 12:09:39 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/docs/README.txt /cvsroot/moodle/moodle/lang/en_utf8/docs/README.txt]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/enrolperiod.html /cvsroot/moodle/moodle/lang/en_utf8/help/enrolperiod.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/assignment/allowdeleting.html /cvsroot/moodle/moodle/lang/en_utf8/help/assignment/allowdeleting.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/workshop/breakdownoffinalgrade.html /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/breakdownoffinalgrade.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/workshop/grade.html /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/grade.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/workshop/includeself.html /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/includeself.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/workshop/leaguetable.html /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/leaguetable.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/workshop/nelements.html /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/nelements.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/workshop/resubmit.html /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/resubmit.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/workshop/selfassessment.html /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/selfassessment.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/workshop/ungradedassessments_teacher.html /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/ungradedassessments_teacher.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/javascript-static.js /cvsroot/moodle/moodle/lib/javascript-static.js]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/editor/htmlarea/htmlarea.php /cvsroot/moodle/moodle/lib/editor/htmlarea/htmlarea.php]
| |
| < // $Id: htmlarea.php,v 1.16 2007/01/27 23:23:45 skodak Exp $
| |
| > // $Id: htmlarea.php,v 1.16.2.1 2007/08/06 05:21:30 mattc-catalyst Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/lib.php /cvsroot/moodle/moodle/mnet/lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/server.php /cvsroot/moodle/moodle/mnet/xmlrpc/server.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/type/ims/preview.php /cvsroot/moodle/moodle/mod/resource/type/ims/preview.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/mod_form.php /cvsroot/moodle/moodle/mod/scorm/mod_form.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/player.php /cvsroot/moodle/moodle/mod/scorm/player.php]
| |
| < <?PHP // $Id: player.php,v 1.22.2.4 2007/03/13 08:28:47 moodler Exp $
| |
| > <?PHP // $Id: player.php,v 1.22.2.6 2007/07/03 09:36:31 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/styles.php /cvsroot/moodle/moodle/mod/scorm/styles.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/version.php /cvsroot/moodle/moodle/mod/scorm/version.php]
| |
| < <?php // $Id: version.php,v 1.49.2.1 2007/03/13 22:09:24 bobopinna Exp $
| |
| > <?php // $Id: version.php,v 1.49.2.2 2007/07/03 07:55:33 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodels/scorm_12.js.php /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12.js.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php]
| |
| < <?php // $Id: scorm_13lib.php,v 1.6 2007/01/16 14:03:15 bobopinna Exp $
| |
| > <?php // $Id: scorm_13lib.php,v 1.6.2.1 2007/06/20 09:23:24 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/db/upgrade.php /cvsroot/moodle/moodle/mod/scorm/db/upgrade.php]
| |
| < <?php //$Id: upgrade.php,v 1.8.2.2 2007/03/15 07:45:32 bobopinna Exp $
| |
| > <?php //$Id: upgrade.php,v 1.8.2.3 2007/07/03 07:54:32 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/format/blackboard_6/format.php /cvsroot/moodle/moodle/question/format/blackboard_6/format.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/formal_white/fw_color.css /cvsroot/moodle/moodle/theme/formal_white/fw_color.css]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/formal_white/fw_layout.css /cvsroot/moodle/moodle/theme/formal_white/fw_layout.css]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/standard/styles_color.css /cvsroot/moodle/moodle/theme/standard/styles_color.css]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/standard/styles_ie6.css /cvsroot/moodle/moodle/theme/standard/styles_ie6.css]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/standard/styles_ie7.css /cvsroot/moodle/moodle/theme/standard/styles_ie7.css]
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 164: |
Line 8: |
| Run the following commandline at the top level of your CVS sandbox: | | Run the following commandline at the top level of your CVS sandbox: |
|
| |
|
| cvs diff -r MOODLE_18_MERGED -r MOODLE_18_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] \/\/ \$Id)' > unmergedfiles.txt; cat unmergedfiles.txt | | cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt |
|
| |
|
| ==Some useful links== | | ==Some useful links== |
| Line 170: |
Line 14: |
| * [[:en:Development:CVS for developers|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS. | | * [[:en:Development:CVS for developers|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS. |
| * [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums. | | * [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums. |
| | |
| | * Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files. |
|
| |
|
| [[Category:Developer|Unmerged files]] | | [[Category:Developer|Unmerged files]] |
