Set a release date for 1.2 and the version.

Russian translation included by default (>= 80% translated).
Remaining translations updated / merged.

AUTHORS

@@ -17,18 +17,22 @@ Much appreciated contributors (in alphabetical order):
     Denis Kot <denis.kot@gmail.com>                 - Russian translation
     Dmitry Dulepov <dmitryd>
     Fernando Sayago Gil <mikados.mikados@gmail.com> - Spanish translation
+    Gert van Valkenhoef <gertvv>
     Jakub Viták <mainiak@gmail.com>                 - Czech translation
     Janez Troha <http://www.dz0ny.info>             - Slovenian translation
     Jean-Philippe Fleury <jpfleury>
     Jerry <lxb429@gmail.com>                        - Chinese translation
     Julien Issler <julien@issler.net>
+    Litew <litew9@gmail.com>                        - Russian translation
     Ludovic Bellière <xrogaan>
     Manuel Eidenberger <eidenberger@gmail.com>
     Matthew Dawson <mjd>
     Matías Halles <matias@halles.cl>
     Mehdi Kabab <http://pioupioum.fr/>
     Nicolas Lassalle <nicolas@beroot.org>           - Subversion support
+    Ozan <uobasar@gmail.com>                        - Turkish translation
     Patrick Georgi <patrick.georgi@coresystems.de>
+    Pedro Kiefer <pedro@kiefer.com.br>              - Brazilian Portuguese translation
     Raphaël Emourgeon <raphael>
     Samuel Suther <info@suther.de>                  - German translation
     Sindre R. Myren <sindrero@stud.ntnu.no>

Makefile

@@ -62,11 +62,11 @@ pot-update: pluf_path
 	fi
 	touch src/IDF/locale/idf.pot;
 	# Extract string
-	@cd src; php $(PLUF_PATH)/extracttemplates.php IDF/conf/idf.php IDF/gettexttemplates
+	@cd src; php "$(PLUF_PATH)/extracttemplates.php" IDF/conf/idf.php IDF/gettexttemplates
 	@cd src; for phpfile in `find . -iname "*.php"`; do \
 		printf "Parsing file : "$$phpfile"\n"; \
 		xgettext -o idf.pot -p ./IDF/locale/ --from-code=UTF-8 -j \
-			--keyword --keyword=__ --keyword=_n:1,2 -L PHP $$phpfile ; \
+			--keyword --keyword=__ --keyword=_n:1,2 -L PHP "$$phpfile" ; \
 		done
 	#	Remove tmp folder
 	rm -Rf src/IDF/gettexttemplates
@@ -76,7 +76,7 @@ pot-update: pluf_path
 po-update: pluf_path
 	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
 		printf "Updating file : "$$pofile"\n"; \
-		msgmerge -v -U $$pofile src/IDF/locale/idf.pot; \
+		msgmerge -v -U "$$pofile" src/IDF/locale/idf.pot; \
 		printf "\n"; \
 	done
 
@@ -144,7 +144,7 @@ po-stats:
 		--pretty=format:%h`.zip
 
 db-install:
-	@cd src && php $(PLUF_PATH)/migrate.php --conf=IDF/conf/idf.php -a -d -i
+	@cd src && php "$(PLUF_PATH)/migrate.php" --conf=IDF/conf/idf.php -a -d -i
 
 db-update:
-	@cd src && php $(PLUF_PATH)/migrate.php --conf=IDF/conf/idf.php -a -d
+	@cd src && php "$(PLUF_PATH)/migrate.php" --conf=IDF/conf/idf.php -a -d

NEWS.mdtext

@@ -1,55 +1,73 @@
-# InDefero 1.2 - xxx xxx xx xx:xx 2011 UTC
+# InDefero 1.2 - Sun Nov 6 23:04:00 UTC 2011
 
-ATTENTION: You need Pluf [324ae60b](http://projects.ceondo.com/p/pluf/source/commit/324ae60b)
+ATTENTION: You need Pluf [46b7f251](http://projects.ceondo.com/p/pluf/source/commit/46b7f251)
 or newer to properly run this version of Indefero!
 
 ## New Features
 
-- Indefero's issue tracker can now bi-directionally link issues with variable, configurable
-  terms, such as "is related to", "is blocked by" or "is duplicated by" (issue 638)
-- When you search for issues, the results can further be refined by issue state (open or closed)
-  and label (partially implements issue 548)
-- Mercurial source views now show parent revisions (if any) and detailed change information
+- Indefero's issue tracker can now bi-directionally link issues with variable,
+  configurable terms, such as "is related to", "is blocked by" or
+  "is duplicated by" (issue 638)
+- When you search for issues, the results can further be refined by issue state
+  (open or closed) and label (partially implements issue 548)
+- Source and diff views now make characters like line endings, tabs and other
+  "invisible" control characters visible on hover and cope with long lines much
+  better (issue 636)
+- Mercurial source views now show parent revisions (if any) and detailed change
+  information
 - Subversion source views now show detailed change information (issue 622)
-- File download URLs now contain the file name rather than the upload id; old links still work though (issues 559 and 686)
-- Display monotone file and directory attributes in the tree and file view
+- File download URLs now contain the file name rather than the upload id;
+  old links still work though (issues 559 and 686)
+- monotone file and directory attributes are displayed in the tree and file view
   (needs a monotone with an interface version of 13.1 or newer)
 - The context area is now kept in view when a page scrolls down several pages
-- Add a summary section to the issue tracker with statistics about open/close issues,
-  tags of open issue, and count of open tickets for each owner.
-- Improved home page with an customizable icon for each project.
-- The download section provide MD5 for each files.
-- Wiki page have now a css for printer output (issue 713)
+- A summary section has been added to the issue tracker with statistics about
+  open / closed  issues, unresolved issues grouped by tags and owners
+- The project list and title has gathered a customizable icon for each project
+- The download section now provides MD5 checksums for uploaded files
+- Wiki pages now come with a designated stylesheet for printer output (issue 713)
 
 ## Bugfixes
 
-- The SVN interface acts more robust if an underlying repository has been restructured (issues 364 and 721)
+- Git's cron job doesn't erase manually added keys anymore (issue 247)
+- The SVN interface acts more robust if an underlying repository has been
+  restructured (issues 364 and 721)
 - monotone zip archive entries now all carry the revision date as mtime (issue 645)
-- Timeline only displays filter options for items a user has actually access to (issue 655)
+- The timeline only now only displays filter options for items a user has
+  actually access to (issue 655)
 - The log, tags and branches parsers for Mercurial are more robust now (issue 663)
-- Fix SSH public key parsing issues and improve the check for existing, uploaded keys (issue 679)
+- Several SSH public key parsing issues have been fixed and the check for existing,
+  uploaded keys has been improved (issue 679)
 - Diff views now show empty context lines for git and hg again (issue 688)
-- Let the SVN command line client not store the login credentials we give him as arguments
+- The SVN command line client no longer accidential tries to store the login
+  credentials we give him as arguments for the user executing the SVN command
 - The usher section in the forge administration no longer displays a bogus
   server enty in case no monotone server is configured in the connected
   usher instance
-- Prevent a timeout from popping up when Usher is restarted (issue 695)
-- The SyncMonotone plugin now cleans up partial artifacts it created during the addition of
-  a new project or monotone key, in case an error popped up in the middle (issue 697)
+- A timeout that popped up when Usher is restarted has been fixed (issue 695)
+- The SyncMonotone plugin now cleans up partial artifacts it created during the
+  addition of a new project or monotone key, in case an error popped up in the
+  middle (issue 697)
 - Indefero now sends the MD5 checksum as HTTP header when downloading a file from the
-  download area. Additionally, a unneeded redirect has been removed. (issue 716)
-- Source links without a specific revision did not work due to a wrong regex (issue 730)
-- Better error detection and reporting in the SyncMonotone plugin
-  ATTENTION: This needs Pluf 46b7f251 or newer!
-- Fix the branch links users of the Subversion frontend get when they enter a wrong revision
-  and only display this list if there are any branches available for all SCMs
-- If git's author name is not encoded in an UTF-8 compatible encoding, skip the author lookup,
-  as we have no information what the author string is actually encoded in
-- Indefero no longer displays an empty parents paragraph in the commit view for root revisions of
-  a git repository
-- Indefero now only shows the tags of the closed and not the open issues in the closed issues list
+  download area; additionally, a unneeded redirect has been removed (issue 716)
+- Source links without a specific revision did not work due to a wrong regex
+  (issue 730)
 - Avatar URL generation use correctly the configuration (issue 732)
-- Git cron job doesn't erase anymore manually added keys (issue 247)
+- The SyncGit plugin no longer fails to remove a non-existing post-update hook
+  on repository creation (issue 752)
+- When uploading a project logo, an existing uploaded file with the same name
+  no longer leads to an error, but is simple overwritten (fixes issue 740)
+- The error detection and reporting in the SyncMonotone plugin has been improved
+- The branch links users of the Subversion frontend get when they enter a wrong
+  revision are fixed; this list is now also only displayed (for any SCM) if
+  there are actually branches available in the repository
+- If git's author name is not encoded in an UTF-8 compatible encoding, skip the
+  author lookup, as we have no information what the author string is actually
+  encoded in
+- Indefero no longer displays an empty parents paragraph in the commit view for
+  root revisions of a git repository
+- Indefero now only shows the tags of the closed and not the open issues in the
+  closed issues list
 
 ## Documentation
 
@@ -57,6 +75,11 @@ or newer to properly run this version of Indefero!
 
 ## Translations
 
+- The Russian translation has been enabled by default (thanks for all the great
+  work, Denis Kot and Litew!)
+- Brazilian Portuguese translation started (thanks to Pedro Kiefer!)
+- Turkish translation started (thanks to Ozan!)
+
 # InDefero 1.1.2 - Thu May 26 07:42:25 2011 UTC
 
 ## Bugfixes

src/IDF/Diff.php

@@ -182,17 +182,29 @@ class IDF_Diff
             list($added, $removed) = end($file['chunks_def']);
 
             $added = $added[0] + $added[1];
-            $leftwidth = 1;
+            $leftwidth = 0;
             if ($added > 0)
                 $leftwidth = ((ceil(log10($added)) + 1) * 8) + 12;
 
             $removed = $removed[0] + $removed[1];
-            $rightwidth = 1;
+            $rightwidth = 0;
             if ($removed > 0)
                 $rightwidth = ((ceil(log10($removed)) + 1) * 8) + 12;
 
+            // we need to correct the width of a single column a little
+            // to take less space and to hide the empty one
+            $class = '';
+            if ($leftwidth == 0) {
+                $class = 'left-hidden';
+                $rightwidth -= floor(log10($removed));
+            }
+            else if ($rightwidth == 0) {
+                $class = 'right-hidden';
+                $leftwidth -= floor(log10($added));
+            }
+
             $inner_linecounts =
-              '<table class="diff-linecounts">' ."\n".
+              '<table class="diff-linecounts '.$class.'">' ."\n".
                 '<colgroup><col width="'.$leftwidth.'" /><col width="'. $rightwidth.'" /></colgroup>' ."\n".
                 '<tr class="line">' .
                   implode('</tr>'."\n".'<tr class="line">', $offsets).

src/IDF/Form/ProjectConf.php

@@ -67,6 +67,7 @@ class IDF_Form_ProjectConf extends Pluf_Form
                                                          'move_function_params' =>
                                                          array('upload_path' => $upload_path,
                                                                'upload_path_create' => true,
+                                                               'upload_overwrite' => true,
                                                                'file_name' => $filename,
                                                                )
                                                          ));

src/IDF/Plugin/SyncGit/Serve.php

@@ -210,22 +210,23 @@ class IDF_Plugin_SyncGit_Serve
         // Indefero's one.
         $p = realpath(dirname(__FILE__).'/../../../../scripts/git-post-update');
         $p = Pluf::f('idf_plugin_syncgit_post_update', $p);
-        if (!@unlink($fullpath.'/hooks/post-update')) {
+        $post_update_hook = $fullpath.'/hooks/post-update';
+        if (file_exists($post_update_hook) && !@unlink($post_update_hook)) {
             Pluf_Log::warn(array('IDF_Plugin_Git_Serve::initRepository', 
                                  'post-update hook removal error.', 
-                                 $fullpath.'/hooks/post-update'));
+                                 $post_update_hook));
             return;
         }
         $out = array();
         $res = 0;
         exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', 
                      escapeshellarg($p), 
-                     escapeshellarg($fullpath.'/hooks/post-update')),
+                     escapeshellarg($post_update_hook)),
              $out, $res);
         if ($res != 0) {
             Pluf_Log::warn(array('IDF_Plugin_Git_Serve::initRepository', 
                                  'post-update hook creation error.', 
-                                 $fullpath.'/hooks/post-update'));
+                                 $post_update_hook));
             return;
         }
         Pluf_Log::debug(array('IDF_Plugin_Git_Serve::initRepository', 

src/IDF/Scm/Git.php

@@ -87,7 +87,7 @@ class IDF_Scm_Git extends IDF_Scm
                     $filename = trim(substr($line, 1));
                     $return->patches[] = $filename;
                 } else if ($action == 'R') {
-                    $matches = split ("\t", $line);
+                    $matches = preg_split("/\t/", $line);
                     $return->renames[$matches[1]] = $matches[2];
                 }
             }

src/IDF/Views/Issue.php

@@ -993,9 +993,8 @@ class IDF_Views_Issue
         $r = $project->getRelationsFromConfig();
         $auto['auto_relation_types'] = '';
         foreach ($r as $rt) {
-            $esc = Pluf_esc($rt);
             $auto['auto_relation_types'] .= sprintf('{ name: "%s", to: "%s" }, ',
-                                                    $esc, $esc);
+                                                    Pluf_esc(__($rt)), Pluf_esc($rt));
         }
         $auto['auto_relation_types'] = substr($auto['auto_relation_types'], 0, -2);
         return $auto;

src/IDF/conf/idf.php-dist

@@ -119,7 +119,7 @@ $cfg['time_zone'] = 'Europe/Berlin';
 # Configure which languages should be available in your forge.
 # If you want to enable an additional language, ensure that the
 # language file in question resides in 'src/IDF/locale'.
-$cfg['languages'] = array('en', 'fr', 'de', 'es_ES');
+$cfg['languages'] = array('en', 'fr', 'de', 'es_ES', 'ru');
 
 
 # ---------------------------------------------------------------------------- #

src/IDF/templates/idf/issues/base.html

@@ -3,10 +3,13 @@
 {block subtabs}
 <div id="sub-tabs">
   <a {if $inSummaryIssues}class="active" {/if}href="{url 'IDF_Views_Issue::summary', array($project.shortname)}">{trans 'Summary'}</a>
-| <a {if $inOpenIssues}class="active" {/if}href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'Open Issues'}</a>
-{if !$user.isAnonymous()} | <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a> | <a {if $inMyIssues}class="active" {/if}href="{url 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'submit')}">{trans 'My Issues'}</a>
-| <a {if $inWatchList}class="active" {/if}href="{url 'IDF_Views_Issue::watchList', array($project.shortname, 'open')}">{trans 'My watch list'}</a>{/if} |
-<form class="star" action="{url 'IDF_Views_Issue::search', array($project.shortname)}" method="get">
+| <a {if $inAllIssues}class="active" {/if}href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{trans 'All Issues'}</a>
+{if !$user.isAnonymous()}
+| <a {if $inMyIssues}class="active" {/if}href="{url 'IDF_Views_Issue::userIssues', array($project.shortname, $user.login, 'submit')}">{trans 'My Issues'}</a>
+| <a {if $inWatchList}class="active" {/if}href="{url 'IDF_Views_Issue::watchList', array($project.shortname, 'open')}">{trans 'My watch list'}</a>
+| <a {if $inCreate}class="active" {/if}href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{trans 'New Issue'}</a>
+{/if}
+| <form class="star" action="{url 'IDF_Views_Issue::search', array($project.shortname)}" method="get">
 <input accesskey="4" type="text" value="{$query}" name="q" size="20" />
 <input type="submit" name="s" value="{trans 'Search'}" />
 </form>

src/IDF/templates/idf/issues/by-label.html

@@ -1,5 +1,5 @@
 {extends "idf/issues/base.html"}
-{block docclass}yui-t1{/block}
+{block docclass}yui-t1{assign $inAllIssues=true}{/block}
 {block body}
 {$issues.render}
 {if !$user.isAnonymous()}

src/IDF/templates/idf/issues/index.html

@@ -1,5 +1,5 @@
 {extends "idf/issues/base.html"}
-{block docclass}yui-t2{assign $inOpenIssues=true}{/block}
+{block docclass}yui-t2{assign $inAllIssues=true}{/block}
 {block body}
 {$issues.render}
 {if !$user.isAnonymous()}

src/IDF/templates/idf/issues/view.html

@@ -190,6 +190,7 @@
 {if count($related_issues) > 0}
 {foreach $related_issues as $verb => $rel_issues}
 <p>
+{assign $verb = __($verb)}
 <strong>{blocktrans}This issue {$verb}{/blocktrans}</strong><br />
   {foreach $rel_issues as $rel_issue}
      <span class="label">

src/IDF/version.php

@@ -1,5 +1,5 @@
 <?php
 return array(
-    'version'  => '1.2-dev',
+    'version'  => '1.2',
     'revision' => '$Format:%H$',
 );

www/media/idf/css/style.css

@@ -85,6 +85,7 @@ a.soft:visited {
 }
 
 div.context {
+  padding-top: 0.5em;
   padding-left: 1em;
   position: relative;
   top: 0;
@@ -378,6 +379,9 @@ span.active {
 .helptext {
   font-size: 80%;
   color: #555753;
+  max-width: 600px;
+  margin-top: 0.25em;
+  display: inline-block;
 }
 
 div.container {
@@ -589,6 +593,11 @@ span.ctrl-char[title="0x09"] {
   width: 24px;
 }
 
+/* override any prettify css rule */
+span.ctrl-char > * {
+  color: white;
+}
+
 table.diff {
   width: 100%;
   table-layout: fixed;
@@ -661,6 +670,11 @@ table.diff-linecounts td {
   border-left: 1px solid #d3d7cf;
 }
 
+table.diff-linecounts.left-hidden tr > td:first-child,
+table.diff-linecounts.right-hidden tr > td + td {
+  display: none;
+}
+
 table.diff-contents td {
   line-height: 12px;
   padding: 2px;
@@ -693,11 +707,6 @@ table.diff-contents td.removed > span.ctrl-char {
   background: #A00;
 }
 
-/* override prettify css rule */
-table.diff-contents td > span.ctrl-char > * {
-  color: white;
-}
-
 /**
  * view file content
  */