|
|
| (224 intermediate revisions by 4 users not shown) |
| Line 1: |
Line 1: |
| | __NOEDITSECTION__ |
| | ==Unmerged Files Report== |
|
| |
|
| | | __UNMERGED_FILES_REPORT__ |
| ==Files with MOODLE_17_MERGED tag not updated - Thu Nov 29 19:08:12 CET 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/help.php /cvsroot/moodle/moodle/help.php]
| |
| < * @version $Id: help.php,v 1.40.2.1 2007/11/06 13:25:22 nicolasconnault Exp $
| |
| > * @version $Id: help.php,v 1.34.4.1 2007/11/06 13:25:34 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/grade/lib.php /cvsroot/moodle/moodle/grade/lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/setuplib.php /cvsroot/moodle/moodle/lib/setuplib.php]
| |
| < <?php // $Id: setuplib.php,v 1.9.2.4 2007/01/08 18:59:21 stronk7 Exp $
| |
| > <?php // $Id: setuplib.php,v 1.9.2.5 2007/11/13 23:52:36 arborrow Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/hotpot/lib.php /cvsroot/moodle/moodle/mod/hotpot/lib.php]
| |
| < <?PHP // $Id: lib.php,v 1.57.2.8 2007/09/30 04:18:18 gbateson Exp $
| |
| > <?PHP // $Id: lib.php,v 1.57.2.9 2007/10/15 05:53:21 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/type/ims/finder.php /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/ewiki.php /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/plugins/init.php /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/plugins/spages.php /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php]
| |
| | |
| ==Files with MOODLE_18_MERGED tag not updated - Tue Nov 27 14:07:01 CET 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/help.php /cvsroot/moodle/moodle/help.php]
| |
| < * @version $Id: help.php,v 1.38.2.2 2007/05/23 13:36:29 nfreear Exp $
| |
| > * @version $Id: help.php,v 1.38.2.3 2007/11/06 13:38:34 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/user.php /cvsroot/moodle/moodle/admin/user.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mnet/peers.html /cvsroot/moodle/moodle/admin/mnet/peers.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/mnet/auth.php /cvsroot/moodle/moodle/auth/mnet/auth.php]
| |
| < <?php // $Id: auth.php,v 1.14.2.13 2007/10/11 13:19:53 nicolasconnault Exp $
| |
| > <?php // $Id: auth.php,v 1.14.2.15 2007/11/01 06:13:19 donal72 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/blocks/loancalc/block_loancalc.php /cvsroot/moodle/moodle/blocks/loancalc/block_loancalc.php]
| |
| < <?php // $Id: block_loancalc.php,v 1.9 2007/01/10 06:44:15 vyshane Exp $
| |
| > <?php // $Id: block_loancalc.php,v 1.9.2.1 2007/10/22 20:29:45 arborrow Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/info.php /cvsroot/moodle/moodle/course/info.php]
| |
| < <?php // $Id: info.php,v 1.13.2.3 2007/03/05 05:38:46 moodler Exp $
| |
| > <?php // $Id: info.php,v 1.13.2.4 2007/11/20 02:36:53 mattc-catalyst Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/config.html /cvsroot/moodle/moodle/enrol/mnet/config.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/enrol.php /cvsroot/moodle/moodle/enrol/mnet/enrol.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/paypal/enrol.php /cvsroot/moodle/moodle/enrol/paypal/enrol.php]
| |
| < <?php // $Id: enrol.php,v 1.26 2006/12/18 19:21:11 skodak Exp $
| |
| > <?php // $Id: enrol.php,v 1.26.2.1 2007/11/13 18:02:28 mchurch Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/enrol_mnet.php /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/mnet.php /cvsroot/moodle/moodle/lang/en_utf8/mnet.php]
| |
|
| |
| 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/mnet/testclient.php /cvsroot/moodle/moodle/mnet/testclient.php]
| |
| > <?php // $Id: testclient.php,v 1.1.2.2 2007/10/19 00:45:56 donal72 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/client.php /cvsroot/moodle/moodle/mnet/xmlrpc/client.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/mnet/xmlrpc/xmlparser.php /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/format.php /cvsroot/moodle/moodle/question/format.php]
| |
| < <?php // $Id: format.php,v 1.17.2.11 2007/09/17 10:59:32 thepurpleblob Exp $
| |
| > <?php // $Id: format.php,v 1.17.2.13 2007/11/15 14:04:22 mchurch Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/indexer.php /cvsroot/moodle/moodle/search/indexer.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/resource_document.php /cvsroot/moodle/moodle/search/documents/resource_document.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/techproject_document.php /cvsroot/moodle/moodle/search/documents/techproject_document.php]
| |
| | |
| ==Files with MOODLE_19_MERGED tag not updated - Tue Nov 27 14:07:21 CET 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/README.txt /cvsroot/moodle/moodle/README.txt]
| |
| < README $Id: README.txt,v 1.9 2006/04/29 19:36:56 gustav_delius Exp $
| |
| > README $Id: README.txt,v 1.9.14.1 2007/11/14 23:40:50 martinlanghoff Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/help.php /cvsroot/moodle/moodle/help.php]
| |
| < * @version $Id: help.php,v 1.40 2007/05/23 12:03:22 nfreear Exp $
| |
| > * @version $Id: help.php,v 1.40.2.1 2007/11/06 13:25:22 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/langdoc.php /cvsroot/moodle/moodle/admin/langdoc.php]
| |
| < <?php // $Id: langdoc.php,v 1.22 2007/11/21 03:05:12 mudrd8mz Exp $
| |
| > <?php // $Id: langdoc.php,v 1.20.4.2 2007/11/21 02:56:58 mudrd8mz Exp $
| |
| < $filetemplate = ''; // template for new files, i.e. '$Id: langdoc.php,v 1.22 2007/11/21 03:05:12 mudrd8mz Exp $';
| |
| > $filetemplate = ''; // template for new files, i.e. '$Id: langdoc.php,v 1.20.4.2 2007/11/21 02:56:58 mudrd8mz Exp $';
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mailout-debugger.php /cvsroot/moodle/moodle/admin/mailout-debugger.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mnet/access_control.php /cvsroot/moodle/moodle/admin/mnet/access_control.php]
| |
| < <?php // $Id: access_control.php,v 1.14 2007/04/30 17:08:46 skodak Exp $
| |
| > <?php // $Id: access_control.php,v 1.14.4.2 2007/11/14 23:43:05 martinlanghoff Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mnet/peers.html /cvsroot/moodle/moodle/admin/mnet/peers.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/ldap/config.html /cvsroot/moodle/moodle/auth/ldap/config.html]
| |
|
| |
| 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/auth/mnet/land.php /cvsroot/moodle/moodle/auth/mnet/land.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/shibboleth/index.php /cvsroot/moodle/moodle/auth/shibboleth/index.php]
| |
| < <?php // $Id: index.php,v 1.15 2007/07/11 08:04:19 exe-cutor Exp $
| |
| > <?php // $Id: index.php,v 1.15.2.1 2007/11/14 23:35:31 martinlanghoff Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/blocks/loancalc/block_loancalc.php /cvsroot/moodle/moodle/blocks/loancalc/block_loancalc.php]
| |
| < <?php // $Id: block_loancalc.php,v 1.9 2007/01/10 06:44:15 vyshane Exp $
| |
| > <?php // $Id: block_loancalc.php,v 1.9.4.1 2007/10/22 20:37:53 arborrow Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/info.php /cvsroot/moodle/moodle/course/info.php]
| |
| < <?php // $Id: info.php,v 1.17.2.2 2007/11/19 02:23:30 toyomoyo Exp $
| |
| > <?php // $Id: info.php,v 1.17.2.3 2007/11/20 02:34:55 mattc-catalyst Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/loginas.php /cvsroot/moodle/moodle/course/loginas.php]
| |
| < <?php // $Id: loginas.php,v 1.47 2007/10/10 04:05:47 moodler Exp $
| |
| > <?php // $Id: loginas.php,v 1.47.2.1 2007/11/14 23:35:15 martinlanghoff Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/imsenterprise/enrol.php /cvsroot/moodle/moodle/enrol/imsenterprise/enrol.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/config.html /cvsroot/moodle/moodle/enrol/mnet/config.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/enrol.php /cvsroot/moodle/moodle/enrol/mnet/enrol.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/paypal/enrol.php /cvsroot/moodle/moodle/enrol/paypal/enrol.php]
| |
| < <?php // $Id: enrol.php,v 1.28 2007/08/17 19:09:17 nicolasconnault Exp $
| |
| > <?php // $Id: enrol.php,v 1.28.2.1 2007/11/13 18:04:58 mchurch Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/grade/export/ods/grade_export_ods.php /cvsroot/moodle/moodle/grade/export/ods/grade_export_ods.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/grade/report/grader/functions.js /cvsroot/moodle/moodle/grade/report/grader/functions.js]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/auth.php /cvsroot/moodle/moodle/lang/en_utf8/auth.php]
| |
| < <?php // $Id: auth.php,v 1.30.2.1 2007/11/01 14:36:25 thepurpleblob Exp $
| |
| > <?php // $Id: auth.php,v 1.30.2.2 2007/11/14 23:45:21 martinlanghoff Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/enrol_mnet.php /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/glossary.php /cvsroot/moodle/moodle/lang/en_utf8/glossary.php]
| |
| < <?PHP // $Id: glossary.php,v 1.9 2007/11/01 14:51:29 nicolasconnault Exp $
| |
| > <?PHP // $Id: glossary.php,v 1.8 2007/09/24 17:09:37 nfreear Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/mnet.php /cvsroot/moodle/moodle/lang/en_utf8/mnet.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/surveys.html /cvsroot/moodle/moodle/lang/en_utf8/help/surveys.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/uploadusers2.html /cvsroot/moodle/moodle/lang/en_utf8/help/uploadusers2.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/grade/aggregation.html /cvsroot/moodle/moodle/lang/en_utf8/help/grade/aggregation.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/question/permissions.html /cvsroot/moodle/moodle/lang/en_utf8/help/question/permissions.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/questionlib.php /cvsroot/moodle/moodle/lib/questionlib.php]
| |
| < <?php // $Id: questionlib.php,v 1.119.2.2 2007/11/02 16:20:32 tjhunt Exp $
| |
| > <?php // $Id: questionlib.php,v 1.119.2.3 2007/11/26 13:34:47 jamiesensei Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/grade/grade_grade.php /cvsroot/moodle/moodle/lib/grade/grade_grade.php]
| |
| < <?php // $Id: grade_grade.php,v 1.14.2.9 2007/11/01 08:50:32 skodak Exp $
| |
| > <?php // $Id: grade_grade.php,v 1.14.2.11 2007/11/27 06:38:56 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/grade/simpletest/testgradecategory.php /cvsroot/moodle/moodle/lib/grade/simpletest/testgradecategory.php]
| |
| < <?php // $Id: testgradecategory.php,v 1.7 2007/10/10 05:29:28 nicolasconnault Exp $
| |
| > <?php // $Id: testgradecategory.php,v 1.7.2.1 2007/11/21 10:04:19 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/simpletest/fixtures/gradetest.php /cvsroot/moodle/moodle/lib/simpletest/fixtures/gradetest.php]
| |
| < <?php // $Id: gradetest.php,v 1.23 2007/10/10 05:29:35 nicolasconnault Exp $
| |
| > <?php // $Id: gradetest.php,v 1.23.2.1 2007/11/21 10:04:19 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/login/index.php /cvsroot/moodle/moodle/login/index.php]
| |
| < <?php // $Id: index.php,v 1.129 2007/09/25 11:34:40 nfreear Exp $
| |
| > <?php // $Id: index.php,v 1.129.2.1 2007/11/14 23:34:31 martinlanghoff Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/testclient.php /cvsroot/moodle/moodle/mnet/testclient.php]
| |
| < <?php // $Id: testclient.php,v 1.2 2007/08/29 10:48:47 stronk7 Exp $
| |
| > <?php // $Id: testclient.php,v 1.2.2.2 2007/10/19 00:44:40 donal72 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/client.php /cvsroot/moodle/moodle/mnet/xmlrpc/client.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/mnet/xmlrpc/xmlparser.php /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/format.php /cvsroot/moodle/moodle/question/format.php]
| |
| < <?php // $Id: format.php,v 1.35.2.1 2007/11/02 16:20:23 tjhunt Exp $
| |
| > <?php // $Id: format.php,v 1.35.2.3 2007/11/15 13:56:31 mchurch Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/indexer.php /cvsroot/moodle/moodle/search/indexer.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/resource_document.php /cvsroot/moodle/moodle/search/documents/resource_document.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/techproject_document.php /cvsroot/moodle/moodle/search/documents/techproject_document.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/js/jquery.php /cvsroot/moodle/moodle/theme/custom_corners/js/jquery.php]
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 208: |
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 215: |
Line 15: |
| * [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. |
|
| |
|
| * [http://tracker.moodle.org/browse/MDL-8912 Tracker Task MDL-8912]: Progress in the Moodle Tracker about these unmerged files. | | * Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files. |
|
| |
|
| [[Category:Developer|Unmerged files]] | | [[Category:Developer|Unmerged files]] |
