Development:Unmerged files: Difference between revisions
From MoodleDocs
(1.8 unmerged files is getting huge) |
|||
| Line 28: | Line 28: | ||
RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v | RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v | ||
==Files with MOODLE_18_MERGED tag not updated - | ==Files with MOODLE_18_MERGED tag not updated - Wed Jul 25 21:14:15 CEST 2007 == | ||
RCS file: /cvsroot/moodle/moodle/version.php,v | RCS file: /cvsroot/moodle/moodle/version.php,v | ||
| Line 75: | Line 71: | ||
< <?php //$Id: edit_form.php,v 1.25.2.2 2007/04/05 07:57:19 nicolasconnault Exp $ | < <?php //$Id: edit_form.php,v 1.25.2.2 2007/04/05 07:57:19 nicolasconnault Exp $ | ||
> <?php //$Id: edit_form.php,v 1.25.2.3 2007/07/13 20:12:32 mchurch Exp $ | > <?php //$Id: edit_form.php,v 1.25.2.3 2007/07/13 20:12:32 mchurch Exp $ | ||
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/auth.php,v | RCS file: /cvsroot/moodle/moodle/lang/en_utf8/auth.php,v | ||
| Line 114: | Line 102: | ||
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/ungradedassessments_teacher.html,v | RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/ungradedassessments_teacher.html,v | ||
RCS file: /cvsroot/moodle/moodle/lib/ | RCS file: /cvsroot/moodle/moodle/lib/filelib.php,v | ||
< <?php //$Id: | < <?php //$Id: filelib.php,v 1.39.2.2 2007/04/04 19:43:53 skodak Exp $ | ||
> <?php //$Id: | > <?php //$Id: filelib.php,v 1.39.2.3 2007/07/19 05:45:17 moodler Exp $ | ||
RCS file: /cvsroot/moodle/moodle/lib/ | RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js,v | ||
RCS file: /cvsroot/moodle/moodle/lib/ | RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v | ||
< <?php // $Id: weblib.php,v 1.812.2.69 2007/07/15 15:20:31 skodak Exp $ | |||
> <?php // $Id: weblib.php,v 1.812.2.70 2007/07/25 14:49:20 urs_hunkler Exp $ | |||
< * @version $Id: weblib.php,v 1.812.2.69 2007/07/15 15:20:31 skodak Exp $ | |||
> * @version $Id: weblib.php,v 1.812.2.70 2007/07/25 14:49:20 urs_hunkler Exp $ | |||
RCS file: /cvsroot/moodle/moodle/mod/assignment/lib.php,v | |||
RCS file: /cvsroot/moodle/moodle/mod/glossary/comments.php,v | |||
< <?php // $Id: comments.php,v 1.23 2007/01/12 06:57:33 toyomoyo Exp $ | |||
> <?php // $Id: comments.php,v 1.23.2.1 2007/07/19 16:51:05 tjhunt Exp $ | |||
RCS file: /cvsroot/moodle/moodle/mod/resource/type/html/resource.class.php,v | RCS file: /cvsroot/moodle/moodle/mod/resource/type/html/resource.class.php,v | ||
| Line 167: | Line 163: | ||
< <?php //$Id: pagelib.php,v 1.10 2006/09/08 08:46:28 toyomoyo Exp $ | < <?php //$Id: pagelib.php,v 1.10 2006/09/08 08:46:28 toyomoyo Exp $ | ||
> <?php //$Id: pagelib.php,v 1.10.6.1 2007/05/18 12:47:20 jmg324 Exp $ | > <?php //$Id: pagelib.php,v 1.10.6.1 2007/05/18 12:47:20 jmg324 Exp $ | ||
RCS file: /cvsroot/moodle/moodle/theme/chameleon/config.php,v | RCS file: /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 2006/09/28 10:32:25 jamiesensei Exp $ | ||
> <?PHP // $Id: config.php,v 1.5.6. | > <?PHP // $Id: config.php,v 1.5.6.3 2007/07/19 19:55:24 urs_hunkler Exp $ | ||
RCS file: /cvsroot/moodle/moodle/theme/chameleon/user_styles.css,v | |||
RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_color.css,v | RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_color.css,v | ||
Revision as of 19:31, 25 July 2007
Files with MOODLE_17_MERGED tag not updated - Wed Jul 25 21:04:56 CEST 2007
RCS file: /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: /cvsroot/moodle/moodle/lib/accesslib.php,v RCS file: /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: /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: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php,v RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php,v RCS file: /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: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v
Files with MOODLE_18_MERGED tag not updated - Wed Jul 25 21:14:15 CEST 2007
RCS file: /cvsroot/moodle/moodle/version.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/README-CAS,v RCS file: /cvsroot/moodle/moodle/auth/cas/auth.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/cas_form.html,v RCS file: /cvsroot/moodle/moodle/auth/cas/config.html,v RCS file: /cvsroot/moodle/moodle/auth/cas/languages.php,v < // version $Id: languages.php,v 1.2.20.1 2007/04/29 13:57:58 skodak Exp $^M > // version $Id: languages.php,v 1.2.20.5 2007/07/17 11:55:09 jgutierr25 Exp $ RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/CAS.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/client.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/domxml-php4-php5.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-db.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-file.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/PGTStorage/pgt-main.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/english.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/french.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/german.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/greek.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/japanese.php,v RCS file: /cvsroot/moodle/moodle/auth/cas/CAS/languages/languages.php,v RCS file: /cvsroot/moodle/moodle/course/edit_form.php,v < <?php //$Id: edit_form.php,v 1.25.2.2 2007/04/05 07:57:19 nicolasconnault Exp $ > <?php //$Id: edit_form.php,v 1.25.2.3 2007/07/13 20:12:32 mchurch Exp $ RCS file: /cvsroot/moodle/moodle/lang/en_utf8/auth.php,v < <?php // $Id: auth.php,v 1.18.2.8 2007/04/29 13:57:52 skodak Exp $ > <?php // $Id: auth.php,v 1.18.2.9 2007/07/06 10:18:10 moodler Exp $ RCS file: /cvsroot/moodle/moodle/lang/en_utf8/role.php,v < <?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: /cvsroot/moodle/moodle/lang/en_utf8/scorm.php,v < <?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: /cvsroot/moodle/moodle/lang/en_utf8/help/enrolperiod.html,v RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/breakdownoffinalgrade.html,v RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/grade.html,v RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/includeself.html,v RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/leaguetable.html,v RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/nelements.html,v RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/resubmit.html,v RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/selfassessment.html,v RCS file: /cvsroot/moodle/moodle/lang/en_utf8/help/workshop/ungradedassessments_teacher.html,v RCS file: /cvsroot/moodle/moodle/lib/filelib.php,v < <?php //$Id: filelib.php,v 1.39.2.2 2007/04/04 19:43:53 skodak Exp $ > <?php //$Id: filelib.php,v 1.39.2.3 2007/07/19 05:45:17 moodler Exp $ RCS file: /cvsroot/moodle/moodle/lib/javascript-static.js,v RCS file: /cvsroot/moodle/moodle/lib/weblib.php,v < <?php // $Id: weblib.php,v 1.812.2.69 2007/07/15 15:20:31 skodak Exp $ > <?php // $Id: weblib.php,v 1.812.2.70 2007/07/25 14:49:20 urs_hunkler Exp $ < * @version $Id: weblib.php,v 1.812.2.69 2007/07/15 15:20:31 skodak Exp $ > * @version $Id: weblib.php,v 1.812.2.70 2007/07/25 14:49:20 urs_hunkler Exp $ RCS file: /cvsroot/moodle/moodle/mod/assignment/lib.php,v RCS file: /cvsroot/moodle/moodle/mod/glossary/comments.php,v < <?php // $Id: comments.php,v 1.23 2007/01/12 06:57:33 toyomoyo Exp $ > <?php // $Id: comments.php,v 1.23.2.1 2007/07/19 16:51:05 tjhunt Exp $ RCS file: /cvsroot/moodle/moodle/mod/resource/type/html/resource.class.php,v < <?php // $Id: resource.class.php,v 1.34.2.2 2007/05/16 21:26:18 skodak Exp $ > <?php // $Id: resource.class.php,v 1.34.2.3 2007/07/06 08:38:42 urs_hunkler Exp $ RCS file: /cvsroot/moodle/moodle/mod/scorm/lib.php,v < <?php // $Id: lib.php,v 1.83.2.1 2007/03/29 10:47:43 csantossaenz Exp $ > <?php // $Id: lib.php,v 1.83.2.2 2007/04/10 14:21:29 csantossaenz Exp $ RCS file: /cvsroot/moodle/moodle/mod/scorm/locallib.php,v < <?php // $Id: locallib.php,v 1.34.2.5 2007/06/06 09:16:21 moodler Exp $ > <?php // $Id: locallib.php,v 1.34.2.7 2007/06/06 22:16:38 bobopinna Exp $ RCS file: /cvsroot/moodle/moodle/mod/scorm/mod_form.php,v RCS file: /cvsroot/moodle/moodle/mod/scorm/player.php,v < <?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: /cvsroot/moodle/moodle/mod/scorm/styles.php,v RCS file: /cvsroot/moodle/moodle/mod/scorm/version.php,v < <?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: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12.js.php,v RCS file: /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php,v < <?php // $Id: scorm_12lib.php,v 1.4.2.1 2007/03/15 21:23:14 bobopinna Exp $ > <?php // $Id: scorm_12lib.php,v 1.4.2.5 2007/06/20 09:23:22 bobopinna 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 < <?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: /cvsroot/moodle/moodle/mod/scorm/db/upgrade.php,v < <?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: /cvsroot/moodle/moodle/my/pagelib.php,v < <?php //$Id: pagelib.php,v 1.10 2006/09/08 08:46:28 toyomoyo Exp $ > <?php //$Id: pagelib.php,v 1.10.6.1 2007/05/18 12:47:20 jmg324 Exp $ RCS file: /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.6.3 2007/07/19 19:55:24 urs_hunkler Exp $ RCS file: /cvsroot/moodle/moodle/theme/chameleon/user_styles.css,v RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_color.css,v RCS file: /cvsroot/moodle/moodle/theme/formal_white/fw_layout.css,v RCS file: /cvsroot/moodle/moodle/theme/standard/styles_color.css,v RCS file: /cvsroot/moodle/moodle/theme/standard/styles_ie6.css,v RCS file: /cvsroot/moodle/moodle/theme/standard/styles_ie7.css,v RCS file: /cvsroot/moodle/moodle/theme/standard/styles_layout.css,v
To generate this information yourself
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
Some useful links
- Moodle CVS for developers: explains how to work with the Moodle code in CVS.
- Review Unmerged files, please... discussion from moodle.org forums.
