Download as
Browse Code »

Commit 50a6abe63d0654c2a90ba06f2d1d8cab045d70a9

Authored by Victor Costa
2 parents c38320e4 176bce4b
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'rails3' into rails3_stable

Showing 8 changed files with 137 additions and 333 deletions   Show diff stats
... ... @@ -1,251 +0,0 @@
1   -If you are not listed here, but should be, please write to the noosfero mailing
2   -list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
3   -(this list requires subscription to post, but since you are an author of
4   -noosfero, that's not a problem).
5   -
6   -Developers
7   -==========
8   -
9   -Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
10   -Alan Freihof Tygel <alantygel@gmail.com>
11   -alcampelo <alcampelo@alcampelo.(none)>
12   -Alessandro Palmeira <alessandro.palmeira@gmail.com>
13   -Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
14   -Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
15   -Alessandro Palmeira + Caio Salgado <caio.csalgado@gmail.com>
16   -Alessandro Palmeira + Caio Salgado + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
17   -Alessandro Palmeira + Carlos Morais <alessandro.palmeira@gmail.com>
18   -Alessandro Palmeira + Daniel Alves <alessandro.palmeira@gmail.com>
19   -Alessandro Palmeira + Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
20   -Alessandro Palmeira + Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
21   -Alessandro Palmeira + Diego Araujo <alessandro.palmeira@gmail.com>
22   -Alessandro Palmeira + Diego Araújo <alessandro.palmeira@gmail.com>
23   -Alessandro Palmeira + Diego Araujo + Daniela Feitosa <alessandro.palmeira@gmail.com>
24   -Alessandro Palmeira + Diego Araujo <diegoamc90@gmail.com>
25   -Alessandro Palmeira + Diego Araújo <diegoamc90@gmail.com>
26   -Alessandro Palmeira + Diego Araujo + Eduardo Morais <alessandro.palmeira@gmail.com>
27   -Alessandro Palmeira + Diego Araújo + João M. M. da Silva <alessandro.palmeira@gmail.com>
28   -Alessandro Palmeira + Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
29   -Alessandro Palmeira + Diego Araujo + João M. M. da Silva + Paulo Meirelles <alessandro.palmeira@gmail.com>
30   -Alessandro Palmeira + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
31   -Alessandro Palmeira + Diego Araújo + Pedro Leal + João M. M. da Silva <diegoamc90@gmail.com>
32   -Alessandro Palmeira + Diego Araujo + Rafael Manzo <alessandro.palmeira@gmail.com>
33   -Alessandro Palmeira + Eduardo Morais <alessandro.palmeira@gmail.com>
34   -Alessandro Palmeira + Guilherme Rojas <alessandro.palmeira@gmail.com>
35   -Alessandro Palmeira + Jefferson Fernandes <alessandro.palmeira@gmail.com>
36   -Alessandro Palmeira + João M. M. da Silva <alessandro.palmeira@gmail.com>
37   -Alessandro Palmeira + Joao M. M. da Silva + Diego Araujo <alessandro.palmeira@gmail.com>
38   -Alessandro Palmeira + João M. M. da Silva + Renan Teruo <alessandro.palmeira@gmail.com>
39   -Alessandro Palmeira + João M. M. Silva <alessandro.palmeira@gmail.com>
40   -Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
41   -Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
42   -Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
43   -Ana Losnak <analosnak@gmail.com>
44   -Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
45   -Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
46   -Antonio Terceiro <terceiro@colivre.coop.br>
47   -Arthur Del Esposte <arthurmde@gmail.com>
48   -Arthur Del Esposte <arthurmde@yahoo.com.br>
49   -Aurelio A. Heckert <aurelio@colivre.coop.br>
50   -Braulio Bhavamitra <brauliobo@gmail.com>
51   -Bráulio Bhavamitra <brauliobo@gmail.com>
52   -Braulio Bhavamitra <braulio@eita.org.br>
53   -Caio <caio.csalgado@gmail.com>
54   -Caio + Diego + Pedro + João <caio.csalgado@gmail.com>
55   -Caio Formiga <caio.formiga@gmail.com>
56   -Caio, Pedro <caio.csalgado@gmail.com>
57   -Caio Salgado + Alessandro Palmeira <caio.csalgado@gmail.com>
58   -Caio Salgado <caio.csalgado@gmail.com>
59   -Caio Salgado + Carlos Morais + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
60   -Caio Salgado + Diego Araujo <caio.csalgado@gmail.com>
61   -Caio Salgado + Diego Araújo <caio.csalgado@gmail.com>
62   -Caio Salgado + Diego Araújo <diegoamc90@gmail.com>
63   -Caio Salgado + Diego Araújo + Jefferson Fernandes <caio.csalgado@gmail.com>
64   -Caio Salgado + Diego Araújo + João M. M. da Silva <caio.csalgado@gmail.com>
65   -Caio Salgado + Diego Araújo + Pedro Leal <caio.csalgado@gmail.com>
66   -Caio Salgado + Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
67   -Caio Salgado + Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
68   -Caio Salgado + Jefferson Fernandes <caio.csalgado@gmail.com>
69   -Caio Salgado + Jefferson Fernandes <jeffs.fernandes@gmail.com>
70   -Caio Salgado + Rafael Manzo <caio.csalgado@gmail.com>
71   -Caio Salgado + Renan Teruo <caio.csalgado@gmail.com>
72   -Caio Salgado + Renan Teruo <caio.salgado@gmail.com>
73   -Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
74   -Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
75   -Caio SBA <caio@colivre.coop.br>
76   -Caio Tiago Oliveira <caiotiago@colivre.coop.br>
77   -Carlos Andre de Souza <carlos.andre.souza@msn.com>
78   -Carlos Morais <carlos88morais@gmail.com>
79   -Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
80   -Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
81   -Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
82   -Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
83   -Daniela Feitosa <dani@dohko.(none)>
84   -Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
85   -Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
86   -Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
87   -Daniel Alves + Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
88   -Daniel Alves + Diego Araújo + Guilherme Rojas <guilhermehrojas@gmail.com>
89   -Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
90   -Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
91   -Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
92   -Daniel Bucher <daniel.bucher88@gmail.com>
93   -Daniel Cunha <daniel@colivre.coop.br>
94   -David Carlos <ddavidcarlos1392@gmail.com>
95   -diegoamc <diegoamc90@gmail.com>
96   -Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
97   -Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
98   -Diego Araújo + Alessandro Palmeira + Rafael Manzo <rr.manzo@gmail.com>
99   -Diego Araujo + Caio Salgado <diegoamc90@gmail.com>
100   -Diego Araújo + Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
101   -Diego Araújo <diegoamc90@gmail.com>
102   -Diego Araújo + Eduardo Morais + Paulo Meirelles <diegoamc90@gmail.com>
103   -Diego Araújo + Guilherme Rojas <diegoamc90@gmail.com>
104   -Diego Araújo + Jefferson Fernandes <diegoamc90@gmail.com>
105   -Diego Araujo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
106   -Diego Araújo + João Machini <diegoamc90@gmail.com>
107   -Diego Araújo + João Machini <digoamc90@gmail.com>
108   -Diego Araújo + João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
109   -Diego Araújo + João M. M. da Silva <diegoamc90@gmail.com>
110   -Diego Araújo + João M. M. da Silva + João Machini <diegoamc90@gmail.com>
111   -Diego Araújo + João M. M. da Silva + Pedro Leal <diegoamc90@gmail.com>
112   -Diego Araújo + Paulo Meirelles <diegoamc90@gmail.com>
113   -Diego Araújo + Pedro Leal <diegoamc90@gmail.com>
114   -Diego Araujo + Rafael Manzo <diegoamc90@gmail.com>
115   -Diego Araújo + Rafael Manzo <diegoamc90@gmail.com>
116   -Diego Araújo + Renan Teruo + Alessandro Palmeira <diegoamc90@gmail.com>
117   -Diego Araújo + Renan Teruo <diegoamc90@gmail.com>
118   -Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo@gmail.com>
119   -Diego + Jefferson <diegoamc90@gmail.com>
120   -Diego Martinez <diegoamc90@gmail.com>
121   -Diego Martinez <diego@diego-K55A.(none)>
122   -Diego + Renan <renanteruoc@gmail.com>
123   -Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
124   -Evandro Jr <evandrojr@gmail.com>
125   -Evandro Junior <evandrojr@gmail.com>
126   -Fabio Teixeira <fabio1079@gmail.com>
127   -Fernanda Lopes <nanda.listas+psl@gmail.com>
128   -Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
129   -Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
130   -Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
131   -Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
132   -Gabriela Navarro <navarro1703@gmail.com>
133   -Grazieno Pellegrino <grazieno@gmail.com>
134   -Gust <darksshades@hotmail.com>
135   -Hugo Melo <hugo@riseup.net>
136   -Isaac Canan <isaac@intelletto.com.br>
137   -Italo Valcy <italo@dcc.ufba.br>
138   -Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
139   -Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
140   -Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
141   -João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
142   -João da Silva <jaodsilv@linux.ime.usp.br>
143   -João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
144   -João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
145   -João M. M. da Silva + Alessandro Palmeira + Diego Araújo <jaodsilv@linux.ime.usp.br>
146   -Joao M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
147   -João M. M. da Silva + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
148   -João M. M. da Silva + Alessandro Palmeira + João Machini <jaodsilv@linux.ime.usp.br>
149   -João M. M. da Silva + Caio Salgado + Alessandro Palmeira <jaodsilv@linux.ime.usp.br>
150   -João M. M. da Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
151   -João M. M. da Silva + Carlos Morais <jaodsilv@linux.ime.usp.br>
152   -João M. M. da Silva + Diego Araújo <diegoamc90@gmail.com>
153   -João M. M. da Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
154   -João M. M. da Silva + Diego Araújo + Pedro Leal <jaodsilv@linux.ime.usp.br>
155   -João M. M. da Silva <jaodsilv@linux.ime.usp.br>
156   -Joao M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
157   -João M. M. da Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
158   -João M. M. da Silva + João M. Miranda <jaodsilv@linux.ime.usp.br>
159   -João M. M. da Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
160   -João M. M. da Silva + Pedro Leal <jaodsilv@linux.ime.usp.br>
161   -João M. M. da Silva + Rafael Manzo + Diego Araújo <jaodsilv@linux.ime.usp.br>
162   -João M. M. da Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
163   -João M. M. da Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
164   -João M. M. Silva + Caio Salgado <jaodsilv@linux.ime.usp.br>
165   -João M. M. Silva + Diego Araújo <jaodsilv@linux.ime.usp.br>
166   -Joao M. M. Silva + Jefferson Fernandes <jaodsilv@linux.ime.usp.br>
167   -João M. M. Silva + Paulo Meirelles <jaodsilv@linux.ime.usp.br>
168   -João M. M. Silva + Rafael Manzo <jaodsilv@linux.ime.usp.br>
169   -João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
170   -Joenio Costa <joenio@colivre.coop.br>
171   -Josef Spillner <josef.spillner@tu-dresden.de>
172   -Junior Silva <junior@bajor.localhost.localdomain>
173   -Junior Silva <junior@sedeantigo.colivre.coop.br>
174   -Junior Silva <juniorsilva1001@gmail.com>
175   -Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
176   -Junior Silva <juniorsilva@colivre.coop.br>
177   -juniorsilva <juniorsilva@QonoS.localhost.localdomain>
178   -Keilla Menezes <keilla@colivre.coop.br>
179   -Larissa Reis <larissa@colivre.coop.br>
180   -Larissa Reis <reiss.larissa@gmail.com>
181   -Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
182   -Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
183   -Leandro Nunes dos Santos <leandronunes@gmail.com>
184   -Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
185   -LinguÁgil 2010 <linguagil.bahia@gmail.com>
186   -Lucas Melo <lucas@colivre.coop.br>
187   -Lucas Melo <lucaspradomelo@gmail.com>
188   -Luciano <lucianopcbr@gmail.com>
189   -Luis David Aguilar Carlos <ludwig9003@gmail.com>
190   -Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
191   -Marcos Ramos <ms.ramos@outlook.com>
192   -Martín Olivera <molivera@solar.org.ar>
193   -Moises Machado <moises@colivre.coop.br>
194   -Naíla Alves <naila@colivre.coop.br>
195   -Nanda Lopes <nanda.listas+psl@gmail.com>
196   -Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
197   -Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
198   -Paulo Meirelles + Carlos Morais <paulo@softwarelivre.org>
199   -Paulo Meirelles + Diego Araújo <paulo@softwarelivre.org>
200   -Paulo Meirelles + João M. M. da Silva <paulo@softwarelivre.org>
201   -Paulo Meirelles <paulo@softwarelivre.org>
202   -Paulo Meirelles + Rafael Manzo <paulo@softwarelivre.org>
203   -Rafael Gomes <rafaelgomes@techfree.com.br>
204   -Rafael Manzo + Alessandro Palmeira <rr.manzo@gmail.com>
205   -Rafael Manzo + Daniel Alves <danpaulalves@gmail.com>
206   -Rafael Manzo + Diego Araújo <rr.manzo@gmail.com>
207   -Rafael Manzo + João M. M. Silva <rr.manzo@gmail.com>
208   -Rafael Manzo + Paulo Meirelles <rr.manzo@gmail.com>
209   -Rafael Martins <rmmartins@gmail.com>
210   -Rafael Reggiani Manzo + Caio Salgado + Jefferson Fernandes <rr.manzo@gmail.com>
211   -Rafael Reggiani Manzo + Diego Araujo <diegoamc90@gmail.com>
212   -Rafael Reggiani Manzo + Diego Araujo <rr.manzo@gmail.com>
213   -Rafael Reggiani Manzo + Diego Araújo <rr.manzo@gmail.com>
214   -Rafael Reggiani Manzo + João M. M. da Silva <rr.manzo@gmail.com>
215   -Rafael Reggiani Manzo <rr.manzo@gmail.com>
216   -Raphaël Rousseau <raph@r4f.org>
217   -Raquel Lira <raquel.lira@gmail.com>
218   -Renan Teruo + Caio Salgado <renanteruoc@gmail.com>
219   -Renan Teruoc + Diego Araujo <renanteruoc@gmail.com>
220   -Renan Teruo + Diego Araujo <renanteruoc@gmail.com>
221   -Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
222   -Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
223   -Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
224   -Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
225   -Rodrigo Souto <diguliu@gmail.com>
226   -Rodrigo Souto <rodrigo@colivre.coop.br>
227   -Ronny Kursawe <kursawe.ronny@googlemail.com>
228   -root <root@debian.sdr.serpro>
229   -Samuel R. C. Vale <srcvale@holoscopio.com>
230   -Valessio Brito <contato@valessiobrito.com.br>
231   -Valessio Brito <contato@valessiobrito.info>
232   -Valessio Brito <valessio@gmail.com>
233   -vfcosta <vfcosta@gmail.com>
234   -Victor Carvalho <victorhugodf.ac@gmail.com>
235   -Victor Costa <vfcosta@gmail.com>
236   -Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
237   -Vinicius Cubas Brand <viniciuscb@gmail.com>
238   -Visita <visita@debian.(none)>
239   -Yann Lugrin <yann.lugrin@liquid-concept.ch>
240   -
241   -Ideas, specifications and incentive
242   -===================================
243   -Daniel Tygel <dtygel@fbes.org.br>
244   -Guilherme Rocha <guilherme@gf7.com.br>
245   -Raphael Rousseau <raph@r4f.org>
246   -Théo Bondolfi <move@cooperation.net>
247   -Vicente Aguiar <vicenteaguiar@colivre.coop.br>
248   -
249   -Arts
250   -===================================
251   -Nara Oliveira <narananet@gmail.com>
AUTHORS.md
  Diff comments   View file @50a6abe
1   -If you are not listed here, but should be, please write to the noosfero mailing list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev (this list requires subscription to post, but since you are an author of noosfero, that's not a problem).
  1 +If you are not listed here, but should be, please write to the noosfero mailing
  2 +list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
  3 +(this list requires subscription to post, but since you are an author of
  4 +noosfero, that's not a problem).
2 5  
3 6 Developers
4 7 ==========
5 8  
  9 +Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
6 10 Alan Freihof Tygel <alantygel@gmail.com>
  11 +alcampelo <alcampelo@alcampelo.(none)>
7 12 Alessandro Palmeira <alessandro.palmeira@gmail.com>
8 13 Alessandro Palmeira + Caio C. Salgado <alessandro.palmeira@gmail.com>
9 14 Alessandro Palmeira + Caio Salgado <alessandro.palmeira@gmail.com>
... ... @@ -35,9 +40,12 @@ Alessandro Palmeira + João M. M. Silva &lt;alessandro.palmeira@gmail.com&gt;
35 40 Alessandro Palmeira + Paulo Meirelles <alessandro.palmeira@gmail.com>
36 41 Alessandro Palmeira + Paulo Meirelles + João M. M. da Silva <alessandro.palmeira@gmail.com>
37 42 Alessandro Palmeira + Rafael Manzo <alessandro.palmeira@gmail.com>
  43 +Ana Losnak <analosnak@gmail.com>
38 44 Antonio Terceiro + Carlos Morais <terceiro@colivre.coop.br>
39 45 Antonio Terceiro + Paulo Meirelles <terceiro@colivre.coop.br>
40 46 Antonio Terceiro <terceiro@colivre.coop.br>
  47 +Arthur Del Esposte <arthurmde@gmail.com>
  48 +Arthur Del Esposte <arthurmde@yahoo.com.br>
41 49 Aurelio A. Heckert <aurelio@colivre.coop.br>
42 50 Braulio Bhavamitra <brauliobo@gmail.com>
43 51 Bráulio Bhavamitra <brauliobo@gmail.com>
... ... @@ -65,11 +73,14 @@ Caio Salgado + Renan Teruo &lt;caio.salgado@gmail.com&gt;
65 73 Caio Salgado + Renan Teruo + Jefferson Fernandes <jeffs.fernandes@gmail.com>
66 74 Caio Salgado + Renan Teruo <renanteruoc@gmail.com>
67 75 Caio SBA <caio@colivre.coop.br>
  76 +Caio Tiago Oliveira <caiotiago@colivre.coop.br>
  77 +Carlos Andre de Souza <carlos.andre.souza@msn.com>
68 78 Carlos Morais <carlos88morais@gmail.com>
69 79 Carlos Morais + Diego Araújo <diegoamc90@gmail.com>
70 80 Carlos Morais + Eduardo Morais <carlos88morais@gmail.com>
71 81 Carlos Morais + Paulo Meirelles <carlos88morais@gmail.com>
72 82 Carlos Morais + Pedro Leal <carlos88morais@gmail.com>
  83 +Daniela Feitosa <dani@dohko.(none)>
73 84 Daniel Alves + Diego Araújo <danpaulalves@gmail.com>
74 85 Daniel Alves + Diego Araújo <diegoamc90@gmail.com>
75 86 Daniel Alves + Diego Araújo + Guilherme Rojas <danpaulalves@gmail.com>
... ... @@ -78,7 +89,9 @@ Daniel Alves + Diego Araújo + Guilherme Rojas &lt;guilhermehrojas@gmail.com&gt;
78 89 Daniel Alves + Guilherme Rojas <danpaulalves@gmail.com>
79 90 Daniel Alves + Rafael Manzo <rr.manzo@gmail.com>
80 91 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
  92 +Daniel Bucher <daniel.bucher88@gmail.com>
81 93 Daniel Cunha <daniel@colivre.coop.br>
  94 +David Carlos <ddavidcarlos1392@gmail.com>
82 95 diegoamc <diegoamc90@gmail.com>
83 96 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
84 97 Diego Araújo + Alessandro Palmeira + João M. M. da Silva <diegoamc90@gmail.com>
... ... @@ -107,15 +120,25 @@ Diego + Jefferson &lt;diegoamc90@gmail.com&gt;
107 120 Diego Martinez <diegoamc90@gmail.com>
108 121 Diego Martinez <diego@diego-K55A.(none)>
109 122 Diego + Renan <renanteruoc@gmail.com>
  123 +Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
  124 +Evandro Jr <evandrojr@gmail.com>
  125 +Evandro Junior <evandrojr@gmail.com>
  126 +Fabio Teixeira <fabio1079@gmail.com>
110 127 Fernanda Lopes <nanda.listas+psl@gmail.com>
111 128 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
112 129 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
  130 +Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
  131 +Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
  132 +Gabriela Navarro <navarro1703@gmail.com>
113 133 Grazieno Pellegrino <grazieno@gmail.com>
  134 +Gust <darksshades@hotmail.com>
  135 +Hugo Melo <hugo@riseup.net>
114 136 Isaac Canan <isaac@intelletto.com.br>
115 137 Italo Valcy <italo@dcc.ufba.br>
116 138 Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
117 139 Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
118 140 Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
  141 +João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
119 142 João da Silva <jaodsilv@linux.ime.usp.br>
120 143 João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
121 144 João M. M. da Silva + Alessandro Palmeira + Diego Araújo + Caio Salgado <jaodsilv@linux.ime.usp.br>
... ... @@ -146,17 +169,29 @@ João M. M. Silva + Rafael Manzo &lt;jaodsilv@linux.ime.usp.br&gt;
146 169 João M. M. Silva + Renan Teruo <jaodsilv@linux.ime.usp.br>
147 170 Joenio Costa <joenio@colivre.coop.br>
148 171 Josef Spillner <josef.spillner@tu-dresden.de>
  172 +Jose Pedro <1jpsneto@gmail.com>
  173 +Junior Silva <junior@bajor.localhost.localdomain>
  174 +Junior Silva <junior@sedeantigo.colivre.coop.br>
149 175 Junior Silva <juniorsilva1001@gmail.com>
150 176 Junior Silva <juniorsilva7@juniorsilva-Aspire-5750Z.(none)>
  177 +Junior Silva <juniorsilva@colivre.coop.br>
  178 +juniorsilva <juniorsilva@QonoS.localhost.localdomain>
151 179 Keilla Menezes <keilla@colivre.coop.br>
152 180 Larissa Reis <larissa@colivre.coop.br>
153 181 Larissa Reis <reiss.larissa@gmail.com>
  182 +Leandro Alves <leandrosustenido@gmail.com>
  183 +Leandro Nunes dos Santos <81665687568@serpro-1541727.Home>
  184 +Leandro Nunes dos Santos <81665687568@serpro-1541727.(none)>
154 185 Leandro Nunes dos Santos <leandronunes@gmail.com>
155 186 Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
156 187 LinguÁgil 2010 <linguagil.bahia@gmail.com>
157 188 Lucas Melo <lucas@colivre.coop.br>
158 189 Lucas Melo <lucaspradomelo@gmail.com>
  190 +Luciano <lucianopcbr@gmail.com>
  191 +Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
159 192 Luis David Aguilar Carlos <ludwig9003@gmail.com>
  193 +Luiz Fernando de Freitas Matos <luiz@luizff.matos@gmail.com>
  194 +Marcos Ramos <ms.ramos@outlook.com>
160 195 Martín Olivera <molivera@solar.org.ar>
161 196 Moises Machado <moises@colivre.coop.br>
162 197 Naíla Alves <naila@colivre.coop.br>
... ... @@ -189,14 +224,19 @@ Renan Teruo + Diego Araujo &lt;renanteruoc@gmail.com&gt;
189 224 Renan Teruo + Diego Araújo <renanteruoc@gmail.com>
190 225 Renan Teruo + Paulo Meirelles <renanteruoc@gmail.com>
191 226 Renan Teruo + Rafael Manzo <renanteruoc@gmail.com>
  227 +Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso <noosfero-br@listas.softwarelivre.org>
192 228 Rodrigo Souto <diguliu@gmail.com>
193 229 Rodrigo Souto <rodrigo@colivre.coop.br>
194 230 Ronny Kursawe <kursawe.ronny@googlemail.com>
195 231 root <root@debian.sdr.serpro>
196 232 Samuel R. C. Vale <srcvale@holoscopio.com>
  233 +Valessio Brito <contato@valessiobrito.com.br>
  234 +Valessio Brito <contato@valessiobrito.info>
197 235 Valessio Brito <valessio@gmail.com>
198 236 vfcosta <vfcosta@gmail.com>
  237 +Victor Carvalho <victorhugodf.ac@gmail.com>
199 238 Victor Costa <vfcosta@gmail.com>
  239 +Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
200 240 Vinicius Cubas Brand <viniciuscb@gmail.com>
201 241 Visita <visita@debian.(none)>
202 242 Yann Lugrin <yann.lugrin@liquid-concept.ch>
... ...
debian/changelog
  Diff comments   View file @50a6abe
  1 +noosfero (1.0~rc1) wheezy-test; urgency=low
  2 +
  3 + * First 1.0 release candidate
  4 +
  5 + -- Rodrigo Souto <vagrant@wheezy-base> Fri, 15 Aug 2014 16:35:35 -0300
  6 +
1 7 noosfero (0.99.0~rc20140618202455) wheezy-test; urgency=low
2 8  
3 9 * Another rc with rails3
... ...
debian/docs
  Diff comments   View file @50a6abe
1   -AUTHORS
  1 +AUTHORS.md
  2 +INSTALL.awstats.md
  3 +INSTALL.chat.md
  4 +INSTALL.email.md
  5 +INSTALL.https.md
  6 +INSTALL.multitenancy.md
  7 +INSTALL.varnish.md
... ...
debian/rules
  Diff comments   View file @50a6abe
... ... @@ -29,4 +29,4 @@ override_dh_clean:
29 29  
30 30 override_dh_auto_build:
31 31 dh_auto_build
32   - rake noosfero:translations:compile
  32 + rake noosfero:translations:compile > /dev/null
... ...
lib/noosfero.rb
  Diff comments   View file @50a6abe
... ... @@ -2,8 +2,6 @@
2 2  
3 3 require 'fast_gettext'
4 4 module Noosfero
5   - PROJECT = 'noosfero'
6   - VERSION = '0.99.0~rc20140618202455'
7 5  
8 6 def self.pattern_for_controllers_in_directory(dir)
9 7 disjunction = controllers_in_directory(dir).join('|')
... ... @@ -95,5 +93,6 @@ module Noosfero
95 93  
96 94 end
97 95  
  96 +require 'noosfero/version'
98 97 require 'noosfero/constants'
99 98 require 'noosfero/core_ext'
... ...
lib/noosfero/version.rb 0 → 100644
  Diff comments   View file @50a6abe
... ... @@ -0,0 +1,4 @@
  1 +module Noosfero
  2 + PROJECT = 'noosfero'
  3 + VERSION = '1.0~rc1'
  4 +end
... ...
lib/tasks/release.rake
  Diff comments   View file @50a6abe
1 1 # encoding: UTF-8
2 2  
  3 +require 'noosfero/version'
  4 +$version = Noosfero::VERSION
  5 +
3 6 namespace :noosfero do
4 7  
5 8 def pendencies_on_authors
6   - sh "git status | grep 'AUTHORS' > /dev/null" do |ok, res|
  9 + sh "git status | grep 'AUTHORS.md' > /dev/null" do |ok, res|
7 10 return {:ok => !ok, :res => res}
8 11 end
9 12 end
10 13  
11 14 def pendencies_on_repo
12   - sh "git status | grep 'nothing.*commit' > /dev/null" do |ok, res|
  15 + sh "git status | grep 'nothing.*commit' > /dev/null" do |ok, res|
13 16 return {:ok => ok, :res => res}
14 17 end
15 18 end
16 19  
17 20 def pendencies_on_public_errors
18   - sh "git status | grep -e '500.html' -e '503.html' > /dev/null" do |ok, res|
  21 + sh "git status | grep -e '500.html' -e '503.html' > /dev/null" do |ok, res|
19 22 return {:ok => !ok, :res => res}
20 23 end
21 24 end
... ... @@ -40,32 +43,16 @@ namespace :noosfero do
40 43 end
41 44 end
42 45  
43   - def version
44   - require 'noosfero'
45   - Noosfero::VERSION
46   - end
47   -
48 46 desc 'checks if there is already a tag for the current version'
49 47 task :check_tag do
50   - sh "git tag | grep '^#{version}$' >/dev/null" do |ok, res|
  48 + sh "git tag | grep '^#{$version}$' >/dev/null" do |ok, res|
51 49 if ok
52   - raise "******** There is already a tag for version #{version}, cannot continue"
  50 + raise "******** There is already a tag for version #{$version}, cannot continue"
53 51 end
54 52 end
55   - puts "Not found tag for version #{version}, we can go on."
  53 + puts "Not found tag for version #{$version}, we can go on."
56 54 end
57 55  
58   - desc 'checks the version of the Debian package'
59   - task :check_debian_package do
60   - debian_version = `dpkg-parsechangelog | grep Version: | cut -d ' ' -f 2`.strip
61   - unless debian_version =~ /^#{version}/
62   - puts "Version mismatch: Debian version = #{debian_version}, Noosfero upstream version = #{version}"
63   - puts "Run `dch -v #{version}` to add a new changelog entry that upgrades the Debian version"
64   - raise "Version mismatch between noosfero version and debian package version"
65   - end
66   - end
67   -
68   -
69 56 AUTHORS_HEADER = <<EOF
70 57 If you are not listed here, but should be, please write to the noosfero mailing
71 58 list: http://listas.softwarelivre.org/cgi-bin/mailman/listinfo/noosfero-dev
... ... @@ -91,15 +78,15 @@ Arts
91 78 Nara Oliveira <narananet@gmail.com>
92 79 EOF
93 80  
94   - desc 'updates the AUTHORS file'
  81 + desc 'updates the authors file'
95 82 task :authors do
96 83 begin
97   - File.open("AUTHORS", 'w') do |output|
  84 + File.open("AUTHORS.md", 'w') do |output|
98 85 output.puts AUTHORS_HEADER
99 86 output.puts `git log --pretty=format:'%aN <%aE>' | sort | uniq`
100 87 output.puts AUTHORS_FOOTER
101 88 end
102   - commit_changes(['AUTHORS'], 'Updating AUTHORS file') if !pendencies_on_authors[:ok]
  89 + commit_changes(['AUTHORS.md'], 'Updating authors file') if !pendencies_on_authors[:ok]
103 90 rescue Exception => e
104 91 rm_f 'AUTHORS'
105 92 raise e
... ... @@ -131,100 +118,113 @@ EOF
131 118 end
132 119  
133 120 desc "uploads the packages to the repository"
134   - task :upload_packages, :release_kind do |t, args|
135   - release_kind = args[:release_kind] || 'stable'
136   - sh "dput --unchecked #{release_kind} #{Dir['pkg/*.changes'].first}"
  121 + task :upload_packages, :target do |t, args|
  122 + target = args[:target] || 'stable'
  123 + sh "dput --unchecked noosfero-#{target} #{Dir['pkg/*.changes'].first}"
137 124 end
138 125  
139 126 desc 'sets the new version on apropriate files'
140   - task :set_version, :release_kind do |t, args|
  127 + task :set_version, :target do |t, args|
141 128 next if File.exist?("tmp/pending-release")
142   - release_kind = args[:release_kind] || 'stable'
143   -
144   - if release_kind =~ /test/
145   - version_question = "Release candidate of which version: "
146   - if release_kind == 'squeeze-test'
147   - distribution = 'squeeze-test'
148   - elsif release_kind == 'wheezy-test'
149   - distribution = 'wheezy-test'
  129 + target = args[:target]
  130 +
  131 + new_version = $version.dup
  132 +
  133 + if target =~ /-test$/
  134 + if new_version =~ /~rc\d\+/
  135 + new_version.sub!(/\~rc([0-9]+)/) { "~rc#{$1.to_i + 1}" }
  136 + else
  137 + new_version += '~rc1'
150 138 end
151 139 else
152   - version_question = "Version that is being released: "
153   - distribution = 'unstable'
  140 + new_version.sub!(/~rc[0-9]+/, '')
154 141 end
155 142  
156   - version_name = new_version = ask(version_question)
157   -
158   - if release_kind =~ /test/
159   - timestamp = Time.now.strftime('%Y%m%d%H%M%S')
160   - version_name += "~rc#{timestamp}"
161   - end
  143 + puts "Current version: #{$version}"
  144 + ask("Version to release" % new_version, new_version)
162 145 release_message = ask("Release message")
163 146  
164   - sh 'git checkout debian/changelog lib/noosfero.rb'
165   - sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{version_name}'/\" lib/noosfero.rb"
166   - sh "dch --newversion #{version_name} --distribution #{distribution} --force-distribution '#{release_message}'"
  147 + sh 'git checkout debian/changelog lib/noosfero/version.rb'
  148 + sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{new_version}'/\" lib/noosfero/version.rb"
  149 + sh "dch --newversion #{new_version} --distribution #{target} --force-distribution '#{release_message}'"
167 150  
168   - sh 'git diff debian/changelog lib/noosfero.rb'
169   - if confirm("Commit version bump to #{version_name} on #{distribution} distribution")
170   - sh 'git add debian/changelog lib/noosfero.rb'
171   - sh "git commit -m 'Bumping version #{version_name}'"
  151 + sh 'git diff debian/changelog lib/noosfero/version.rb'
  152 + if confirm("Commit version bump to #{new_version} on #{target} distribution")
  153 + sh 'git add debian/changelog lib/noosfero/version.rb'
  154 + sh "git commit -m 'Bumping version #{new_version}'"
172 155 sh "touch tmp/pending-release"
173 156 else
174   - sh 'git checkout debian/changelog lib/noosfero.rb'
  157 + sh 'git checkout debian/changelog lib/noosfero/version.rb'
175 158 abort 'Version update not confirmed. Reverting changes and exiting...'
176 159 end
  160 +
  161 + $version = new_version
  162 + end
  163 +
  164 + task :check_release_deps do
  165 + missing = false
  166 + {
  167 + dput: :dput,
  168 + dch: :devscripts,
  169 + }.each do |program, package|
  170 + if ! system("which #{program} >/dev/null 2>&1")
  171 + puts "Program #{program} missing, install the package #{package}"
  172 + missing = true
  173 + end
  174 + end
  175 + abort if missing
177 176 end
178 177  
179 178 desc 'prepares a release tarball'
180   - task :release, :release_kind do |t, args|
181   - release_kind = args[:release_kind] || 'stable'
  179 + task :release, :target do |t, args|
  180 + target = args[:target]
  181 + if ! target
  182 + abort "Usage: rake noosfero:release[TARGET]"
  183 + end
  184 +
  185 + puts "==> Checking required packages"
  186 + Rake::Task['noosfero:check_release_deps'].invoke
182 187  
183 188 puts "==> Updating authors..."
184 189 Rake::Task['noosfero:authors'].invoke
185 190  
186   - Rake::Task['noosfero:set_version'].invoke(release_kind)
187   -
188   - puts "==> Checking tags..."
189   - Rake::Task['noosfero:check_tag'].invoke
190   -
191   - puts "==> Checking debian package version..."
192   - Rake::Task['noosfero:check_debian_package'].invoke
193   -
194 191 puts "==> Checking translations..."
195 192 Rake::Task['noosfero:error-pages:translate'].invoke
196 193 if !pendencies_on_public_errors[:ok]
197 194 commit_changes(['public/500.html', 'public/503.html'], 'Updating public error pages')
198 195 end
199 196  
  197 + Rake::Task['noosfero:set_version'].invoke(target)
  198 +
  199 + puts "==> Checking tags..."
  200 + Rake::Task['noosfero:check_tag'].invoke
  201 +
200 202 puts "==> Checking repository..."
201 203 Rake::Task['noosfero:check_repo'].invoke
202 204  
203 205 puts "==> Preparing debian packages..."
204 206 Rake::Task['noosfero:debian_packages'].invoke
205   - if confirm('Do you want to upload the packages')
206   - puts "==> Uploading debian packages..."
207   - Rake::Task['noosfero:upload_packages'].invoke(release_kind)
208   - end
209 207  
210   - sh "git tag #{version.gsub('~','-')}"
211   - push_tags = confirm('Push new version tag')
212   - if push_tags
  208 + sh "git tag #{$version.gsub('~','-')}"
  209 + if confirm('Push new version tag')
213 210 repository = ask('Repository name', 'origin')
214 211 puts "==> Uploading tags..."
215   - sh "git push #{repository} #{version.gsub('~','-')}"
  212 + sh "git push #{repository} #{$version.gsub('~','-')}"
216 213 end
217 214  
218   - sh "rm tmp/pending-release" if Dir["tmp/pending-release"].first.present?
  215 + if confirm('Do you want to upload the packages')
  216 + puts "==> Uploading debian packages..."
  217 + Rake::Task['noosfero:upload_packages'].invoke(target)
  218 + else
  219 + puts "I: please upload the package manually!"
  220 + end
219 221  
220   - puts "I: please upload the tarball and Debian packages to the website!"
221   - puts "I: please push the tag for version #{version} that was just created!" if !push_tags
222   - puts "I: notify the community about this sparkling new version!"
  222 + rm_f "rm tmp/pending-release"
223 223 end
224 224  
225 225 desc 'Build Debian packages'
226 226 task :debian_packages => :package do
227   - target = "pkg/noosfero-#{Noosfero::VERSION}"
  227 + target = "pkg/noosfero-#{$version}"
228 228  
229 229 # base pre-config
230 230 mkdir "#{target}/tmp"
... ... @@ -240,7 +240,7 @@ EOF
240 240 desc 'Test Debian package'
241 241 task 'debian:test' => :debian_packages do
242 242 Dir.chdir 'pkg' do
243   - rm_rf "noosfero-#{Noosfero::VERSION}"
  243 + rm_rf "noosfero-#{$version}"
244 244 sh 'apt-ftparchive packages . > Packages'
245 245 sh 'apt-ftparchive release . > Release'
246 246 end
... ...