This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.0 has been updated
via 9e8730c987fe3c5f81c63dcdd84191c1636754c5 (commit)
via 7773f81623e8ce750d573ac6b1c1bb58c5f5cbf3 (commit)
via ecbd8dce718834c37c5f8fc0b137eac0f2dff5a1 (commit)
from d3f54459d23d922d1859caab60298bf74593c0bf (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9e8730c987fe3c5f81c63dcdd84191c1636754c5
commit 9e8730c987fe3c5f81c63dcdd84191c1636754c5
Author: Sylvain Beucler <[email protected]>
Date: Thu Jul 2 15:31:38 2015 +0200
Prepare 6.0.2
diff --git a/src/VERSION b/src/VERSION
index 5fe6072..9b9a244 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-6.0.1
+6.0.2
diff --git a/src/debian/changelog b/src/debian/changelog
index 059e0e3..8674bb6 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,4 +1,4 @@
-fusionforge (6.0.1-2) UNRELEASED; urgency=medium
+fusionforge (6.0.2-1) UNRELEASED; urgency=medium
* New upstream snapshot following the stable branch (closes: #492881,
#211085)
* Silent lintian command-with-path-in-maintainer-script
diff --git a/src/locale/fusionforge.pot b/src/locale/fusionforge.pot
index 175ac6e..ccc7f2b 100644
--- a/src/locale/fusionforge.pot
+++ b/src/locale/fusionforge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-23 15:40+0200\n"
+"POT-Creation-Date: 2015-07-02 15:30+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -220,10 +220,10 @@ msgstr ""
#: common/frs/FRSPackage.class.php:176 common/frs/FRSPackage.class.php:186
#: common/frs/FRSPackage.class.php:427 common/frs/FRSPackage.class.php:438
#: common/frs/FRSPackage.class.php:445 common/frs/FRSPackage.class.php:455
-#: common/frs/FRSPackage.class.php:460 common/frs/FRSPackage.class.php:519
-#: common/frs/FRSPackage.class.php:588 common/frs/FRSPackage.class.php:595
-#: common/frs/FRSPackage.class.php:600 common/frs/FRSPackage.class.php:632
-#: common/frs/FRSPackage.class.php:633
+#: common/frs/FRSPackage.class.php:460 common/frs/FRSPackage.class.php:525
+#: common/frs/FRSPackage.class.php:594 common/frs/FRSPackage.class.php:601
+#: common/frs/FRSPackage.class.php:606 common/frs/FRSPackage.class.php:638
+#: common/frs/FRSPackage.class.php:639
#: common/frs/FRSPackageFactory.class.php:55
#: common/frs/FRSRelease.class.php:378 common/frs/FRSRelease.class.php:390
#: common/frs/FRSRelease.class.php:435 common/frs/FRSRelease.class.php:454
@@ -435,7 +435,7 @@ msgstr ""
#: plugins/taskboard/www/admin/ajax.php:38
#: plugins/taskboard/www/admin/index.php:33
#: plugins/taskboard/www/admin/index.php:66 plugins/taskboard/www/ajax.php:32
-#: plugins/taskboard/www/index.php:134 plugins/taskboard/www/index.php:139
+#: plugins/taskboard/www/index.php:133 plugins/taskboard/www/index.php:138
#: plugins/taskboard/www/releases/index.php:32
#: plugins/taskboard/www/releases/index.php:64
#: plugins/webanalytics/view/admin/updateLinkValue.php:53
@@ -563,13 +563,13 @@ msgid "Updated document"
msgstr ""
#: common/docman/Document.class.php:887 common/docman/Document.class.php:925
-#: common/docman/views/listfile.php:291 common/frs/FRSPackage.class.php:629
+#: common/docman/views/listfile.php:291 common/frs/FRSPackage.class.php:635
msgid "by"
msgstr ""
#: common/docman/Document.class.php:890
#: common/docman/DocumentGroup.class.php:759
-#: common/forum/ForumHTML.class.php:73 common/frs/FRSPackage.class.php:632
+#: common/forum/ForumHTML.class.php:73 common/frs/FRSPackage.class.php:638
#: common/tracker/actions/browse.php:388
#: plugins/contribtracker/www/index.php:35
#: plugins/contribtracker/www/index.php:167
@@ -706,8 +706,8 @@ msgstr ""
#: www/admin/passedit.php:56 www/admin/passedit.php:64
#: www/admin/passedit.php:72 www/export/rss20_docman.php:151
#: www/forum/admin/pendingmsgdetail.php:51
-#: www/forum/admin/pendingmsgdetail.php:53 www/mail/admin/index.php:154
-#: www/mail/admin/index.php:260 www/project/admin/roledelete.php:64
+#: www/forum/admin/pendingmsgdetail.php:53 www/mail/admin/index.php:150
+#: www/mail/admin/index.php:256 www/project/admin/roledelete.php:64
#: www/project/admin/roledelete.php:71 www/project/admin/vhost.php:43
#: www/project/admin/vhost.php:45 www/scm/admin/index.php:193
#: www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php:103
@@ -1135,8 +1135,8 @@ msgstr ""
#: plugins/scmhook/common/scmhookPlugin.class.php:444
#: plugins/taskboard/common/views/admin/trackers.php:102
#: www/forum/admin/index.php:116 www/forum/admin/index.php:158
-#: www/forum/index.php:73 www/mail/admin/index.php:203
-#: www/mail/admin/index.php:236 www/mail/index.php:80
+#: www/forum/index.php:73 www/mail/admin/index.php:199
+#: www/mail/admin/index.php:232 www/mail/index.php:80
#: www/people/editjob.php:52 www/people/editjob.php:74
#: www/pm/admin/index.php:286 www/pm/admin/index.php:329 www/pm/csv.php:101
#: www/pm/index.php:99 www/project/admin/editimages.php:226
@@ -1378,7 +1378,7 @@ msgstr ""
#: common/docman/views/editfile.php:77 common/docman/views/listfile.php:352
#: common/docman/views/reporting.php:88 common/docman/views/reporting.php:90
#: common/forum/ForumHTML.class.php:85 common/forum/ForumHTML.class.php:519
-#: common/frs/FRSPackage.class.php:635 common/frs/FRSRelease.class.php:295
+#: common/frs/FRSPackage.class.php:641 common/frs/FRSRelease.class.php:295
#: common/frs/FRSRelease.class.php:298 common/frs/FRSRelease.class.php:302
#: common/frs/views/admin.php:66 common/frs/views/admin.php:68
#: common/frs/views/admin.php:75 common/frs/views/admin.php:141
@@ -1603,8 +1603,8 @@ msgstr ""
#: www/admin/useredit.php:160 www/admin/useredit.php:214
#: www/admin/vhost.php:143 www/forum/admin/index.php:112
#: www/forum/admin/index.php:116 www/forum/admin/index.php:150
-#: www/mail/admin/index.php:188 www/mail/admin/index.php:203
-#: www/mail/admin/index.php:236 www/my/bookmark_add.php:45
+#: www/mail/admin/index.php:184 www/mail/admin/index.php:199
+#: www/mail/admin/index.php:232 www/my/bookmark_add.php:45
#: www/my/bookmark_add.php:49 www/my/bookmark_edit.php:58
#: www/my/bookmark_edit.php:62 www/my/diary.php:186 www/my/diary.php:191
#: www/news/admin/index.php:128 www/people/admin/index.php:105
@@ -2157,7 +2157,7 @@ msgstr ""
#: plugins/taskboard/www/admin/index.php:66
#: plugins/taskboard/www/admin/index.php:67
#: plugins/taskboard/www/releases/index.php:64
-#: plugins/taskboard/www/releases/index.php:65 www/mail/admin/index.php:299
+#: plugins/taskboard/www/releases/index.php:65 www/mail/admin/index.php:295
#: www/mail/mail_utils.php:48 www/news/news_utils.php:48
#: www/pm/include/ProjectGroupHTML.class.php:96
#: www/pm/include/ProjectGroupHTML.class.php:103
@@ -2268,7 +2268,7 @@ msgstr ""
#: common/docman/views/reporting.php:144 common/frs/views/reporting.php:150
#: common/reporting/report_utils.php:148 common/reporting/report_utils.php:191
#: common/reporting/report_utils.php:675 common/reporting/report_utils.php:676
-#: common/reporting/report_utils.php:947 www/stats/site_stats_utils.php:230
+#: common/reporting/report_utils.php:948 www/stats/site_stats_utils.php:230
#: www/stats/site_stats_utils.php:360 www/stats/site_stats_utils.php:414
#: www/stats/site_stats_utils.php:470 www/top/toplist.php:49
msgid "Downloads"
@@ -2577,7 +2577,7 @@ msgstr ""
msgid "Update failed"
msgstr ""
-#: common/forum/Forum.class.php:606 common/frs/FRSPackage.class.php:509
+#: common/forum/Forum.class.php:606 common/frs/FRSPackage.class.php:515
#: common/frs/FRSRelease.class.php:367 common/include/Group.class.php:1643
#: common/mail/MailingList.class.php:411 common/pm/ProjectGroup.class.php:384
#: common/pm/ProjectTask.class.php:517 common/tracker/Artifact.class.php:514
@@ -2682,7 +2682,7 @@ msgstr ""
#: plugins/taskboard/common/views/releases/delete_release.php:33
#: plugins/taskboard/common/views/releases/delete_release.php:47
#: plugins/taskboard/common/views/releases/edit_release.php:80
-#: plugins/taskboard/www/index.php:139
+#: plugins/taskboard/www/index.php:138
msgid "Release"
msgstr ""
@@ -2708,7 +2708,7 @@ msgstr ""
#: www/admin/groupedit.php:223 www/admin/trove/trove_cat_edit.php:150
#: www/admin/useredit.php:239 www/admin/useredit.php:313
#: www/admin/vhost.php:186 www/forum/admin/index.php:162
-#: www/mail/admin/index.php:239 www/mail/admin/index.php:292
+#: www/mail/admin/index.php:235 www/mail/admin/index.php:288
#: www/people/people_utils.php:181 www/people/people_utils.php:331
#: www/pm/admin/index.php:348 www/pm/calendar.php:289
#: www/project/admin/index.php:310 www/project/admin/tools.php:329
@@ -2796,7 +2796,7 @@ msgstr ""
#: plugins/mantisbt/view/editIssue.php:199
#: plugins/mantisbt/view/viewIssue.php:110
#: plugins/mantisbt/view/viewIssues.php:158
-#: plugins/taskboard/www/index.php:212 www/export/rssAboTask.php:143
+#: plugins/taskboard/www/index.php:211 www/export/rssAboTask.php:143
#: www/my/dashboard.php:66 www/my/diary.php:186 www/pm/browse_task.php:163
#: www/project/report/index.php:137
#: www/search/include/renderers/ArtifactHtmlSearchRenderer.class.php:57
@@ -2923,7 +2923,7 @@ msgstr ""
#: plugins/oauthprovider/www/consumer_update_page.php:50
#: plugins/scmgit/common/GitPlugin.class.php:1181
#: plugins/scmhg/common/HgPlugin.class.php:794
-#: plugins/taskboard/www/index.php:302
+#: plugins/taskboard/www/index.php:301
#: plugins/webanalytics/view/admin/updateLinkValue.php:46
#: www/admin/admin_table.php:59 www/admin/admin_table.php:162
#: www/admin/admin_table.php:221 www/forum/admin/index.php:414
@@ -3147,53 +3147,53 @@ msgstr ""
msgid "Couldn't rename dir"
msgstr ""
-#: common/frs/FRSPackage.class.php:519
+#: common/frs/FRSPackage.class.php:525
msgid "Release Error"
msgstr ""
-#: common/frs/FRSPackage.class.php:529
+#: common/frs/FRSPackage.class.php:535
msgid "Package delete error: trying to delete root dir"
msgstr ""
-#: common/frs/FRSPackage.class.php:557
+#: common/frs/FRSPackage.class.php:563
msgid "No valid max release id"
msgstr ""
-#: common/frs/FRSPackage.class.php:588 db/20141105-frs-ziplatest.php:51
+#: common/frs/FRSPackage.class.php:594 db/20141105-frs-ziplatest.php:51
#: db/20141106-frs-zip-per-release.php:50
msgid "Cannot open the file archive"
msgstr ""
-#: common/frs/FRSPackage.class.php:595 db/20141105-frs-ziplatest.php:58
+#: common/frs/FRSPackage.class.php:601 db/20141105-frs-ziplatest.php:58
#: db/20141106-frs-zip-per-release.php:57
msgid "Cannot add file to the file archive"
msgstr ""
-#: common/frs/FRSPackage.class.php:600 db/20141105-frs-ziplatest.php:64
+#: common/frs/FRSPackage.class.php:606 db/20141105-frs-ziplatest.php:64
#: db/20141106-frs-zip-per-release.php:63
msgid "Cannot close the file archive"
msgstr ""
-#: common/frs/FRSPackage.class.php:627
+#: common/frs/FRSPackage.class.php:633
msgid "New Package"
msgstr ""
-#: common/frs/FRSPackage.class.php:629
+#: common/frs/FRSPackage.class.php:635
msgid "Updated Package"
msgstr ""
-#: common/frs/FRSPackage.class.php:633 common/frs/views/reporting.php:86
+#: common/frs/FRSPackage.class.php:639 common/frs/views/reporting.php:86
#: common/frs/views/reporting.php:169 common/include/rbac_texts.php:204
#: common/widget/Widget_ProjectLatestFileReleases.class.php:69
#: www/snippet/add_snippet_to_package.php:129
msgid "Package"
msgstr ""
-#: common/frs/FRSPackage.class.php:635
+#: common/frs/FRSPackage.class.php:641
msgid "For more info, visit"
msgstr ""
-#: common/frs/FRSPackage.class.php:640
+#: common/frs/FRSPackage.class.php:646
msgid "FRS"
msgstr ""
@@ -3311,7 +3311,7 @@ msgid "Missing package_id"
msgstr ""
#: common/frs/actions/addrelease.php:75 common/frs/actions/addrelease.php:91
-#: common/frs/actions/editrelease.php:75 common/frs/actions/editrelease.php:96
+#: common/frs/actions/editrelease.php:75 common/frs/actions/editrelease.php:91
msgid "Attempted File Upload Attack"
msgstr ""
@@ -3319,7 +3319,7 @@ msgstr ""
msgid "Release Notes Are not in Text"
msgstr ""
-#: common/frs/actions/addrelease.php:95 common/frs/actions/editrelease.php:100
+#: common/frs/actions/addrelease.php:95 common/frs/actions/editrelease.php:95
msgid "Change Log Is not in Text"
msgstr ""
@@ -3373,15 +3373,7 @@ msgstr ""
msgid "File Updated"
msgstr ""
-#: common/frs/actions/editrelease.php:89
-msgid "Release Notes Are Too Small"
-msgstr ""
-
#: common/frs/actions/editrelease.php:110
-msgid "Change Log Is Too Small"
-msgstr ""
-
-#: common/frs/actions/editrelease.php:120
msgid "Release edited successfully"
msgstr ""
@@ -3878,7 +3870,7 @@ msgstr ""
msgid "Create release"
msgstr ""
-#: common/frs/views/reporting.php:95 www/project/stats/index.php:117
+#: common/frs/views/reporting.php:95 www/project/stats/index.php:118
#: www/reporting/groupadded.php:53 www/reporting/groupcum.php:53
#: www/reporting/projectact.php:55 www/reporting/projecttime.php:54
#: www/reporting/siteact.php:54 www/reporting/sitetime.php:54
@@ -4717,7 +4709,7 @@ msgstr ""
#: common/include/Navigation.class.php:476
#: common/include/group_section_texts.php:31 common/include/rbac_texts.php:202
#: common/reporting/report_utils.php:144 common/reporting/report_utils.php:187
-#: common/reporting/report_utils.php:694 common/reporting/report_utils.php:946
+#: common/reporting/report_utils.php:694 common/reporting/report_utils.php:947
#: common/widget/Widget_ProjectPublicAreas.class.php:157
#: plugins/blocks/www/index.php:154 www/activity/index.php:336
#: www/activity/index.php:337 www/activity/index.php:341
@@ -4849,11 +4841,11 @@ msgstr ""
msgid "%s (in project %s)"
msgstr ""
-#: common/include/RBAC.php:1245
+#: common/include/RBAC.php:1247
msgid "Anonymous/not logged in"
msgstr ""
-#: common/include/RBAC.php:1293
+#: common/include/RBAC.php:1295
msgid "Any user logged in"
msgstr ""
@@ -5141,7 +5133,7 @@ msgstr ""
msgid "Group name cannot contain underscore for DNS reasons."
msgstr ""
-#: common/include/account.php:325
+#: common/include/account.php:326
#, php-format
msgid ""
"The following key has a wrong format: |%s|. Please, correct it by going "
@@ -5843,9 +5835,9 @@ msgstr ""
#: common/reporting/report_utils.php:55 common/reporting/report_utils.php:359
#: common/reporting/report_utils.php:416 common/reporting/report_utils.php:589
-#: common/reporting/report_utils.php:877 common/reporting/report_utils.php:979
-#: common/reporting/report_utils.php:1043
-#: common/reporting/report_utils.php:1146
+#: common/reporting/report_utils.php:878 common/reporting/report_utils.php:980
+#: common/reporting/report_utils.php:1044
+#: common/reporting/report_utils.php:1147
#: common/widget/Widget_ProjectLatestDocuments.class.php:104
#: common/widget/Widget_ProjectLatestFileReleases.class.php:84
#: plugins/cvstracker/common/cvstrackerPlugin.class.php:79
@@ -5895,7 +5887,7 @@ msgstr ""
msgid "Page Views"
msgstr ""
-#: common/reporting/report_utils.php:171 common/reporting/report_utils.php:940
+#: common/reporting/report_utils.php:171 common/reporting/report_utils.php:941
#: www/stats/site_stats_utils.php:233 www/stats/site_stats_utils.php:361
#: www/stats/site_stats_utils.php:415
msgid "Bugs"
@@ -5906,21 +5898,21 @@ msgstr ""
msgid "Support"
msgstr ""
-#: common/reporting/report_utils.php:173 common/reporting/report_utils.php:942
+#: common/reporting/report_utils.php:173 common/reporting/report_utils.php:943
#: www/stats/site_stats_utils.php:235 www/stats/site_stats_utils.php:363
#: www/stats/site_stats_utils.php:417
msgid "Patches"
msgstr ""
-#: common/reporting/report_utils.php:174 common/reporting/report_utils.php:943
+#: common/reporting/report_utils.php:174 common/reporting/report_utils.php:944
msgid "Feature Requests"
msgstr ""
-#: common/reporting/report_utils.php:175 common/reporting/report_utils.php:944
+#: common/reporting/report_utils.php:175 common/reporting/report_utils.php:945
msgid "Other Trackers"
msgstr ""
-#: common/reporting/report_utils.php:183 common/reporting/report_utils.php:945
+#: common/reporting/report_utils.php:183 common/reporting/report_utils.php:946
msgid "Forum Messages"
msgstr ""
@@ -5978,9 +5970,9 @@ msgid "Cumulative Projects"
msgstr ""
#: common/reporting/report_utils.php:458 common/reporting/report_utils.php:630
-#: common/reporting/report_utils.php:981
-#: common/reporting/report_utils.php:1045
-#: common/reporting/report_utils.php:1148
+#: common/reporting/report_utils.php:982
+#: common/reporting/report_utils.php:1046
+#: common/reporting/report_utils.php:1149
msgid "No data to display."
msgstr ""
@@ -6010,35 +6002,35 @@ msgstr ""
msgid "Tracker items closed"
msgstr ""
-#: common/reporting/report_utils.php:941
+#: common/reporting/report_utils.php:942
msgid "Support Requests"
msgstr ""
-#: common/reporting/report_utils.php:1008 www/reporting/projecttime.php:64
+#: common/reporting/report_utils.php:1009 www/reporting/projecttime.php:64
#: www/reporting/sitetime.php:64 www/reporting/usertime.php:79
msgid "By Task"
msgstr ""
-#: common/reporting/report_utils.php:1009 www/reporting/projecttime.php:65
+#: common/reporting/report_utils.php:1010 www/reporting/projecttime.php:65
#: www/reporting/sitetime.php:65 www/reporting/usertime.php:80
msgid "By Category"
msgstr ""
-#: common/reporting/report_utils.php:1010 www/reporting/projecttime.php:66
+#: common/reporting/report_utils.php:1011 www/reporting/projecttime.php:66
#: www/reporting/sitetime.php:66 www/reporting/usertime.php:81
msgid "By Subproject"
msgstr ""
-#: common/reporting/report_utils.php:1011 www/reporting/projecttime.php:67
+#: common/reporting/report_utils.php:1012 www/reporting/projecttime.php:67
#: www/reporting/sitetime.php:67
msgid "By User"
msgstr ""
-#: common/reporting/report_utils.php:1069
+#: common/reporting/report_utils.php:1070
msgid "Hours Recorded"
msgstr ""
-#: common/reporting/report_utils.php:1073
+#: common/reporting/report_utils.php:1074
msgid " Hours"
msgstr ""
@@ -6747,14 +6739,14 @@ msgstr ""
#: common/tracker/actions/browse.php:187 common/tracker/actions/browse.php:315
#: common/tracker/actions/browse.php:320 common/tracker/actions/query.php:337
-#: plugins/taskboard/www/index.php:96 www/pm/browse_task.php:111
+#: plugins/taskboard/www/index.php:95 www/pm/browse_task.php:111
#: www/pm/browse_task.php:122 www/pm/browse_task.php:198
#: www/pm/ganttpage.php:154 www/pm/ganttpage.php:156 www/pm/ganttpage.php:158
#: www/pm/ganttpage.php:160 www/reporting/usersummary.php:57
msgid "Any"
msgstr ""
-#: common/tracker/actions/browse.php:192 plugins/taskboard/www/index.php:101
+#: common/tracker/actions/browse.php:192 plugins/taskboard/www/index.php:100
#: www/pm/browse_task.php:113 www/pm/browse_task.php:391
#: www/pm/ganttpage.php:156
msgid "Unassigned"
@@ -6810,7 +6802,7 @@ msgstr ""
#: common/tracker/actions/browse.php:205 common/tracker/actions/browse.php:424
#: common/tracker/actions/query.php:200 common/tracker/actions/query.php:344
-#: plugins/taskboard/www/index.php:134 www/pm/browse_task.php:197
+#: plugins/taskboard/www/index.php:133 www/pm/browse_task.php:197
#: www/pm/ganttpage.php:183
msgid "Assignee"
msgstr ""
@@ -7236,7 +7228,7 @@ msgstr ""
msgid "Attached Files"
msgstr ""
-#: common/tracker/actions/mod.php:190 plugins/taskboard/www/index.php:213
+#: common/tracker/actions/mod.php:190 plugins/taskboard/www/index.php:212
#: www/include/html.php:405
msgid ""
"The summary text-box represents a short tracker item summary. Useful when "
@@ -7248,7 +7240,7 @@ msgstr ""
#: common/tracker/include/ArtifactHtml.class.php:50
#: common/tracker/include/build_submission_form.php:80
#: common/tracker/views/form-customizelist.php:45
-#: plugins/taskboard/www/index.php:217
+#: plugins/taskboard/www/index.php:216
msgid "Detailed description"
msgstr ""
@@ -7728,7 +7720,7 @@ msgid "Custom Fields Defined"
msgstr ""
#: common/tracker/views/form-addextrafield.php:46
-#: common/tracker/views/form-addextrafieldoption.php:49
+#: common/tracker/views/form-addextrafieldoption.php:52
msgid "Elements Defined"
msgstr ""
@@ -7832,14 +7824,14 @@ msgstr ""
msgid "Current / New positions"
msgstr ""
-#: common/tracker/views/form-addextrafieldoption.php:48
-#: common/tracker/views/form-adminroadmap.php:402
-#: common/tracker/views/form-customizelist.php:103
-msgid "Up/Down positions"
+#: common/tracker/views/form-addextrafieldoption.php:49
+msgid "Mapping"
msgstr ""
#: common/tracker/views/form-addextrafieldoption.php:51
-msgid "Mapping"
+#: common/tracker/views/form-adminroadmap.php:402
+#: common/tracker/views/form-customizelist.php:103
+msgid "Up/Down positions"
msgstr ""
#: common/tracker/views/form-addextrafieldoption.php:84
@@ -7936,7 +7928,7 @@ msgstr ""
#: plugins/projects-hierarchy/view/admin_project_link.php:78
#: www/admin/approve-pending.php:165 www/admin/groupedit.php:161
#: www/admin/responses_admin.php:50 www/forum/admin/index.php:223
-#: www/mail/admin/index.php:194 www/mail/admin/index.php:232
+#: www/mail/admin/index.php:190 www/mail/admin/index.php:228
#: www/people/editprofile.php:244 www/survey/include/SurveyHTML.class.php:201
#: www/survey/include/SurveyHTML.class.php:415
msgid "Yes"
@@ -10564,7 +10556,7 @@ msgstr ""
#: plugins/forumml/www/index.php:101 plugins/forumml/www/message.php:148
#: plugins/mailman/www/mailman_utils.php:51
-#: plugins/mailman/www/mailman_utils.php:66 www/mail/admin/index.php:274
+#: plugins/mailman/www/mailman_utils.php:66 www/mail/admin/index.php:270
#: www/mail/index.php:78
msgid "Mailing List"
msgstr ""
@@ -10959,7 +10951,7 @@ msgstr ""
#: plugins/projects-hierarchy/view/admin_project_link.php:66
#: plugins/projects-hierarchy/view/admin_project_link.php:78
#: www/admin/groupedit.php:160 www/forum/admin/index.php:224
-#: www/mail/admin/index.php:199 www/mail/admin/index.php:233
+#: www/mail/admin/index.php:195 www/mail/admin/index.php:229
#: www/people/editprofile.php:243 www/survey/include/SurveyHTML.class.php:202
#: www/survey/include/SurveyHTML.class.php:417
msgid "No"
@@ -11957,7 +11949,7 @@ msgstr ""
msgid "Deleted"
msgstr ""
-#: plugins/mailman/www/admin/deletelist.php:52 www/mail/admin/index.php:241
+#: plugins/mailman/www/admin/deletelist.php:52 www/mail/admin/index.php:237
msgid "Permanently Delete List"
msgstr ""
@@ -11966,7 +11958,7 @@ msgstr ""
#: plugins/mailman/www/admin/index.php:93
#: plugins/mailman/www/admin/index.php:167 www/mail/admin/index.php:64
#: www/mail/admin/index.php:91 www/mail/admin/index.php:115
-#: www/mail/admin/index.php:218
+#: www/mail/admin/index.php:214
msgid "Error getting the list"
msgstr ""
@@ -11998,21 +11990,21 @@ msgid ""
"be created."
msgstr ""
-#: plugins/mailman/www/admin/index.php:134 www/mail/admin/index.php:154
+#: plugins/mailman/www/admin/index.php:134 www/mail/admin/index.php:150
msgid "Unable to get the lists"
msgstr ""
-#: plugins/mailman/www/admin/index.php:147 www/mail/admin/index.php:188
+#: plugins/mailman/www/admin/index.php:147 www/mail/admin/index.php:184
msgid "Mailing List Name"
msgstr ""
#: plugins/mailman/www/admin/index.php:150
-#: plugins/mailman/www/admin/index.php:182 www/mail/admin/index.php:191
-#: www/mail/admin/index.php:231
+#: plugins/mailman/www/admin/index.php:182 www/mail/admin/index.php:187
+#: www/mail/admin/index.php:227
msgid "Is Public?"
msgstr ""
-#: plugins/mailman/www/admin/index.php:156 www/mail/admin/index.php:206
+#: plugins/mailman/www/admin/index.php:156 www/mail/admin/index.php:202
msgid "Add This List"
msgstr ""
@@ -12025,19 +12017,19 @@ msgid "Mailing List Administration"
msgstr ""
#: plugins/mailman/www/admin/index.php:211 plugins/mailman/www/index.php:47
-#: www/mail/admin/index.php:260
+#: www/mail/admin/index.php:256
#, php-format
msgid "Unable to get the list %s"
msgstr ""
-#: plugins/mailman/www/admin/index.php:216 www/mail/admin/index.php:265
+#: plugins/mailman/www/admin/index.php:216 www/mail/admin/index.php:261
#, php-format
msgid ""
"You can administrate lists from here. Please note that private lists can "
"still be viewed by members of your project, but are not listed on %s."
msgstr ""
-#: plugins/mailman/www/admin/index.php:219 www/mail/admin/index.php:268
+#: plugins/mailman/www/admin/index.php:219 www/mail/admin/index.php:264
msgid "Add Mailing List"
msgstr ""
@@ -12096,7 +12088,7 @@ msgid "Administrate"
msgstr ""
#: plugins/mailman/www/mailman_utils.php:106
-#: plugins/mailman/www/mailman_utils.php:166 www/mail/admin/index.php:297
+#: plugins/mailman/www/mailman_utils.php:166 www/mail/admin/index.php:293
#: www/mail/index.php:94
msgid "Not activated yet"
msgstr ""
@@ -15285,7 +15277,7 @@ msgid "Task is not found. Taskboard will be reloaded."
msgstr ""
#: plugins/taskboard/common/actions/ajax_load_taskboard.php:40
-#: plugins/taskboard/www/index.php:166
+#: plugins/taskboard/www/index.php:165
msgid "User stories"
msgstr ""
@@ -15356,7 +15348,7 @@ msgstr ""
#: plugins/taskboard/common/views/releases/add_release.php:28
#: plugins/taskboard/common/views/releases/edit_release.php:41
#: plugins/taskboard/common/views/releases/ind.php:26
-#: plugins/taskboard/www/admin/index.php:66 plugins/taskboard/www/index.php:51
+#: plugins/taskboard/www/admin/index.php:66 plugins/taskboard/www/index.php:46
#: plugins/taskboard/www/releases/index.php:64
msgid "Taskboard for "
msgstr ""
@@ -15369,7 +15361,7 @@ msgstr ""
#: plugins/taskboard/common/views/admin/columns.php:35
#: plugins/taskboard/common/views/admin/trackers.php:88
#: plugins/taskboard/common/views/admin/trackers.php:302
-#: plugins/taskboard/www/index.php:59
+#: plugins/taskboard/www/index.php:58
msgid "Choose at least one tracker for using with taskboard."
msgstr ""
@@ -15633,32 +15625,32 @@ msgstr ""
msgid "Cannot Process your request : No ID specified"
msgstr ""
-#: plugins/taskboard/www/index.php:65
+#: plugins/taskboard/www/index.php:64
msgid "Configure columns for the board first."
msgstr ""
-#: plugins/taskboard/www/index.php:71
+#: plugins/taskboard/www/index.php:70
#, php-format
msgid "Resolutions list is empty for \"%s\", column is not dropable"
msgstr ""
-#: plugins/taskboard/www/index.php:147
+#: plugins/taskboard/www/index.php:146
msgid "Save release snapshot"
msgstr ""
-#: plugins/taskboard/www/index.php:229
+#: plugins/taskboard/www/index.php:228
msgid "There are no tasks found."
msgstr ""
-#: plugins/taskboard/www/index.php:230
+#: plugins/taskboard/www/index.php:229
msgid "Progress by tasks"
msgstr ""
-#: plugins/taskboard/www/index.php:231
+#: plugins/taskboard/www/index.php:230
msgid "Progress by cost"
msgstr ""
-#: plugins/taskboard/www/index.php:266
+#: plugins/taskboard/www/index.php:265
msgid "Create task"
msgstr ""
@@ -19081,24 +19073,20 @@ msgstr ""
msgid "Password reset requested"
msgstr ""
-#: www/mail/admin/index.php:143
-msgid "It will take one hour for your list to be created."
-msgstr ""
-
-#: www/mail/admin/index.php:160
+#: www/mail/admin/index.php:156
msgid "Existing mailing lists"
msgstr ""
-#: www/mail/admin/index.php:224
+#: www/mail/admin/index.php:220
#, php-format
msgid "Update Mailing List %s"
msgstr ""
-#: www/mail/admin/index.php:254 www/project/admin/tools.php:348
+#: www/mail/admin/index.php:250 www/project/admin/tools.php:348
msgid "Mailing Lists Admin"
msgstr ""
-#: www/mail/admin/index.php:304
+#: www/mail/admin/index.php:300
msgid "Reset admin password"
msgstr ""
@@ -21458,7 +21446,7 @@ msgstr ""
msgid "Area"
msgstr ""
-#: www/project/stats/index.php:119 www/tracker/reporting/index.php:149
+#: www/project/stats/index.php:120 www/tracker/reporting/index.php:149
#: www/tracker/reporting/index.php:153
msgid "Error during graphic computation."
msgstr ""
@@ -22315,36 +22303,44 @@ msgstr ""
msgid "Delete Snippets"
msgstr ""
-#: www/snippet/delete.php:52
+#: www/snippet/delete.php:51 www/snippet/delete.php:127
+msgid "Error: package version not found."
+msgstr ""
+
+#: www/snippet/delete.php:56
msgid ""
"Error: Only the creator of a package version can delete snippets from it."
msgstr ""
-#: www/snippet/delete.php:64
+#: www/snippet/delete.php:67
msgid "Error: That snippet does not exist in this package."
msgstr ""
-#: www/snippet/delete.php:68
+#: www/snippet/delete.php:71
msgid "Item Removed From Package"
msgstr ""
-#: www/snippet/delete.php:84
+#: www/snippet/delete.php:87
msgid "Error: That snippet does not exist."
msgstr ""
-#: www/snippet/delete.php:103
+#: www/snippet/delete.php:92
+msgid "Error: Only the creator of a snippet can delete it."
+msgstr ""
+
+#: www/snippet/delete.php:111
msgid "Snippet Removed"
msgstr ""
-#: www/snippet/delete.php:121
+#: www/snippet/delete.php:132
msgid "Error: Only the creator of a package version can delete it."
msgstr ""
-#: www/snippet/delete.php:147
+#: www/snippet/delete.php:157
msgid "Package Removed"
msgstr ""
-#: www/snippet/delete.php:152
+#: www/snippet/delete.php:162
msgid "Error: mangled URL?"
msgstr ""
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7773f81623e8ce750d573ac6b1c1bb58c5f5cbf3
commit 7773f81623e8ce750d573ac6b1c1bb58c5f5cbf3
Author: Sylvain Beucler <[email protected]>
Date: Thu Jul 2 15:26:58 2015 +0200
Software Map: use "GNU/Linux" instead of "Linux" when refering to the OS
diff --git a/src/CHANGES b/src/CHANGES
index aa4bee0..f15dcaa 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -9,6 +9,7 @@ FusionForge 6.0.2:
* FRS: do not display hidden releases publicly (TrivialDev & Inria)
* FRS: revert Notes and ChangeLog as optional fields - also when editing
releases (Inria)
* Tracker: fix column title in add/update custom field elements (TrivialDev)
+* Software Map: use "GNU/Linux" instead of "Linux" when refering to the OS
(Inria)
* Snippets: allow forge administrator to delete snippets (Inria)
* Plugin Taskboard: fix logic on initialize error (TrivialDev)
* Plugin Taskboard: fix background column color setting (TrivialDev)
diff --git a/src/db/20150702-gnu-linux.sql b/src/db/20150702-gnu-linux.sql
new file mode 100644
index 0000000..881c159
--- /dev/null
+++ b/src/db/20150702-gnu-linux.sql
@@ -0,0 +1,9 @@
+UPDATE trove_cat SET fullname=regexp_replace(fullname, '^Linux', 'GNU/Linux')
WHERE trove_cat_id=201;
+UPDATE trove_cat SET description=regexp_replace(description, 'of Linux', 'of
GNU/Linux') WHERE trove_cat_id=201;
+UPDATE trove_cat SET fullpath=regexp_replace(fullpath, ':: Linux', '::
GNU/Linux') WHERE trove_cat_id=201;
+UPDATE trove_cat SET shortname=regexp_replace(shortname, '^linux',
'gnu-linux') WHERE trove_cat_id=201;
+
+UPDATE trove_cat SET fullname=replace(fullname, 'GNU Hurd', 'GNU/Hurd') WHERE
trove_cat_id=240;
+UPDATE trove_cat SET description=replace(description, 'GNU Hurd', 'GNU/Hurd')
WHERE trove_cat_id=240;
+UPDATE trove_cat SET fullpath=replace(fullpath, 'GNU Hurd', 'GNU/Hurd') WHERE
trove_cat_id=240;
+UPDATE trove_cat SET shortname=replace(shortname, 'gnuhurd', 'gnu-hurd') WHERE
trove_cat_id=240;
diff --git a/src/debian/changelog b/src/debian/changelog
index 4d87661..059e0e3 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,6 +1,6 @@
fusionforge (6.0.1-2) UNRELEASED; urgency=medium
- * New upstream snapshot following the stable branch (closes: #492881)
+ * New upstream snapshot following the stable branch (closes: #492881,
#211085)
* Silent lintian command-with-path-in-maintainer-script
* Remove logs on purge (closes: #789801)
* Fix upgrade conflict on locale files (closes: #789925)
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=ecbd8dce718834c37c5f8fc0b137eac0f2dff5a1
commit ecbd8dce718834c37c5f8fc0b137eac0f2dff5a1
Author: Sylvain Beucler <[email protected]>
Date: Thu Jul 2 14:48:47 2015 +0200
snippets: allow forge administrator to delete snippets
diff --git a/src/CHANGES b/src/CHANGES
index 967e3c3..aa4bee0 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -9,6 +9,7 @@ FusionForge 6.0.2:
* FRS: do not display hidden releases publicly (TrivialDev & Inria)
* FRS: revert Notes and ChangeLog as optional fields - also when editing
releases (Inria)
* Tracker: fix column title in add/update custom field elements (TrivialDev)
+* Snippets: allow forge administrator to delete snippets (Inria)
* Plugin Taskboard: fix logic on initialize error (TrivialDev)
* Plugin Taskboard: fix background column color setting (TrivialDev)
diff --git a/src/debian/changelog b/src/debian/changelog
index cada704..4d87661 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,6 +1,6 @@
fusionforge (6.0.1-2) UNRELEASED; urgency=medium
- * New upstream snapshot following the stable branch.
+ * New upstream snapshot following the stable branch (closes: #492881)
* Silent lintian command-with-path-in-maintainer-script
* Remove logs on purge (closes: #789801)
* Fix upgrade conflict on locale files (closes: #789925)
diff --git a/src/www/snippet/delete.php b/src/www/snippet/delete.php
index 791454d..96c0a35 100644
--- a/src/www/snippet/delete.php
+++ b/src/www/snippet/delete.php
@@ -45,15 +45,18 @@ if (session_loggedin()) {
//Check to see if they are the creator of this package_version
$result=db_query_params("SELECT * FROM snippet_package_version
".
- "WHERE submitted_by=$1 AND ".
- "snippet_package_version_id=$2",
- array(user_getid(),
$snippet_package_version_id));
+ "WHERE snippet_package_version_id=$1",
+ array($snippet_package_version_id));
if (!$result || db_numrows($result) < 1) {
+ echo $HTML->error_msg(_('Error: package version not
found.'));
+ snippet_footer();
+ exit;
+ } else if (!forge_check_global_perm('forge_admin')
+ and db_result($result,0,'submitted_by') !=
user_getid()) {
echo $HTML->error_msg(_('Error: Only the creator of a
package version can delete snippets from it.'));
snippet_footer();
exit;
} else {
-
//Remove the item from the package
$result=db_query_params ('DELETE FROM
snippet_package_item
WHERE snippet_version_id=$1
@@ -78,12 +81,17 @@ if (session_loggedin()) {
//find this snippet id and make sure the current user created it
$result=db_query_params("SELECT * FROM snippet_version ".
- "WHERE snippet_version_id=$1 AND
submitted_by=$2",
- array($snippet_version_id,
user_getid()));
+ "WHERE snippet_version_id=$1",
+ array($snippet_version_id));
if (!$result || db_numrows($result) < 1) {
echo $HTML->error_msg(_('Error: That snippet does not
exist.'));
snippet_footer();
exit;
+ } else if (!forge_check_global_perm('forge_admin')
+ and db_result($result,0,'submitted_by') !=
user_getid()) {
+ echo $HTML->error_msg(_('Error: Only the creator of a
snippet can delete it.'));
+ snippet_footer();
+ exit;
} else {
$snippet_id=db_result($result,0,'snippet_id');
@@ -113,11 +121,14 @@ if (session_loggedin()) {
//make sure they own this version of the package
$result=db_query_params("SELECT * FROM snippet_package_version
".
- "WHERE submitted_by=$1 AND ".
- "snippet_package_version_id=$2",
- array(user_getid(),
$snippet_package_version_id));
+ "WHERE snippet_package_version_id=$1",
+ array($snippet_package_version_id));
if (!$result || db_numrows($result) < 1) {
- //they don't own it or it's not found
+ echo $HTML->error_msg(_('Error: package version not
found.'));
+ snippet_footer();
+ exit;
+ } else if (!forge_check_global_perm('forge_admin')
+ and db_result($result,0,'submitted_by') !=
user_getid()) {
echo $HTML->error_msg(_('Error: Only the creator of a
package version can delete it.'));
snippet_footer();
exit;
@@ -126,9 +137,8 @@ if (session_loggedin()) {
//do the version delete
$result=db_query_params("DELETE FROM
snippet_package_version ".
- "WHERE submitted_by=$1 AND ".
- "snippet_package_version_id=$2",
- array(user_getid(),
$snippet_package_version_id));
+ "WHERE
snippet_package_version_id=$1",
+
array($snippet_package_version_id));
//delete snippet_package_items
$result=db_query_params("DELETE FROM
snippet_package_item ".
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 2 +
src/VERSION | 2 +-
src/db/20150702-gnu-linux.sql | 9 ++
src/debian/changelog | 4 +-
src/locale/fusionforge.pot | 232 +++++++++++++++++++++---------------------
src/www/snippet/delete.php | 36 ++++---
6 files changed, 151 insertions(+), 134 deletions(-)
create mode 100644 src/db/20150702-gnu-linux.sql
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
