Download as
Browse Code »

Commit 0e51eedb526bb5d752f0694a2d3658b8d8945cbe

Authored by Antonio Terceiro
2 parents 71949171 be752827
Exists in staging and in 37 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

Merge tag '1.4-rc2' 

Noosfero 1.4~rc2
Showing 4 changed files with 10 additions and 1 deletions   Show diff stats
@@ -11,6 +11,7 @@ Developers @@ -11,6 +11,7 @@ Developers
11 Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br> 11 Ábner Silva de Oliveira <abner.oliveira@serpro.gov.br>
12 Alan Freihof Tygel <alantygel@gmail.com> 12 Alan Freihof Tygel <alantygel@gmail.com>
13 Alessandro Palmeira <alessandro.palmeira@gmail.com> 13 Alessandro Palmeira <alessandro.palmeira@gmail.com>
  14 +Alexandre Barbosa <alexandreab@live.com>
14 Alexandre Torres <alexandrekry@gmail.com> 15 Alexandre Torres <alexandrekry@gmail.com>
15 Alex Campelo <campelo.al1@gmail.com> 16 Alex Campelo <campelo.al1@gmail.com>
16 Álvaro Fernando <alvarofernandoms@gmail.com> 17 Álvaro Fernando <alvarofernandoms@gmail.com>
@@ -120,6 +121,7 @@ Raquel &lt;rcordioli@gmail.com&gt; @@ -120,6 +121,7 @@ Raquel &lt;rcordioli@gmail.com&gt;
120 Renan Costa <renan2727@hotmail.com> 121 Renan Costa <renan2727@hotmail.com>
121 Renan Teruo <renanteruoc@gmail.com> 122 Renan Teruo <renanteruoc@gmail.com>
122 Rodrigo Medeiros <rodrigo.mss01@gmail.com> 123 Rodrigo Medeiros <rodrigo.mss01@gmail.com>
  124 +Rodrigo Siqueira <siqueira@kuniri.org>
123 Rodrigo Souto <rodrigo@colivre.coop.br> 125 Rodrigo Souto <rodrigo@colivre.coop.br>
124 Ronnie Simon <ronniesimonf@gmail.com> 126 Ronnie Simon <ronniesimonf@gmail.com>
125 Ronny Kursawe <kursawe.ronny@googlemail.com> 127 Ronny Kursawe <kursawe.ronny@googlemail.com>
debian/changelog
  Diff comments   View file @0e51eed
  1 +noosfero (1.4~rc2) jessie-test; urgency=medium
  2 +
  3 + * Noosfero 1.4 RC2
  4 +
  5 + -- Antonio Terceiro <terceiro@colivre.coop.br> Tue, 26 Jan 2016 17:03:34 -0200
  6 +
1 noosfero (1.4~rc1) jessie-test; urgency=low 7 noosfero (1.4~rc1) jessie-test; urgency=low
2 8
3 * Noosfero 1.4 RC 0 9 * Noosfero 1.4 RC 0
lib/noosfero/version.rb
  Diff comments   View file @0e51eed
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '1.4~rc1' 3 + VERSION = '1.4~rc2'
4 end 4 end
5 5
6 root = File.expand_path(File.dirname(__FILE__) + '/../..') 6 root = File.expand_path(File.dirname(__FILE__) + '/../..')
script/authors.sed
  Diff comments   View file @0e51eed
@@ -168,6 +168,7 @@ s/macartur.sc@gmail.com$/macartur.sc@gmail.com&gt;/ @@ -168,6 +168,7 @@ s/macartur.sc@gmail.com$/macartur.sc@gmail.com&gt;/
168 168
169 s/Marcos da Silva Ramos <ms.ramos@outlook.com>/Marcos Ramos <ms.ramos@outlook.com>/ 169 s/Marcos da Silva Ramos <ms.ramos@outlook.com>/Marcos Ramos <ms.ramos@outlook.com>/
170 s/Marcos Ramos <ms.ramos@outlook.com$/Marcos Ramos <ms.ramos@outlook.com>/ 170 s/Marcos Ramos <ms.ramos@outlook.com$/Marcos Ramos <ms.ramos@outlook.com>/
  171 +s/msramos@outlook.com/ms.ramos@outlook.com/
171 s/Marcos <marcos.rpj2@gmail.com>/Marcos Ronaldo <marcos.rpj2@gmail.com>/ 172 s/Marcos <marcos.rpj2@gmail.com>/Marcos Ronaldo <marcos.rpj2@gmail.com>/
172 173
173 s/melissa@colivre.coop.br/melissa.srw@gmail.com/ 174 s/melissa@colivre.coop.br/melissa.srw@gmail.com/