Download as
Browse Code »

Commit 59520e8c4245da4c4ca992c1b7bab71c1f62d7f8

Authored by Weblate
2 parents 40928528 41c081de
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge remote-tracking branch 'origin/master'

Showing 6 changed files with 39 additions and 9 deletions   Show diff stats
@@ -43,11 +43,15 @@ Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com> @@ -43,11 +43,15 @@ Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
43 analosnak <analosnak@gmail.com> 43 analosnak <analosnak@gmail.com>
44 Ana Losnak <analosnak@gmail.com> 44 Ana Losnak <analosnak@gmail.com>
45 Andre Bernardes <andrebsguedes@gmail.com> 45 Andre Bernardes <andrebsguedes@gmail.com>
  46 +André Bernardes <andrebsguedes@gmail.com>
  47 +André Guedes <andrebsguedes@fedora.local>
  48 +André Guedes <andrebsguedes@gmail.com>
46 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br> 49 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
47 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br> 50 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
48 Antonio Terceiro <terceiro@colivre.coop.br> 51 Antonio Terceiro <terceiro@colivre.coop.br>
49 Arthur Del Esposte <arthurmde@gmail.com> 52 Arthur Del Esposte <arthurmde@gmail.com>
50 Arthur Del Esposte <arthurmde@yahoo.com.br> 53 Arthur Del Esposte <arthurmde@yahoo.com.br>
  54 +Athos Ribeiro <athoscribeiro@gmail.com>
51 Aurelio A. Heckert <aurelio@colivre.coop.br> 55 Aurelio A. Heckert <aurelio@colivre.coop.br>
52 Braulio Bhavamitra <brauliobo@gmail.com> 56 Braulio Bhavamitra <brauliobo@gmail.com>
53 Bráulio Bhavamitra <brauliobo@gmail.com> 57 Bráulio Bhavamitra <brauliobo@gmail.com>
@@ -82,6 +86,7 @@ Carlos Morais + Diego Araújo &lt;diegoamc90@gmail.com&gt; @@ -82,6 +86,7 @@ Carlos Morais + Diego Araújo &lt;diegoamc90@gmail.com&gt;
82 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com> 86 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
83 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com> 87 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
84 Carlos Morais + Pedro Leal <carlos88morais@gmail.com> 88 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
  89 +Christophe DANIEL <papaeng@gmail.com>
85 Daniel Alves + Diego Araújo <danpaulalves@gmail.com> 90 Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
86 Daniel Alves + Diego Araújo <diegoamc90@gmail.com> 91 Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
87 Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com> 92 Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
@@ -126,11 +131,14 @@ DylanGuedes &lt;djmgguedes@gmail.com&gt; @@ -126,11 +131,14 @@ DylanGuedes &lt;djmgguedes@gmail.com&gt;
126 Eduardo Passos <eduardo@risa.localdomain.localhost> 131 Eduardo Passos <eduardo@risa.localdomain.localhost>
127 Eduardo Passos <eduardosteps@gmail.com> 132 Eduardo Passos <eduardosteps@gmail.com>
128 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br> 133 Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
  134 +Eduardo Vital <vitaldu@gmail.com>
129 Evandro Jr <evandrojr@gmail.com> 135 Evandro Jr <evandrojr@gmail.com>
130 Evandro Junior <evandrojr@gmail.com> 136 Evandro Junior <evandrojr@gmail.com>
  137 +Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
131 Fabio Teixeira <fabio1079@gmail.com> 138 Fabio Teixeira <fabio1079@gmail.com>
132 FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com> 139 FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
133 Fernanda Lopes <nanda.listas+psl@gmail.com> 140 Fernanda Lopes <nanda.listas+psl@gmail.com>
  141 +Filipe Ribeiro <firibeiro77@live.com>
134 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br> 142 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
135 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)> 143 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
136 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br> 144 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
@@ -198,6 +206,7 @@ Lucas Kanashiro &lt;kanashiro.duarte@gmail.com&gt; @@ -198,6 +206,7 @@ Lucas Kanashiro &lt;kanashiro.duarte@gmail.com&gt;
198 Lucas Melo <lucas@colivre.coop.br> 206 Lucas Melo <lucas@colivre.coop.br>
199 Lucas Melo <lucaspradomelo@gmail.com> 207 Lucas Melo <lucaspradomelo@gmail.com>
200 Luciano <lucianopcbr@gmail.com> 208 Luciano <lucianopcbr@gmail.com>
  209 +Luciano Prestes Cavacanti <lucianopcbr@gmail.com>
201 Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> 210 Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
202 Luis David Aguilar Carlos <ludwig9003@gmail.com> 211 Luis David Aguilar Carlos <ludwig9003@gmail.com>
203 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com> 212 Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
@@ -207,6 +216,7 @@ Martín Olivera &lt;molivera@solar.org.ar&gt; @@ -207,6 +216,7 @@ Martín Olivera &lt;molivera@solar.org.ar&gt;
207 Maurilio Atila <cabelotaina@gmail.com> 216 Maurilio Atila <cabelotaina@gmail.com>
208 M for Momo <mo@rtnp.org> 217 M for Momo <mo@rtnp.org>
209 Michal Čihař <michal@cihar.com> 218 Michal Čihař <michal@cihar.com>
  219 +Michel Felipe <mfelipeof@gmail.com>
210 Moises Machado <moises@colivre.coop.br> 220 Moises Machado <moises@colivre.coop.br>
211 Naíla Alves <naila@colivre.coop.br> 221 Naíla Alves <naila@colivre.coop.br>
212 Nanda Lopes <nanda.listas+psl@gmail.com> 222 Nanda Lopes <nanda.listas+psl@gmail.com>
@@ -251,6 +261,7 @@ Tallys Martins &lt;tallysmartins@yahoo.com.br&gt; @@ -251,6 +261,7 @@ Tallys Martins &lt;tallysmartins@yahoo.com.br&gt;
251 tallys <tallys@tallys> 261 tallys <tallys@tallys>
252 tallys <tallys@tallys.(none)> 262 tallys <tallys@tallys.(none)>
253 Thiago Casotti <thiago.casotti@uol.com.br> 263 Thiago Casotti <thiago.casotti@uol.com.br>
  264 +Thiago Ribeiro <thiagitosouza@hotmail.com>
254 Thiago Zoroastro <thiago.zoroastro@bol.com.br> 265 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
255 Tuux <tuxa@galaxie.eu.org> 266 Tuux <tuxa@galaxie.eu.org>
256 TWS <tablettws@gmail.com> 267 TWS <tablettws@gmail.com>
debian/changelog
  Diff comments   View file @59520e8
1 -noosfero (1.2~1) UNRELEASED; urgency=medium  
2 -  
3 - [ Antonio Terceiro ]  
4 - * Temporary version in heavy development 1 +noosfero (1.2~rc1) wheezy; urgency=medium
5 2
6 [ Joenio Costa ] 3 [ Joenio Costa ]
7 * Build noosfero-chat package 4 * Build noosfero-chat package
8 5
9 - -- Joenio Costa <joenio@colivre.coop.br> Mon, 18 May 2015 14:32:21 -0300 6 + [ Antonio Terceiro ]
  7 + * Noosfero 1.2 RC1
  8 +
  9 + -- Antonio Terceiro <terceiro@colivre.coop.br> Mon, 13 Jul 2015 15:44:17 -0300
10 10
11 noosfero (1.1) wheezy; urgency=low 11 noosfero (1.1) wheezy; urgency=low
12 12
lib/noosfero/version.rb
  Diff comments   View file @59520e8
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '1.2~0' 3 + VERSION = '1.2~rc1'
4 end 4 end
5 5
6 root = File.expand_path(File.dirname(__FILE__) + '/../..') 6 root = File.expand_path(File.dirname(__FILE__) + '/../..')
public/500.html
  Diff comments   View file @59520e8
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 67
68 68
69 <div id='fr' style='display: none' class='message'> 69 <div id='fr' style='display: none' class='message'>
70 - <h1>Problème temporaire du système.</h1> 70 + <h1>Problème temporaire du système</h1>
71 <p> 71 <p>
72 Notre équipe technique est en train d'y travailler. Merci de réessayer plus tard. Nous sommes désolés de la gêne occasionnée. 72 Notre équipe technique est en train d'y travailler. Merci de réessayer plus tard. Nous sommes désolés de la gêne occasionnée.
73 </p> 73 </p>
util/debian-install/README.md
  Diff comments   View file @59520e8
1 This directory contains the basic structure to test the installation of 1 This directory contains the basic structure to test the installation of
2 Noosfero debian packages, using a fresh Vagrant VM and packages built in 2 Noosfero debian packages, using a fresh Vagrant VM and packages built in
3 ${NOOSFEROROOT}/pkg/. 3 ${NOOSFEROROOT}/pkg/.
  4 +
  5 +To perform a test, do
  6 +
  7 +```
  8 +$ cd /path/to/noosfero
  9 +$ rake noosfero:deb
  10 +$ cd util/debian-install/
  11 +$ vagrant up
  12 +```
  13 +
  14 +To reset the environment in preparation for a new test, destroy the VM and
  15 +remove any local `*.deb` files :
  16 +
  17 +```
  18 +$ cd util/debian-install/
  19 +$ vagrant halt
  20 +$ vagrant destroy
  21 +$ rm -f *.deb
  22 +```
util/debian-install/Vagrantfile
  Diff comments   View file @59520e8
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 VAGRANTFILE_API_VERSION = "2" 5 VAGRANTFILE_API_VERSION = "2"
6 6
7 require 'fileutils' 7 require 'fileutils'
8 -debs = `find ../../pkg/ -name '*.deb' | sort -t _ -V | tail -2`.split 8 +debs = `find ../../pkg/ -name '*.deb' | sort -t _ -V`.split
9 if debs.empty? 9 if debs.empty?
10 puts "W: no debs built in ../../pkg/; will either install existing local" 10 puts "W: no debs built in ../../pkg/; will either install existing local"
11 puts " ones, or the ones from the remote repository" 11 puts " ones, or the ones from the remote repository"
@@ -16,7 +16,7 @@ else @@ -16,7 +16,7 @@ else
16 16
17 local_debs.delete(fn) 17 local_debs.delete(fn)
18 18
19 - if File.stat(f) != File.stat(fn) 19 + if !File.exist?(fn) || File.stat(f) != File.stat(fn)
20 FileUtils::Verbose.rm_f(fn) 20 FileUtils::Verbose.rm_f(fn)
21 FileUtils::Verbose.ln f, '.' 21 FileUtils::Verbose.ln f, '.'
22 end 22 end