Download as
Browse Code »

Commit 173fc0716e38f4ddb72dd5c65695cc0efae93ad9

Authored by Weblate
2 parents 613d922b 666420f7
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge remote-tracking branch 'origin/master'

Showing 9 changed files with 41 additions and 23 deletions   Show diff stats
@@ -127,12 +127,14 @@ Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br> @@ -127,12 +127,14 @@ Eduardo Tourinho Edington <eduardo.edington@serpro.gov.br>
127 Evandro Jr <evandrojr@gmail.com> 127 Evandro Jr <evandrojr@gmail.com>
128 Evandro Junior <evandrojr@gmail.com> 128 Evandro Junior <evandrojr@gmail.com>
129 Fabio Teixeira <fabio1079@gmail.com> 129 Fabio Teixeira <fabio1079@gmail.com>
  130 +FAMMA TV NOTICIAS MEDIOS DE CO <revistafammatvmusic.oficial@gmail.com>
130 Fernanda Lopes <nanda.listas+psl@gmail.com> 131 Fernanda Lopes <nanda.listas+psl@gmail.com>
131 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br> 132 Francisco Marcelo A. Lima Júnior <francisco.lima-junior@serpro.gov.br>
132 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)> 133 Francisco Marcelo de Araujo Lima Junior <79350259591@serpro-1457614.(none)>
133 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br> 134 Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
134 Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com> 135 Francisco Marcelo de Araújo Lima Júnior <maljunior@gmail.com>
135 Gabriela Navarro <navarro1703@gmail.com> 136 Gabriela Navarro <navarro1703@gmail.com>
  137 +Gonzalo Exequiel Pedone <hipersayan.x@gmail.com>
136 Grazieno Pellegrino <grazieno@gmail.com> 138 Grazieno Pellegrino <grazieno@gmail.com>
137 Gust <darksshades@hotmail.com> 139 Gust <darksshades@hotmail.com>
138 Hebert Douglas <hebertdougl@gmail.com> 140 Hebert Douglas <hebertdougl@gmail.com>
@@ -200,10 +202,12 @@ Marcos &lt;marcos.rpj2@gmail.com&gt; @@ -200,10 +202,12 @@ Marcos &lt;marcos.rpj2@gmail.com&gt;
200 Marcos Ramos <ms.ramos@outlook.com> 202 Marcos Ramos <ms.ramos@outlook.com>
201 Martín Olivera <molivera@solar.org.ar> 203 Martín Olivera <molivera@solar.org.ar>
202 Maurilio Atila <cabelotaina@gmail.com> 204 Maurilio Atila <cabelotaina@gmail.com>
  205 +M for Momo <mo@rtnp.org>
203 Michal Čihař <michal@cihar.com> 206 Michal Čihař <michal@cihar.com>
204 Moises Machado <moises@colivre.coop.br> 207 Moises Machado <moises@colivre.coop.br>
205 Naíla Alves <naila@colivre.coop.br> 208 Naíla Alves <naila@colivre.coop.br>
206 Nanda Lopes <nanda.listas+psl@gmail.com> 209 Nanda Lopes <nanda.listas+psl@gmail.com>
  210 +Niemand Jedermann <predatorix@web.de>
207 Parley Martins <parleypachecomartins@gmail.com> 211 Parley Martins <parleypachecomartins@gmail.com>
208 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org> 212 Paulo Meirelles + Alessandro Palmeira + João M. M. da Silva <paulo@softwarelivre.org>
209 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org> 213 Paulo Meirelles + Alessandro Palmeira <paulo@softwarelivre.org>
@@ -244,6 +248,7 @@ Tallys Martins &lt;tallysmartins@yahoo.com.br&gt; @@ -244,6 +248,7 @@ Tallys Martins &lt;tallysmartins@yahoo.com.br&gt;
244 tallys <tallys@tallys> 248 tallys <tallys@tallys>
245 tallys <tallys@tallys.(none)> 249 tallys <tallys@tallys.(none)>
246 Thiago Zoroastro <thiago.zoroastro@bol.com.br> 250 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
  251 +Tuux <tuxa@galaxie.eu.org>
247 Valessio Brito <contato@valessiobrito.com.br> 252 Valessio Brito <contato@valessiobrito.com.br>
248 Valessio Brito <contato@valessiobrito.info> 253 Valessio Brito <contato@valessiobrito.info>
249 Valessio Brito <valessio@gmail.com> 254 Valessio Brito <valessio@gmail.com>
Rakefile.release 0 → 100644
  Diff comments   View file @173fc07
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
  1 +# This Rakefile is intentionally independent from Rails to it can be used to
  2 +# handle release-related tasks without having to load the entire Rails
  3 +# environment (which is slow, requires a database connection and several other
  4 +# inconveniences).
  5 +
  6 +$: << 'lib'
  7 +require 'noosfero'
  8 +require 'noosfero/version'
  9 +
  10 +load 'lib/tasks/gettext.rake'
  11 +load 'lib/tasks/doc.rake'
  12 +load 'lib/tasks/error_messages.rake'
  13 +load 'lib/tasks/translation.rake'
  14 +
  15 +load 'lib/tasks/package.rake'
  16 +load 'lib/tasks/release.rake'
  17 +
  18 +task :default => 'noosfero:translations:compile'
Rakefile.translations
View file @613d922
@@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
1 -# This Rakefile is intentionally independent from Rails to it can be used to  
2 -# handle translations without having to load the entire Rails environment  
3 -# (which is slow, requires a database connection and several other  
4 -# inconveniences).  
5 -  
6 -$: << 'lib'  
7 -load 'lib/tasks/gettext.rake'  
8 -load 'lib/tasks/doc.rake'  
9 -load 'lib/tasks/translation.rake'  
10 -  
11 -task :default => 'noosfero:translations:compile'  
debian/changelog
  Diff comments   View file @173fc07
  1 +noosfero (1.1~rc2) wheezy; urgency=low
  2 +
  3 + * Second release candidate for Noosfero 1.1
  4 +
  5 + -- Antonio Terceiro <terceiro@colivre.coop.br> Mon, 09 Mar 2015 12:47:39 -0300
  6 +
1 noosfero (1.1~rc1) wheezy; urgency=low 7 noosfero (1.1~rc1) wheezy; urgency=low
2 8
3 * First release candidate for Noosfero 1.1 9 * First release candidate for Noosfero 1.1
@@ -33,4 +33,4 @@ override_dh_clean: @@ -33,4 +33,4 @@ override_dh_clean:
33 33
34 override_dh_auto_build: 34 override_dh_auto_build:
35 dh_auto_build 35 dh_auto_build
36 - rake noosfero:translations:compile > /dev/null 36 + rake -f Rakefile.release > /dev/null
lib/noosfero/version.rb
  Diff comments   View file @173fc07
1 module Noosfero 1 module Noosfero
2 PROJECT = 'noosfero' 2 PROJECT = 'noosfero'
3 - VERSION = '1.1~rc1' 3 + VERSION = '1.1~rc2'
4 end 4 end
5 5
6 root = File.expand_path(File.dirname(__FILE__) + '/../..') 6 root = File.expand_path(File.dirname(__FILE__) + '/../..')
7 if File.exist?(File.join(root, '.git')) 7 if File.exist?(File.join(root, '.git'))
8 - Noosfero::VERSION.clear << Dir.chdir(root) { `git describe --tags`.strip } 8 + Noosfero::VERSION.clear << Dir.chdir(root) { `git describe --tags`.strip.sub('-rc', '~rc') }
9 end 9 end
lib/tasks/error_messages.rake
  Diff comments   View file @173fc07
1 -templates = Dir.glob(Rails.root.join('public', '*.html.erb')) 1 +root = Pathname(File.dirname(__FILE__)).join('../../').expand_path
  2 +templates = Dir.glob(root.join('public', '*.html.erb'))
2 targets = [] 3 targets = []
3 templates.each do |template| 4 templates.each do |template|
4 target = template.gsub(/.erb$/, '') 5 target = template.gsub(/.erb$/, '')
@@ -16,6 +17,6 @@ end @@ -16,6 +17,6 @@ end
16 namespace :noosfero do 17 namespace :noosfero do
17 namespace 'error-pages' do 18 namespace 'error-pages' do
18 desc 'Translates Noosfero error pages' 19 desc 'Translates Noosfero error pages'
19 - task :translate => [:environment] + targets 20 + task :translate => targets
20 end 21 end
21 end 22 end
lib/tasks/package.rake
  Diff comments   View file @173fc07
1 -  
2 desc "Generate source tarball" 1 desc "Generate source tarball"
3 task :package => 'package:clobber' do 2 task :package => 'package:clobber' do
4 require_dependency 'noosfero' 3 require_dependency 'noosfero'
lib/tasks/release.rake
  Diff comments   View file @173fc07
1 # encoding: UTF-8 1 # encoding: UTF-8
2 2
3 -require 'noosfero/version'  
4 $version = Noosfero::VERSION 3 $version = Noosfero::VERSION
5 4
6 namespace :noosfero do 5 namespace :noosfero do
@@ -132,13 +131,13 @@ EOF @@ -132,13 +131,13 @@ EOF
132 131
133 if target =~ /-test$/ 132 if target =~ /-test$/
134 if new_version =~ /~rc\d+/ 133 if new_version =~ /~rc\d+/
135 - new_version.sub!(/\~rc([0-9]+)/) { "~rc#{$1.to_i + 1}" } 134 + new_version.sub!(/\~rc([0-9]+).*/) { "~rc#{$1.to_i + 1}" }
136 else 135 else
137 new_version += '~rc1' 136 new_version += '~rc1'
138 end 137 end
139 else 138 else
140 - if new_version =~ /~rc\d+/  
141 - new_version.sub!(/~rc[0-9]+/, '') 139 + if new_version =~ /~rc\d+.*/
  140 + new_version.sub!(/~rc[0-9]+.*/, '')
142 else 141 else
143 components = new_version.split('.').map(&:to_i) 142 components = new_version.split('.').map(&:to_i)
144 if components.size < 3 143 if components.size < 3
@@ -158,9 +157,10 @@ EOF @@ -158,9 +157,10 @@ EOF
158 sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{new_version}'/\" lib/noosfero/version.rb" 157 sh "sed -i \"s/VERSION = '[^']*'/VERSION = '#{new_version}'/\" lib/noosfero/version.rb"
159 ENV['DEBFULLNAME'] ||= `git config user.name`.strip 158 ENV['DEBFULLNAME'] ||= `git config user.name`.strip
160 ENV['DEBEMAIL'] ||= `git config user.email`.strip 159 ENV['DEBEMAIL'] ||= `git config user.email`.strip
161 - sh "dch --newversion #{new_version} --distribution #{target} --force-distribution '#{release_message}'" 160 + distribution = `dpkg-parsechangelog | sed '/Distribution:/!d; s/^.*:\s*//'`.strip
  161 + sh "dch --newversion #{new_version} --distribution #{distribution} --force-distribution '#{release_message}'"
162 162
163 - sh 'git diff debian/changelog lib/noosfero/version.rb' 163 + sh 'git diff --color debian/changelog lib/noosfero/version.rb'
164 if confirm("Commit version bump to #{new_version} on #{target} distribution") 164 if confirm("Commit version bump to #{new_version} on #{target} distribution")
165 sh 'git add debian/changelog lib/noosfero/version.rb' 165 sh 'git add debian/changelog lib/noosfero/version.rb'
166 sh "git commit -m 'Bumping version #{new_version}'" 166 sh "git commit -m 'Bumping version #{new_version}'"