Merge branch 'release-1.1' of projects.ceondo.com:indefero into release-1.1

AUTHORS

@@ -1,33 +1,33 @@
 InDefero was originally created during summer 2008
 by Loïc d'Anterroches with the support of Céondo Ltd.
 
-Much appreciated contributors:
+Much appreciated contributors (in alphabetical order):
 
-    Nicolas Lassalle <http://www.beroot.org/> - Subversion support
-    bohwaz <http://bohwaz.net/>
-    Benjamin Jorand <benjamin.jorand@gmail.com> - Mercurial support
-    Baptiste Michaud <bactisme@gmail.com> - Subversion synchronization
-    Julien Issler 
-    Manuel Eidenberger <eidenberger@gmail.com>
-    Ciaran Gultnieks
-    Mehdi Kabab <http://pioupioum.fr/>
-    Sindre R. Myren
-    Patrick Georgi <patrick.georgi@coresystems.de>
-    Adrien Bustany
-    Charles Melbye
-    Baptiste Durand-Bret
-    Andrew Nguyen
-    David Feeney
-    Denis Kot <denis.kot@gmail.com>
-    Samuel Suther
-    Ludovic Bellière
     Brian Armstrong
+    Ludovic Bellière
+    bohwaz <http://bohwaz.net/>
+    Adrien Bustany
+    Baptiste Durand-Bret
+    Manuel Eidenberger <eidenberger@gmail.com>
     Raphaël Emourgeon
-    Jakub Viták
-    Vladimir Solomatin
+    David Feeney
+    Patrick Georgi <patrick.georgi@coresystems.de>
+    Ciaran Gultnieks
+    Julien Issler
+    Benjamin Jorand <benjamin.jorand@gmail.com> - Mercurial support
+    Mehdi Kabab <http://pioupioum.fr/>
+    Thomas Keller <me@thomaskeller.biz> - Monotone support, German translation
+    Denis Kot <denis.kot@gmail.com>
+    Nicolas Lassalle <http://www.beroot.org/> - Subversion support
     William Martin <wysman@gmail.com>
-    Thomas Keller <me@thomaskeller.biz>
-    Fernando Sayago Gil <mikados.mikados@gmail.com> - Spain translation
+    Charles Melbye
+    Baptiste Michaud <bactisme@gmail.com> - Subversion synchronization
+    Sindre R. Myren
+    Andrew Nguyen
+    Fernando Sayago Gil <mikados.mikados@gmail.com> - Spanish translation
+    Vladimir Solomatin
+    Samuel Suther - German translation
+    Jakub Viták
 
 And all the nice users who spent time reporting issues and promoting
 the project. The project could not live without them.

CONTRIBUTE.mdtext

@@ -104,12 +104,13 @@ without first talking to us.
 
 ## I am a translator
 
-We currently use (transifex)[http://trac.transifex.org] to help our
-users to translate indefero. You don't have to use it, but it's an
-easy way to do the job. You can visit the indefero page at transifex
-here : http://www.transifex.net/projects/p/indefero/c/indefero/
+We currently use [transifex](http://trac.transifex.org) to help our
+users translate indefero. You don't have to use it, but it's an easy
+way to do the job. You can visit the indefero page at transifex here:
+
+    http://www.transifex.net/projects/p/indefero/
 
 Please understand that your changes will not be commited instantly,
 but are sent to the maintainers e-mails before. Then, your changes
-will not be in the main repository until da-loic push the changes. In
-that way, try to do big changes with less submissions.
+will not be in the main repository until the maintainer pushs the
+changes. In that way, try to do big changes with less submissions.

Makefile

@@ -36,6 +36,7 @@ help:
 	@printf "\tpo-update - Merge POT file into PO file. POT is not regenerated.\n"
 	@printf "\tpo-push - Send the all PO file on transifex server.\n"
 	@printf "\tpo-pull - Get all PO file from transifex server.\n"
+	@printf "\tpo-stats - Show statistics about translation on each PO file .\n"
 
 #
 #   Internationnalization rule, POT & PO file manipulation
@@ -108,7 +109,24 @@ po-push: check-tx-config
 	@tx push -t
 
 po-pull: check-tx-config
+	# Save PO
+	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
+	    cp $$pofile $$pofile".save"; \
+	done
+	# Get new one
 	@tx pull -a
+	# Merge Transifex PO into local PO (so fuzzy entry is correctly saved)
+	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
+	    msgmerge -U $$pofile".save" $$pofile; \
+	    rm -f $$pofile; \
+	    mv $$pofile".save" $$pofile; \
+	done
+
+po-stats:
+	@msgfmt --statistics -v src/IDF/locale/idf.pot
+	@for pofile in `ls src/IDF/locale/*/idf.po`; do \
+	    msgfmt --statistics -v $$pofile; \
+	done
 
 #
 #   Generic rule to build a tarball of indefero for a specified branch

NEWS

@@ -0,0 +1,45 @@
+xxx xxx xx xx:xx 2011 UTC
+
+        1.1 release.
+
+        New Features
+
+        - Manage multiple (commit) emails in your account settings (#136)
+        - Configure a default issue template for each project (#212, #540)
+        - Automatically create a table of contents on wiki pages (#350)
+        - Add multiple email addresses for project notifications (#372)
+        - Added an option to disable the project's size calculation in the forge (#403)
+        - Show branch in the commit details (git, mtn, hg) (#450)
+        - Allow the usage of text labels for Wiki text links (#456)
+        - Enhanced user profile page (#510)
+        - Simplified Chinese translation added (#521)
+        - Filter the timeline and its feed by item (#543)
+        - Display detailed changeset information for each commit (git, mtn) (#544)
+
+        Bugfixes
+
+        - Fix 'Need SSH_ORIGINAL_COMMAND in environment' for git sync (#198)
+        - English source language has been improved (#441, #478, #631)
+        - Fix a problem when deleting an orphaned git repository (#467)
+        - Sort the project list by the display name of the project (#477)
+        - Project creation form now has a short description field as well (#479)
+        - Add more file extensions supported by our in-tree prettify version (#490)
+        - Do not clean <ins> and <del> HTML markup from user input (#509)
+        - Improve HTML validation by switching from `strict` to `transitional` DOCTYPE (#511)
+        - Properly handle git commits without a changelog title (#520)
+        - Improve BSD compatibility in shell scripts (#526)
+        - Properly render inner whitespaces in viewed issue attachments (#528)
+        - Support for uploading SSH keys without optional comment (#531)
+        - Recognize irc: and git: protocols in Markdown renderer (#546)
+
+        Documentation
+
+        - Note possible problems with mbstring.func_overload in INSTALL (#481)
+        - Document how to contribute to Indefero (#486)
+        - Links to Markdown documentation have been improved (#489)
+        - Explain purpose of `idf_strong_key_check` in idf.php-dist (#516)
+
+
+Tue Apr 20 07:00 2010 UTC
+
+        1.0 release.

src/IDF/Form/ReviewFileComment.php

@@ -64,6 +64,8 @@ class IDF_Form_ReviewFileComment extends Pluf_Form
         if ($this->user->hasPerm('IDF.project-owner', $this->project)
             or $this->user->hasPerm('IDF.project-member', $this->project)) {
             $this->show_full = true;
+        } else {
+            $this->show_full = false;
         }
         if ($this->show_full) {
             $this->fields['summary'] = new Pluf_Form_Field_Varchar(

src/IDF/Scm/Git.php

@@ -167,7 +167,29 @@ class IDF_Scm_Git extends IDF_Scm
      */
     public function inBranches($commit, $path)
     {
-        return $this->_inObject($commit, 'branch');
+        if (isset($this->cache['inBranches'][$commit])) {
+            return $this->cache['inBranches'][$commit];
+        }
+        
+        $cmd = Pluf::f('idf_exec_cmd_prefix', '')
+            .sprintf('GIT_DIR=%s %s branch --contains %s',
+                     escapeshellarg($this->repo),
+                     Pluf::f('git_path', 'git'),
+                     escapeshellarg($commit));
+        self::exec('IDF_Scm_Git::inBranches', $cmd, $out, $return);
+        if (0 != $return) {
+            throw new IDF_Scm_Exception(sprintf($this->error_tpl,
+                                                $cmd, $return,
+                                                implode("\n", $out)));
+        }
+
+        $res = array();
+        foreach ($out as $line) {
+            $res[] = substr($line, 2);
+        }
+        
+        $this->cache['inBranches'][$commit] = $res;
+        return $res;        
     }
 
     /**

src/IDF/locale/de/idf.po

@@ -3370,7 +3370,7 @@ msgstr "Alle Aktualisierungen"
 
 #: IDF/Views/Project.php:74
 msgid "Issues and Comments"
-msgstr "Tickets und Kommentare"
+msgstr "Tickets u. Kommentare"
 
 #: IDF/Views/Project.php:76
 msgid "Documents"
@@ -3378,7 +3378,7 @@ msgstr "Dokumentation"
 
 #: IDF/Views/Project.php:77
 msgid "Reviews and Patches"
-msgstr "Besprechungen und Patches"
+msgstr "Besprechungen u. Patches"
 
 #: IDF/Views/Project.php:142
 msgid "This table shows the project updates."
@@ -3386,7 +3386,7 @@ msgstr "Diese Tabelle zeigt Projekt-Aktualisierungen."
 
 #: IDF/Views/Project.php:153
 msgid "Change"
-msgstr "Ändern"
+msgstr "Änderung"
 
 #: IDF/Views/Project.php:157
 msgid "No changes were found."