[Fusionforge-commits] r12738 - in trunk: . src/common/forum src/common/frs src/common/include src/common/tracker src/common/widget src/cronjobs src/docs src/docs/docbook/docbook/installation_guide src/plugins/hudson/include src/plugins/svncommitemail/common src/plugins/wiki/common src/www/account src/www/admin src/www/export src/www/forum src/www/frs/admin src/www/include src/www/pm/include src/www/project/admin src/www/reporting

Roland Mas lolando at fusionforge.org
Mon Mar 14 17:04:04 CET 2011


Author: lolando
Date: 2011-03-14 17:04:03 +0100 (Mon, 14 Mar 2011)
New Revision: 12738

Modified:
   trunk/
   trunk/src/common/forum/AttachManager.class.php
   trunk/src/common/forum/Forum.class.php
   trunk/src/common/forum/ForumAdmin.class.php
   trunk/src/common/forum/ForumHTML.class.php
   trunk/src/common/frs/FRSPackage.class.php
   trunk/src/common/include/Navigation.class.php
   trunk/src/common/include/Plugin.class.php
   trunk/src/common/include/PluginManager.class.php
   trunk/src/common/include/SCMPlugin.class.php
   trunk/src/common/include/config-vars.php
   trunk/src/common/include/cron_utils.php
   trunk/src/common/include/session.php
   trunk/src/common/include/utils.php
   trunk/src/common/tracker/Artifact.class.php
   trunk/src/common/tracker/ArtifactExtraFieldElement.class.php
   trunk/src/common/tracker/ArtifactType.class.php
   trunk/src/common/widget/Widget_MyArtifacts.class.php
   trunk/src/common/widget/Widget_MyBookmarks.class.php
   trunk/src/common/widget/Widget_MyMonitoredForums.class.php
   trunk/src/common/widget/Widget_MyProjects.class.php
   trunk/src/common/widget/Widget_MySurveys.class.php
   trunk/src/common/widget/Widget_ProjectMembers.class.php
   trunk/src/cronjobs/calculate_user_metric.php
   trunk/src/cronjobs/forum_gateway.php
   trunk/src/cronjobs/project_cleanup.php
   trunk/src/docs/debian-guide.html
   trunk/src/docs/docbook/docbook/installation_guide/installation_guide.xml
   trunk/src/plugins/hudson/include/hudsonPlugin.class.php
   trunk/src/plugins/hudson/include/hudsonViews.class.php
   trunk/src/plugins/svncommitemail/common/SVNCommitEmailPlugin.class.php
   trunk/src/plugins/wiki/common/WikiPlugin.class.php
   trunk/src/www/account/register.php
   trunk/src/www/admin/admin_table.php
   trunk/src/www/admin/approve-pending.php
   trunk/src/www/admin/groupdelete.php
   trunk/src/www/admin/groupedit.php
   trunk/src/www/admin/index.php
   trunk/src/www/admin/pluginman.php
   trunk/src/www/export/rss_project.php
   trunk/src/www/forum/attachment.php
   trunk/src/www/forum/myforums.php
   trunk/src/www/frs/admin/index.php
   trunk/src/www/include/features_boxes.php
   trunk/src/www/include/tool_reports.php
   trunk/src/www/include/user_home.php
   trunk/src/www/pm/include/ProjectGroupHTML.class.php
   trunk/src/www/project/admin/roledelete.php
   trunk/src/www/reporting/timeadd.php
Log:
Merged from 5.1: long series of fixes by Alain


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:8721-8727
/branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838
/branches/Branch_5_1:11607-11609,11621,11625,11627,11631,11638,11644,11647-11651,11677,11680-11681,11683-11684,11719-11720,11724,11754,11780,11783,11792,11794,11802,11808-11816,11818,11822-11824,11827-11829,11834-11835,11847,11849,11851-11852,11855,11858,11862,11867,11869-11872,11876,11880,11893,11902-11905,11915,11923-11927,11929-11930,11932,11934-11941,11943,11948-11949,11952-11954,11956-11960,11962,11965-11966,11972,11975,11980,11983-11984,11986-11987,11990,11992-11997,12003-12004,12010-12013,12015,12018-12023,12024,12043-12044,12046-12050,12051-12061,12063,12065,12070,12073-12074,12075-12076,12081-12083,12093-12094,12102,12105,12118,12124,12127-12128,12139,12141,12143,12148-12149,12153,12157-12159,12168-12169,12175-12180,12190,12194-12198,12203,12208-12213,12217-12258,12262,12264-12266,12274-12277,12281-12282,12287-12290,12340,12345-12346,12352,12359,12472-12473,12594,12634,12636-12638,12658-12659
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8662,8674,8751,8754,8756,8760-8761,8812,8850,8945,8995,8998,9004-9006,9124,9137,9141,9317,9443,9469,9670,9701,9726,9934,10013
/branches/Branch_5_0:8892,8895,8897-8898,8900,8903-8904,8906-8907,8910,8915,8922,8924,8926,8929,8931-8933,8941,8946,8951,8955,8972-8977,8981,8997,8999,9002,9031-9032,9050,9080-9081,9084-9086,9093-9095,9102-9104,9108,9113-9115,9117-9118,9123,9125,9127-9131,9135-9136,9139,9146,9148-9150,9179-9191,9193-9195,9198,9200,9202,9204,9207,9209,9211,9213,9215,9220-9222,9231,9234-9235,9243,9251,9254,9259,9287,9315,9318,9347-9349,9358,9396,9427,9429,9431-9433,9441-9442,9444-9445,9462,9464,9468,9522-9523,9549,9551-9552,9576-9577,9579,9615,9633-9634,9672-9673,9675-9676,9684,9686-9687,9689,9699,9727,9729,9731,9930-9932,9935,9956,9980,10005-10006,10021,10024,10027,10064,10081-10082,10273,10285,10820-10824,10868,10872,10876-10878,10880,10918,11015,11017,11058-11060,11085-11086,11160-11165,11252-11253,11287,11294,11581,11619-11620,11679,11722-11723,11907,11974

   + /trunk:8721-8727
/branches/Branch_5_0:8892,8895,8897-8898,8900,8903-8904,8906-8907,8910,8915,8922,8924,8926,8929,8931-8933,8941,8946,8951,8955,8972-8977,8981,8997,8999,9002,9031-9032,9050,9080-9081,9084-9086,9093-9095,9102-9104,9108,9113-9115,9117-9118,9123,9125,9127-9131,9135-9136,9139,9146,9148-9150,9179-9191,9193-9195,9198,9200,9202,9204,9207,9209,9211,9213,9215,9220-9222,9231,9234-9235,9243,9251,9254,9259,9287,9315,9318,9347-9349,9358,9396,9427,9429,9431-9433,9441-9442,9444-9445,9462,9464,9468,9522-9523,9549,9551-9552,9576-9577,9579,9615,9633-9634,9672-9673,9675-9676,9684,9686-9687,9689,9699,9727,9729,9731,9930-9932,9935,9956,9980,10005-10006,10021,10024,10027,10064,10081-10082,10273,10285,10820-10824,10868,10872,10876-10878,10880,10918,11015,11017,11058-11060,11085-11086,11160-11165,11252-11253,11287,11294,11581,11619-11620,11679,11722-11723,11907,11974
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7478,7480,7485,7490-7492,7505,7540,7556-7560,7568,7570-7571,7573,7576,7580,7609-7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693,7700,7706-7708,7713,7725,7728-7742,7760,7763-7764,7767,7769-7770,7773,7776,7784-7785,7791,7797,7799,7802-7808,7810-7811,7816,7818,7825-7828,7839,7846-7847,7850,7894,7902,7920-7922,7927-7928,7932,7936-7937,7939,7942,7944-7945,7947,7951,7956,7958,7960,8064,8079-8080,8108,8113,8119,8121,8127-8128,8145,8197,8201-8202,8216,8224,8226,8228,8247-8250,8252,8271-8272,8310-8311,8328,8337,8339-8357,8361,8371,8373-8375,8378-8379,8383-8396,8415,8427-8431,8438-8441,8449,8452-8453,8458,8461,8477-8478,8480,8482,8492,8514,8530,8604-8605,8608,8637,8662,8674,8751,8754,8756,8760-8761,8812,8850,8945,8995,8998,9004-9006,9124,9137,9141,9317,9443,9469,9670,9701,9726,9934,10013
/branches/Branch_5_1:11607-11609,11621,11625,11627,11631,11638,11644,11647-11651,11677,11680-11681,11683-11684,11719-11720,11724,11754,11780,11783,11792,11794,11802,11808-11816,11818,11822-11824,11827-11829,11834-11835,11847,11849,11851-11852,11855,11858,11862,11867,11869-11872,11876,11880,11893,11902-11905,11915,11923-11927,11929-11930,11932,11934-11941,11943,11948-11949,11952-11954,11956-11960,11962,11965-11966,11972,11975,11980,11983-11984,11986-11987,11990,11992-11997,12003-12004,12010-12013,12015,12018-12023,12024,12043-12044,12046-12050,12051-12061,12063,12065,12070,12073-12074,12075-12076,12081-12083,12093-12094,12102,12105,12118,12124,12127-12128,12139,12141,12143,12148-12149,12153,12157-12159,12168-12169,12175-12180,12190,12194-12198,12203,12208-12213,12217-12258,12262,12264-12266,12274-12277,12281-12282,12287-12290,12340,12345-12346,12352,12359,12472-12473,12594,12634,12636-12638,12658-12659,12684-12712,12714-12715
/branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674,7699,7746-7748,7771,7774,7786,7838

Modified: svk:merge
   - 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:10013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8751
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8756
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:9141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10006
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10064
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10824
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11017
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11165
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11253
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11294
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8895
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8898
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8900
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9131
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9150
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9188
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9195
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9198
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9207
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9209
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9213
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9243
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9254
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9358
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9433
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9549
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9552
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9579
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9675
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9676
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11631
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11638
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11651
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11684
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11724
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11754
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11794
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11802
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11818
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11835
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11855
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11858
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11872
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11876
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11905
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11930
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11962
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11966
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11975
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11984
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11987
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11997
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12015
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12022
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12073
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12105
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12143
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12169
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12180
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12203
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12266
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12282
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12594
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12659
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727

   + 9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7001
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7012
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7291
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7458
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7623
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7624
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7786
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_7:7838
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:10013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7335
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7344
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7345
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7402
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7455
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7459
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7469
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7470
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7476
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7480
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7505
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7540
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7557
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7559
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7560
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7580
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7609
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7615
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7618
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7622
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7626
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7708
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7713
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7725
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7730
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7732
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7733
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7734
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7737
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7738
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7739
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7742
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7760
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7763
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7764
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7767
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7769
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7773
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7776
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7784
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7785
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7797
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7799
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7811
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7826
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7827
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7828
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7839
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7951
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7958
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:7960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8108
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8113
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8119
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8128
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8145
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8216
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8224
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8226
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8250
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8337
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8357
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8371
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8375
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8379
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8415
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8431
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8441
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8449
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8453
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8530
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8604
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8605
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8608
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8637
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8751
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8756
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:8761
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_4_8:9141
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10006
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10021
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10064
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10082
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:10824
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11017
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11165
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11253
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:11294
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8895
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8898
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8900
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:8941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9115
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9131
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9136
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9139
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9150
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9188
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9195
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9198
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9202
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9207
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9209
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9213
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9243
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9254
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9358
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9396
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9427
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9433
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9549
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9552
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9579
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9675
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9676
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9729
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9731
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_0:9980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11621
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11627
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11631
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11638
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11651
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11684
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11724
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11754
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11794
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11802
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11818
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11835
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11855
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11858
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11872
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11876
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11905
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11930
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11932
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11941
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11960
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11962
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11966
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11975
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11980
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11984
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11987
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:11997
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12013
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12015
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12022
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12049
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12060
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12073
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12105
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12118
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12143
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12169
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12180
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12190
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12203
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12266
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12282
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12594
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12634
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12659
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/branches/Branch_5_1:12715
9d84d37e-dcb1-4aad-b103-6f3d92f53bf6:/trunk:8727


Modified: trunk/src/common/forum/AttachManager.class.php
===================================================================
--- trunk/src/common/forum/AttachManager.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/forum/AttachManager.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -5,7 +5,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * The rest Copyright 2002-2005 (c) GForge Team
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  *
@@ -131,6 +131,7 @@
 			$pend = "";
 		}
 		
+		$attach = '';
 		$attachid = '';
 		if ($res && db_numrows($res)) {
 			$attachid = db_result($res,0,'attachmentid');

Modified: trunk/src/common/forum/Forum.class.php
===================================================================
--- trunk/src/common/forum/Forum.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/forum/Forum.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -5,6 +5,7 @@
  * Copyright 1999-2000, Tim Perdue/Sourceforge
  * Copyright 2002, Tim Perdue/GForge, LLC
  * Copyright 2009, Roland Mas
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -237,8 +238,8 @@
 	 * @return	boolean	success.
 	 */
 	function fetchData($group_forum_id) {
-		$res = db_query_params ('SELECT * FROM forum_group_list_vw WHERE group_forum_id=$1',
-					array ($group_forum_id)) ;
+		$res=db_query_params('SELECT * FROM forum_group_list_vw	WHERE group_forum_id=$1 AND group_id=$2',
+			array($group_forum_id, $this->Group->getID()));
 		if (!$res || db_numrows($res) < 1) {
 			$this->setError(_('Invalid forum group identifier'));
 			return false;

Modified: trunk/src/common/forum/ForumAdmin.class.php
===================================================================
--- trunk/src/common/forum/ForumAdmin.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/forum/ForumAdmin.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -155,6 +155,7 @@
 	function ExecuteAction ($action) {
         global $HTML;
 		
+		$feedback='';
 		if ($action == "change_status") { //change a forum
 			$forum_name = getStringFromRequest('forum_name');
 			$description = getStringFromRequest('description');
@@ -326,7 +327,10 @@
 				return;			
 			}
 
-			$options = array("1" => "No action","2" => "Delete","3" => "Release"); //array with the supported actions
+			//array with the supported actions
+			$options = array("1" => _("No action"),
+                             "2" => _("Delete"),
+                             "3" => _("Release"));
 			//i'll make a hidden variable, helps to determine when the user updates the info, which action corresponds to which msgID
 			$ids='';
 			for($i=0;$i<db_numrows($res);$i++) {

Modified: trunk/src/common/forum/ForumHTML.class.php
===================================================================
--- trunk/src/common/forum/ForumHTML.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/forum/ForumHTML.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -138,17 +138,17 @@
 		if ($f) {
 			if ($f->isMonitoring()) {
 				echo util_make_link ('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&stop=1',
-						     html_image('ic/xmail16w.png','20','20').' '._('Stop Monitoring')).' | ';
+							     html_image('ic/xmail16w.png').' '._('Stop Monitoring')).' | ';
 			} else {
 				echo util_make_link ('/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1',
-						     html_image('ic/mail16w.png','20','20').' '._('Monitor Forum')).' | ';
+						     html_image('ic/mail16w.png').' '._('Monitor Forum')).' | ';
 			}
 			echo util_make_link ('/forum/save.php?forum_id='.$forum_id.'&group_id='.$group_id,
-					     html_image('ic/save.png','24','24') .' '._('Save Place')).' | ';
+					     html_image('ic/save.png') .' '._('Save Place')).' | ';
 		}
 	} elseif ($f) {
 		echo '<a href="/forum/monitor.php?forum_id='.$forum_id.'&group_id='.$group_id.'&start=1">' .
-			html_image('ic/mail16w.png','20','20').' '._('Monitor Forum').'</a> | ';		
+			html_image('ic/mail16w.png').' '._('Monitor Forum').'</a> | ';		
 	}
 
 	if ($f && $forum_id) {
@@ -323,17 +323,19 @@
 						<td>' . _('File to upload') . ':   <input type="file" name="attachment1"/></td>
 					</tr>
 					<tr>
-						<td class="warning">' . _('Warning: Current file will be deleted permanently') . '</td>
+						<td class="warning">' . _('Warning: Uploaded file will replace current file') . '</td>
 					</tr>
 			</table>
-			<input type="submit" name="go" value="'._('Update').'">
+				<input type="submit" name="go" value="'._('Update').'" />
 			<input type="hidden" name="doedit" value="1"/>
 			<input type="hidden" name="edit" value="yes"/>
 			<input type="hidden" name="forum_id" value="'.$forum_id.'"/>
 			<input type="hidden" name="group_id" value="'.$group_id.'"/>
 			<input type="hidden" name="attachid" value="'.$attachid.'"/>
 			<input type="hidden" name="msg_id" value="'.$msg_id.'"/>
-			</fieldset></form><p>';
+			</fieldset>
+			</form>
+			<p/>';
 		return $return_val;
 	}
 
@@ -590,7 +592,7 @@
 		plugin_hook("text_editor",$params);
 		if (!$GLOBALS['editor_was_set_up']) {
 			//if we don't have any plugin for text editor, display a simple textarea edit box
-			echo '<textarea name="body"  rows="10" cols="70" wrap="soft">' . $body . '</textarea>';
+					echo '<textarea name="body"  rows="10" cols="70">' . $body . '</textarea>';
 		}
 		unset($GLOBALS['editor_was_set_up']);
 		?> <?php //$text_support->displayTextField('body'); ?> <br>
@@ -628,9 +630,7 @@
 } else {
 	//do nothing
 }
-
 }
-
 }
 // Local Variables:
 // mode: php

Modified: trunk/src/common/frs/FRSPackage.class.php
===================================================================
--- trunk/src/common/frs/FRSPackage.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/frs/FRSPackage.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -4,6 +4,7 @@
  *
  * Copyright 2002, Tim Perdue/GForge, LLC
  * Copyright 2009, Roland Mas
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -26,7 +27,7 @@
 require_once $gfcommon.'include/Error.class.php';
 require_once $gfcommon.'frs/FRSRelease.class.php';
 
-function &get_frs_packages($Group) {
+function get_frs_packages($Group) {
 	$ps = array();
 	$res = db_query_params ('SELECT * FROM frs_package WHERE group_id=$1',
 				array ($Group->getID())) ;

Modified: trunk/src/common/include/Plugin.class.php
===================================================================
--- trunk/src/common/include/Plugin.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/include/Plugin.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -4,8 +4,9 @@
  *
  * Copyright 2002, Roland Mas
  * Copyright 2010, Franck Villaume - Capgemini
- * Portions Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
- * Portions Copyright 2010 (c) Mélanie Le Bail
+ * Copyright 2001-2009, Xerox Corporation, Codendi Team
+ * Copyright 2010, Mélanie Le Bail
+ * Copyright 2011, Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.

Modified: trunk/src/common/include/SCMPlugin.class.php
===================================================================
--- trunk/src/common/include/SCMPlugin.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/include/SCMPlugin.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -3,6 +3,7 @@
  * FusionForge source control management
  *
  * Copyright 2004-2009, Roland Mas
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -176,8 +177,8 @@
 		if ($project->usesPlugin ($this->name)) {
 
 			// Table for summary info
-			print '<table width="100%"><tr valign="top"><td width="65%">' ;
-			print $this->getBlurb () ;
+			print '<table width="100%"><tr valign="top"><td width="65%">'."\n" ;
+			print $this->getBlurb ()."\n" ;
 
 			// Instructions for anonymous access
 			if ($project->enableAnonSCM()) {
@@ -191,7 +192,7 @@
 			if ($this->browserDisplayable ($project)) {
 				print $this->getSnapshotPara ($project) ;
 			}
-			print '</td><td width="35%" valign="top">' ;
+			print '</td>'."\n".'<td width="35%" valign="top">'."\n" ;
 
 			// Browsing
 			echo $HTML->boxTop(_('Repository History'));
@@ -223,8 +224,8 @@
 
 	function printAdminPage($params) {
 		$group = group_get_object($params['group_id']);
-		if ( $group->usesPlugin($this->name) && $group->isPublic()) {
-			print '<p><input type="checkbox" name="scm_enable_anonymous" value="1" '.$this->c($group->enableAnonSCM()).' /><strong>'._('Enable Anonymous Access').'</strong></p>';
+		if ( $group->usesPlugin ( $this->name ) && $group->isPublic()) {
+			print '<p><input type="checkbox" name="scm_enable_anonymous" value="1" '.$this->c($group->enableAnonSCM()).' /><strong>'._('Enable Anonymous Read Access').'</strong></p>';
 		}
 	}
 

Modified: trunk/src/common/include/config-vars.php
===================================================================
--- trunk/src/common/include/config-vars.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/include/config-vars.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -3,6 +3,7 @@
  * FusionForge configuration variables
  *
  * Copyright 2010, Roland Mas
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -50,6 +51,8 @@
 	forge_define_config_item ('default_country_code', 'core', $GLOBALS['sys_default_country_code']) ;
 	forge_define_config_item ('use_scm', 'core', $GLOBALS['sys_use_scm']) ;
 	forge_set_config_item_bool ('use_scm', 'core') ;
+	forge_define_config_item ('use_dav', 'core', $GLOBALS['sys_use_dav']) ;
+	forge_set_config_item_bool ('use_dav', 'core') ;
 	forge_define_config_item ('use_tracker', 'core', $GLOBALS['sys_use_tracker']) ;
 	forge_set_config_item_bool ('use_tracker', 'core') ;
 	forge_define_config_item ('use_forum', 'core', $GLOBALS['sys_use_forum']) ;

Modified: trunk/src/common/include/cron_utils.php
===================================================================
--- trunk/src/common/include/cron_utils.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/include/cron_utils.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -4,6 +4,7 @@
  *
  * Copyright 2003, GForge, LLC
  * Copyright 2009, Roland Mas
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -54,7 +55,12 @@
 $cron_arr[24]='svn-stats.php';
 $cron_arr[25]='homedirs.php';
 $cron_arr[26]='update_users.php';
+$cron_arr[27]='create_scm_repos.php';
+$cron_arr[28]='gather_scm_stats.php';
 
+$cron_arr[901]='create_groups.php';
+$cron_arr[902]='mailing_lists_index.php';
+
 function cron_entry($job,$output) {
 	$sql='INSERT INTO cron_history (rundate,job,output) 
 		values ($1, $2, $3)' ;

Modified: trunk/src/common/include/session.php
===================================================================
--- trunk/src/common/include/session.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/include/session.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -479,7 +479,6 @@
 	} else {
 		session_set_internal ($user_id, $res) ;
 	}
-
 }
 
 function session_set_internal ($user_id, $res=false) {

Modified: trunk/src/common/tracker/Artifact.class.php
===================================================================
--- trunk/src/common/tracker/Artifact.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/tracker/Artifact.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -956,13 +956,13 @@
 			$ef = $this->ArtifactType->getExtraFields();
 			$ef_new = $newArtifactType->getExtraFields();
 			foreach($extra_fields as $extra_id => $value) {
-				$alias = $ef[$extra_id]['alias'];
+				$alias = preg_replace('/^@/', '', $ef[$extra_id]['alias']);
 				$type  = $ef[$extra_id]['field_type'];
 
 				// Search if there is an extra field with the same alias.
 				$new_id = 0;
 				foreach($ef_new as $id => $arr) {
-					if ($arr['alias'] == $alias) {
+					if (preg_replace('/^@/', '', $arr['alias']) == $alias) {
 						$new_id = $id;
 					}
 				}

Modified: trunk/src/common/tracker/ArtifactExtraFieldElement.class.php
===================================================================
--- trunk/src/common/tracker/ArtifactExtraFieldElement.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/tracker/ArtifactExtraFieldElement.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -306,12 +306,13 @@
 
 		$result = db_query_params ('DELETE FROM artifact_extra_field_elements WHERE element_id=$1',
 				    array ($this->getID())) ;
-		if ($result && db_affected_rows($result) > 0) {
-			return true;
-		} else {
+		if (! $result || ! db_affected_rows($result)) {
 			$this->setError(db_error());
 			return false;
 		}
+		$result = db_query_params ('DELETE FROM artifact_workflow_event WHERE from_value_id=$1 OR to_value_id=$1',
+				    array ($this->getID())) ;
+		return true;
 	}
 }
 

Modified: trunk/src/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/src/common/tracker/ArtifactType.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/tracker/ArtifactType.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -5,6 +5,7 @@
  * Copyright 1999-2001, VA Linux Systems, Inc.
  * Copyright 2002-2004, GForge, LLC
  * Copyright 2009, Roland Mas
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -142,7 +143,7 @@
 	 *  @param	array	The associative array of data.
 	 *	@return boolean	success.
 	 */
-	function ArtifactType(&$Group,$artifact_type_id=false, $arr=false) {
+	function ArtifactType($Group,$artifact_type_id=false, $arr=false) {
 		$this->Error();
 		if (!$Group || !is_object($Group)) {
 			$this->setError('No Valid Group Object');
@@ -152,7 +153,7 @@
 			$this->setError('ArtifactType: '.$Group->getErrorMessage());
 			return false;
 		}
-		$this->Group =& $Group;
+		$this->Group = $Group;
 		if ($artifact_type_id) {
 			if (!$arr || !is_array($arr)) {
 				if (!$this->fetchData($artifact_type_id)) {

Modified: trunk/src/common/widget/Widget_MyMonitoredForums.class.php
===================================================================
--- trunk/src/common/widget/Widget_MyMonitoredForums.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/widget/Widget_MyMonitoredForums.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -107,8 +107,8 @@
 					stripslashes(db_result($result2,$i,'forum_name')).'</A></TD>'.
 					'<TD ALIGN="center"><A HREF="/my/stop_monitor.php?forum_id='.$group_forum_id.
 					'" onClick="return confirm(\''._("Stop monitoring this Forum?").'\')">'.
-					'<IMG SRC="'.$GLOBALS['HTML']->imgroot.'ic/trash.png" HEIGHT="16" WIDTH="16" '.
-					'BORDER=0 ALT="'._("STOP MONITORING").'"></A></TD></TR>';
+					'<img src="'.$GLOBALS['HTML']->imgroot.'ic/trash.png" height="16" width="16" '.
+					'border=0 alt="'._("Stop monitoring").'"></a></td></tr>';
 			}
 		}
 

Modified: trunk/src/common/widget/Widget_MyProjects.class.php
===================================================================
--- trunk/src/common/widget/Widget_MyProjects.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/widget/Widget_MyProjects.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -141,7 +141,7 @@
 					  'title'       => $title,
 					  'description' => $desc,
 					  'link'        => $url)
-				);
+			    );
 		}
 	}
 

Modified: trunk/src/common/widget/Widget_ProjectMembers.class.php
===================================================================
--- trunk/src/common/widget/Widget_ProjectMembers.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/common/widget/Widget_ProjectMembers.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -98,8 +98,6 @@
 			echo "</p>\n";
 		}
 
-			
-
 		echo '<p><span rel="sioc:has_usergroup" xmlns:sioc="http://rdfs.org/sioc/ns#">';
 		echo '<span about="members/" typeof="sioc:UserGroup">';
 		echo '<span rel="http://www.w3.org/2002/07/owl#sameAs">';

Modified: trunk/src/cronjobs/calculate_user_metric.php
===================================================================
--- trunk/src/cronjobs/calculate_user_metric.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/cronjobs/calculate_user_metric.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -58,7 +58,7 @@
 		what we want - a list of the top users on the site.
 
 */
-require (dirname(__FILE__).'/../www/env.inc.php');
+require dirname(__FILE__).'/../www/env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require $gfcommon.'include/cron_utils.php';
 

Modified: trunk/src/cronjobs/forum_gateway.php
===================================================================
--- trunk/src/cronjobs/forum_gateway.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/cronjobs/forum_gateway.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -280,7 +280,7 @@
 		global $argv;
 
 		if ($this->Forum==-1) {
-			$Group =& group_get_object_by_name($argv[1]);
+			$Group = group_get_object_by_name($argv[1]);
 			if (!$Group || !is_object($Group)) {
 				$this->setError('Could Not Get Group Object');
 				return false;

Modified: trunk/src/cronjobs/project_cleanup.php
===================================================================
--- trunk/src/cronjobs/project_cleanup.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/cronjobs/project_cleanup.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US
  */
 
-require (dirname(__FILE__).'/../www/env.inc.php');
+require dirname(__FILE__).'/../www/env.inc.php';
 require_once $gfcommon.'include/pre.php';
 require $gfcommon.'include/cron_utils.php';
 

Modified: trunk/src/docs/debian-guide.html
===================================================================
--- trunk/src/docs/debian-guide.html	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/docs/debian-guide.html	2011-03-14 16:04:03 UTC (rev 12738)
@@ -83,7 +83,7 @@
 Where is the Gforge home page?
 
 <blockquote><b>Answer:</b> <BR>
-<A href=http://gforge.org />http://gforge.org/</A></blockquote>
+<A href=http://gforge.org />http://fusionforge.org/</A></blockquote>
 
 <b>Question:</b>
 How do I build this packages?

Modified: trunk/src/docs/docbook/docbook/installation_guide/installation_guide.xml
===================================================================
--- trunk/src/docs/docbook/docbook/installation_guide/installation_guide.xml	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/docs/docbook/docbook/installation_guide/installation_guide.xml	2011-03-14 16:04:03 UTC (rev 12738)
@@ -19,7 +19,7 @@
    For instance, an installation of FusionForge hosts over 450 users and over 140 projects on a single CPU Pentium 2.4GHz machine with 512 MB of RAM.
   </para>
     <para>
-   You can find additionnal information about hardware used by several installations of FusionForge in the <ulink url="http://gforge.org/docman/view.php/1/52/gforge-sites.html">FusionForge sites list maintained by Tom Copeland</ulink>.
+   You can find additionnal information about hardware used by several installations of FusionForge in the <ulink url="http://fusionforge.org/docman/view.php/1/52/gforge-sites.html">FusionForge sites list maintained by Tom Copeland</ulink>.
   </para>
   </section>
   <section>
@@ -1116,8 +1116,6 @@
     <para>You may also be missing GD support or be missing JPGraph or have it installed improperly. The <filename class="directory">jpgraph/src/</filename> directory should be specified accurately in your <filename class="directory">local.inc</filename> file, and you should include a <filename>/</filename> at the end of the path specified. In addition, you should modify <filename>jpgraph.php</filename> to set <literal>USE_CACHE=false</literal>.</para>
     <para>Q: How do I upgrade my database?</para>
     <para>A: As stated above, you must apply the changes that are listed in date order in the <filename class="directory">db/</filename> directory to your database. Only the changes that are not already in your old <filename class="directory">db/</filename> directory should be applied, and they should be applied and checked <emphasis>in order</emphasis>.</para>
-    <para>Q: I'm getting an error about BaseLanguage.class.php not being found.</para>
-    <para>A: Make sure your localization path is correctly specified in the local.inc file and that it is readable <emphasis>and</emphasis> writable by the apache user.</para>
     <para>Q: When I click on <quote>/projects/</quote> or <quote>/users/</quote> links, I get the source code instead of the page I expected.</para>
     <para>A: As shown in the example <filename>httpd.conf</filename> files above, you may have to switch to using the <literal><Files></literal> or <literal><Location></literal> directives depending on your server version.</para>
     <para>Q: How do I backup FusionForge?</para>

Modified: trunk/src/plugins/hudson/include/hudsonPlugin.class.php
===================================================================
--- trunk/src/plugins/hudson/include/hudsonPlugin.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/plugins/hudson/include/hudsonPlugin.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -1,7 +1,7 @@
 <?php
 /**
  * @copyright Copyright (c) Xerox Corporation, Codendi 2007-2008.
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is licensed under the GNU General Public License version 2. See the file COPYING.
  * 
@@ -86,6 +86,14 @@
 
 		}	
 	}
+
+	function groupisactivecheckbox (&$params) {
+		$group = group_get_object($params['group']);
+		if ($group->usesPlugin('scmsvn')) {
+			parent::groupisactivecheckbox($params);
+		}
+	}
+
 	function &getPluginInfo() {
 		if (!is_a($this->pluginInfo, 'hudsonPluginInfo')) {
 			require_once('hudsonPluginInfo.class.php');

Modified: trunk/src/plugins/hudson/include/hudsonViews.class.php
===================================================================
--- trunk/src/plugins/hudson/include/hudsonViews.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/plugins/hudson/include/hudsonViews.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -2,6 +2,7 @@
 /**
  * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
  * Copyright (c) 2010 Alcatel-Lucent
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is a part of Codendi.
  *
@@ -42,7 +43,7 @@
 
 		parent::header();
 //		echo $this->_getHelp();
-		echo '<h1>'.$this->_getTitle().'</h1>';
+//		echo '<h1>'.$this->_getTitle().'</h1>';
 	}
 	function _getTitle() {
 //		return _("Continuous Integration");

Modified: trunk/src/plugins/svncommitemail/common/SVNCommitEmailPlugin.class.php
===================================================================
--- trunk/src/plugins/svncommitemail/common/SVNCommitEmailPlugin.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/plugins/svncommitemail/common/SVNCommitEmailPlugin.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -27,41 +27,14 @@
 		$this->Plugin() ;
 		$this->name = "svncommitemail" ;
 		$this->text = "Source Code and Mailing List Integration" ;
-		$this->hooks[] = "groupisactivecheckbox" ; // The "use ..." checkbox in editgroupinfo
-		$this->hooks[] = "groupisactivecheckboxpost" ; //
+		$this->hooks[] = "groupisactivecheckbox" ;
+		$this->hooks[] = "groupisactivecheckboxpost" ;
 	}
 
-	function CallHook ($hookname, &$params) {
-		global $use_svncommitemailplugin,$G_SESSION,$HTML;
-		$group_id=$params['group'];
-		if ($hookname == "groupisactivecheckbox") {
-			//Check if the group is active
-			// this code creates the checkbox in the project edit public info page to activate/deactivate the plugin
-			$group = group_get_object($group_id);
-			if ($group->usesPlugin('scmsvn')) {
-				echo "<tr>";
-				echo "<td>";
-				echo ' <input type="checkbox" name="use_svncommitemailplugin" value="1" ';
-				// checked or unchecked?
-				if ( $group->usesPlugin ( $this->name ) ) {
-					echo 'checked="checked"';
-				}
-				echo " /><br/>";
-				echo "</td>";
-				echo "<td>";
-				echo "<strong>Use ".$this->text." Plugin</strong>";
-				echo "</td>";
-				echo "</tr>";
-			}
-		} elseif ($hookname == "groupisactivecheckboxpost") {
-			// this code actually activates/deactivates the plugin after the form was submitted in the project edit public info page
-			$group = &group_get_object($group_id);
-			$use_svncommitemailplugin = getStringFromRequest('use_svncommitemailplugin');
-			if ( $use_svncommitemailplugin == 1 ) {
-				$group->setPluginUse ( $this->name );
-			} else {
-				$group->setPluginUse ( $this->name, false );
-			}
+	function groupisactivecheckbox (&$params) {
+		$group = group_get_object($params['group']);
+		if ($group->usesPlugin('scmsvn') || $group->usesPlugin('websvn')) {
+			parent::groupisactivecheckbox($params);
 		} 
 	}
 }

Modified: trunk/src/plugins/wiki/common/WikiPlugin.class.php
===================================================================
--- trunk/src/plugins/wiki/common/WikiPlugin.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/plugins/wiki/common/WikiPlugin.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -89,7 +89,7 @@
 						SEARCH__TYPE_IS_WIKI,
 						new WikiSearchEngine(SEARCH__TYPE_IS_WIKI,
 								'WikiHtmlSearchRenderer', 
-						_("This projects's wiki"), $group_id)
+						_("This project's wiki"), $group_id)
 					);
 				}
 			}
@@ -184,7 +184,7 @@
 						$arr['realname'] = $data['author'];
 						$arr['icon']=html_image("ic/wiki20g.png","20","20",array("alt"=>"Wiki"));
 						$arr['title'] = 'Wiki Page '.$arr['pagename'];
-						$arr['link'] = '/wiki/g/'.$group_name.'/'.urlencode($arr['pagename']);
+						$arr['link'] = '/wiki/g/'.$group_name.'/'.rawurlencode($arr['pagename']);
 						$arr['description']= $arr['title'];
 						$params['results'][] = $arr;
 					}

Modified: trunk/src/www/account/register.php
===================================================================
--- trunk/src/www/account/register.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/account/register.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2010 (c) FusionForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -243,7 +244,7 @@
 <input type="submit" name="submit" value="<?php echo _('Register'); ?>" />
 </p>
 </form>
-<p><a href="pending-resend.php"><?php echo _('[Resend confirmation email to a pending account]'); ?></a></p>
+<p><a href="pending-resend.php"><?php echo _('Resend confirmation email to a pending account'); ?></a></p>
 
 <?php site_footer(array());
 

Modified: trunk/src/www/admin/admin_table.php
===================================================================
--- trunk/src/www/admin/admin_table.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/admin/admin_table.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -253,10 +253,6 @@
 		echo db_error();
 	}
 
-
-
-
-
 	$field_list = getStringFromRequest('__fields__');
 	$fields = explode(",", $field_list);
 	$values = array(); $v = array ();

Modified: trunk/src/www/admin/pluginman.php
===================================================================
--- trunk/src/www/admin/pluginman.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/admin/pluginman.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -5,6 +5,7 @@
  * Copyright 2005 GForge, LLC
  * Copyright 2010 FusionForge Team
  * Copyright 2011, Franck Villaume - Capgemini
+ * Copyright 2011, Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  * This file is part of FusionForge.
@@ -192,10 +193,15 @@
 		if ($res) {
 			if (db_numrows($res)>0) {
 				$users = " ";
-				for($i=0;$i<db_numrows($res);$i++) {
+				$nb_users = db_numrows($res);
+				for($i=0;$i<$nb_users;$i++) {
 					$users .= db_result($res,$i,0) . " | ";
 				}
 				$users = substr($users,0,strlen($users) - 3); //remove the last |
+				// If there are too many users, replace the list with number of users
+				if ($nb_users > 100) {
+					$users = util_make_link("/admin/userlist.php?usingplugin=$filename", '<b>'.sprintf(_("%d users"), $nb_users).'</b>');
+				}
 			} else {
 				$users = _('None');
 			}
@@ -206,10 +212,15 @@
 		if ($res) {
 			if (db_numrows($res)>0) {
 				$groups = " ";
-				for($i=0;$i<db_numrows($res);$i++) {
+				$nb_groups = db_numrows($res);
+				for($i=0;$i<$nb_groups;$i++) {
 					$groups .= db_result($res,$i,0) . " | ";
 				}
 				$groups = substr($groups,0,strlen($groups) - 3); //remove the last |
+				// If there are too many projects, replace the list with number of projects
+				if ($nb_groups > 100) {
+					$groups = util_make_link("/admin/grouplist.php?usingplugin=$filename", '<b>'.sprintf(_("%d projects"), $nb_groups).'</b>');
+				}
 			} else {
 				$groups = _('None');
 			}

Modified: trunk/src/www/export/rss_project.php
===================================================================
--- trunk/src/www/export/rss_project.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/export/rss_project.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -2,6 +2,7 @@
 /*
  * Copyright 1999-2000 (c) The SourceForge Crew
  * Copyright (C) 2009-2010 Alain Peyrat, Alcatel-Lucent
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  *
  * This file is part of FusionForge.
  *
@@ -76,9 +77,7 @@
 
 echo '<h2>' . _('RSS Exports') . '</h2>';
 echo '<p>';
-printf(_('%1$s data is exported in RSS 2.0 format. Many of
-the export URLs can also accept form/get data to customize the output. All
-data generated by these pages is realtime.'), forge_get_config ('forge_name'));
+printf(_('%1$s data is exported in RSS 2.0 format. Many of the export URLs can also accept form/get data to customize the output. All data generated by these pages is realtime.'), forge_get_config ('forge_name'));
 
 echo _('To get Project News or New Project Releases of a specific project use the Links below.'); 
 

Modified: trunk/src/www/forum/attachment.php
===================================================================
--- trunk/src/www/forum/attachment.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/forum/attachment.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -1,14 +1,12 @@
 <?php
-
 /**
  * FusionForge Forum Attachments download Page
  *
  * Portions Copyright 1999-2001 (c) VA Linux Systems
  * The rest Copyright 2002-2004 (c) GForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
- * @version   
- *
  * This file is part of FusionForge.
  *
  * FusionForge is free software; you can redistribute it and/or modify
@@ -187,19 +185,15 @@
 	$res = db_query_params ('SELECT * FROM forum_attachment WHERE attachmentid=$1',
 			array ($attachid));
 }
-if ( (!$res) ) {
+
+if (!$res || !db_numrows($res) ) {
 	exit_error("Attachment Download error: ".db_error(),'forums');
 }
 $extension = substr(strrchr(strtolower(db_result($res,0,'filename')), '.'), 1);
 
-if (!$extension) {
-	goodbye(_('The Attachment does not exist'));
-}
-
 $last = gmdate('D, d M Y H:i:s', db_result($res,0,'dateline'));
-header('X-Powered-By:');
 header('Last-Modified: ' . $last . ' GMT');
-header('ETag: "' . db_result($res,0,'attachmentid') . '"');
+header('ETag: "' . db_result($res,0,'attachmentid').db_result($res,0,'filehash') . '"');
 
 if ($extension != 'txt') {
 	header("Content-disposition: inline; filename=\"" . db_result($res,0,'filename') . "\"");

Modified: trunk/src/www/forum/myforums.php
===================================================================
--- trunk/src/www/forum/myforums.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/forum/myforums.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -7,6 +7,7 @@
  * The rest Copyright 2002-2004 (c) GForge Team
  * Copyright 2005 (c) - Daniel Perez
  * Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  * This file is part of FusionForge.
@@ -152,8 +153,8 @@
 		$date = $f->getMostRecentDate()? date(_('Y-m-d H:i'),$f->getMostRecentDate()) : '';
 		echo '<tr '. $HTML->boxGetAltRowStyle($j++) . '>
 			<td>' . $this_forum_group->getPublicName() . '</td>
-			<td><a href="forum.php?forum_id='. $f->getID() .'">'.
-			html_image("ic/forum20w.png","20","20") .
+			<td><a href="forum.php?forum_id='. $f->getID() .'&group_id='.$this_forum_group->getID().'">'.
+			html_image('ic/forum20w.png') .
 			' ' .
 			$f->getName() .'</a></td>
 			<td style="text-align:center">'.$f->getThreadCount().'</td>

Modified: trunk/src/www/frs/admin/index.php
===================================================================
--- trunk/src/www/frs/admin/index.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/frs/admin/index.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -6,6 +6,7 @@
  * Copyright 1999-2001 (c) VA Linux Systems
  * Copyright 2002-2004 (c) GForge Team
  * Copyright 2010 (c) Franck Villaume - Capgemini
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org/
  *
  * This file is part of FusionForge.
@@ -55,7 +56,6 @@
 	$func = getStringFromRequest('func');
 	$package_id = getIntFromRequest('package_id');
 	$package_name = trim(getStringFromRequest('package_name'));
-	$status_id = getIntFromRequest('status_id');
 	$is_public = getStringFromRequest('is_public');
 
 	/*
@@ -101,6 +101,7 @@
 		} elseif ($frsp->isError()) {
 			exit_error($frsp->getErrorMessage(),'frs');
 		}
+		$status_id = $frsp->getStatus();
 		if (!$frsp->update($package_name,$status_id)) {
 			exit_error($frsp->getErrorMessage(),'frs');
 		} else {

Modified: trunk/src/www/include/features_boxes.php
===================================================================
--- trunk/src/www/include/features_boxes.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/include/features_boxes.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -2,6 +2,7 @@
 /**
  *
  * Copyright 1999-2001 (c) VA Linux Systems
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -29,7 +30,7 @@
 require_once $gfcommon.'include/Stats.class.php';
 
 function show_features_boxes() {
-	GLOBAL $HTML;
+	global $HTML;
 	
 	plugin_hook ("features_boxes_top", array());
 	$return = '<h2 class="skip">' . _('Features Boxes') . '</h2>';

Modified: trunk/src/www/include/tool_reports.php
===================================================================
--- trunk/src/www/include/tool_reports.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/include/tool_reports.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -3,7 +3,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems 
  * Copyright 2010, FusionForge Team
- * Copyright (C) 2010 Alain Peyrat - Alcatel-Lucent
+ * Copyright (C) 2010-2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -49,7 +49,7 @@
 			echo "$titles[$i]=>$opened[$i]/$all[$i]<br />";
 		}
 */
-		$scale=graph_calculate_scale(array($opened,$all),400);
+		$scale=graph_calculate_scale(array($open,$all),400);
 		$props["scale"]=$scale;
 		$props["cellspacing"]=5;
 		$props = hv_graph_defaults($props);

Modified: trunk/src/www/include/user_home.php
===================================================================
--- trunk/src/www/include/user_home.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/include/user_home.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -4,6 +4,7 @@
  *
  * Copyright 1999-2001 (c) VA Linux Systems 
  * Copyright 2010, FusionForge Team
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -44,7 +45,7 @@
 <table class="my-layout-table" id="user-profile-personal-info">
 <tr> 
 	<td>
-		<?php echo _('User Id') ?>
+		<?php echo _('User Id:') ?>
 	</td>
 	<td>
 		<strong>
@@ -66,14 +67,14 @@
 </tr>
 
 <tr>
-	<td><?php echo _('Login name') ?></td>
+	<td><?php echo _('Login name:') ?></td>
 	<td><strong><span property="sioc:name"><?php 
 		print $user->getUnixName(); 
 		?></span></strong></td>
 </tr>
 
 <tr>
-	<td><?php echo _('Real name') ?> </td>
+	<td><?php echo _('Real Name:') ?> </td>
 	<td>
 		<div rev="foaf:account" xmlns:foaf="http://xmlns.com/foaf/0.1/">
 			<div about="#me" typeof="foaf:Person">
@@ -88,7 +89,7 @@
 
 <?php if(!isset($GLOBALS['sys_show_contact_info']) || $GLOBALS['sys_show_contact_info']) { ?>
 <tr>
-	<td><?php echo _('Your Email Address') ?>: </td>
+	<td><?php echo _('Email Address:') ?>: </td>
 	<td>
 	<strong><?php 
 		$user_mail=$user->getEmail();
@@ -138,7 +139,7 @@
 
 <tr>
 	<td>
-	<?php echo _('Site Member Since') ?>
+	<?php echo _('Site Member Since:') ?>
 	</td>
 	<td><strong><?php print date(_('Y-m-d H:i'), $user->getAddDate()); ?></strong>
     </td>
@@ -166,9 +167,7 @@
 		echo $HTML->boxMiddle(_('Diary and Notes'), _('Diary and Notes'));
 	 
 		/*
-
 			Get their diary information
-
 		*/
 
 		$res = db_query_params ('SELECT count(*) from user_diary WHERE user_id=$1 AND is_public=1',
@@ -253,7 +252,14 @@
 $me = session_get_user(); 
 if (forge_get_config('use_ratings')) {
 if ($user->usesRatings() && (!$me || $me->usesRatings())) { 
-	printf(_('<p>If you are familiar with this user, please take a moment to rate him/her on the following criteria. Keep in mind, that your rating will be visible to the user and others.</p><p>The %1$s Peer Rating system is based on concepts from <a href="http://www.advogato.com/">Advogato.</a> The system has been re-implemented and expanded in a few ways.</p>'), forge_get_config ('forge_name'));
+
+print "<p>";
+print _('If you are familiar with this user, please take a moment to rate him/her on the following criteria. Keep in mind, that your rating will be visible to the user and others.');
+print "</p>";
+
+print "<p>";
+printf(_('The %s Peer Rating system is based on concepts from <a href="http://www.advogato.com/">Advogato.</a> The system has been re-implemented and expanded in a few ways.'), forge_get_config ('forge_name'));
+print "</p>";
 ?>
 
 	<div class="align-center">

Modified: trunk/src/www/pm/include/ProjectGroupHTML.class.php
===================================================================
--- trunk/src/www/pm/include/ProjectGroupHTML.class.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/pm/include/ProjectGroupHTML.class.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -94,6 +94,8 @@
 		$labels[] = _('Administration');
 		$links[]  = '/pm/admin/?group_id='.$group_id.'&group_project_id='.$group_project_id.'&update_pg=1';
 	} else if (forge_check_perm ('pm_admin', $group_id)) {
+		$labels[] = _('Reporting');
+		$links[]  = '/pm/reporting/?group_id='.$group_id;
 		$labels[] = _('Administration');
 		$links[]  = '/pm/admin/?group_id='.$group_id;
 	}

Modified: trunk/src/www/project/admin/roledelete.php
===================================================================
--- trunk/src/www/project/admin/roledelete.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/project/admin/roledelete.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -75,7 +75,7 @@
 
 <form action="<?php echo getStringFromServer('PHP_SELF') ?>?group_id=<?php echo $group_id ?>&role_id=<?php echo $role_id ?>" method="post">
 <p>
-<input name="sure" value="1" type="checkbox" /><?php echo _("I'm Sure.") ?><br />
+<input name="sure" value="1" type="checkbox" /><?php echo _("I'm Sure") ?><br />
 </p>
 
 <p>

Modified: trunk/src/www/reporting/timeadd.php
===================================================================
--- trunk/src/www/reporting/timeadd.php	2011-03-14 15:46:29 UTC (rev 12737)
+++ trunk/src/www/reporting/timeadd.php	2011-03-14 16:04:03 UTC (rev 12738)
@@ -3,6 +3,7 @@
  * Reporting System
  *
  * Copyright 2004 (c) GForge LLC - Tim Perdue
+ * Copyright (C) 2011 Alain Peyrat - Alcatel-Lucent
  * http://fusionforge.org
  *
  * This file is part of FusionForge.
@@ -217,7 +218,7 @@
 	 * Do not get the reason of the report_header() in here. */
 
 	?>
-<h3><?php echo _('Choose A Week to Record Or Edit Your Time.'); ?></h3>
+<h2><?php echo _('Choose A Week to Record Or Edit Your Time.'); ?></h2>
 <p><?php echo _('After you choose a week, you will be prompted to choose a Project/Subproject in the Task Manager.'); ?>
 </p>
 <form action="<?php echo getStringFromServer('PHP_SELF'); ?>"




More information about the Fusionforge-commits mailing list