Merge branch 'master' into next

Antonio Terceiro
2 parents d50a0b4f 936d1cae
Showing 5 changed files with 15 additions and 5 deletions Show diff stats
AUTHORS.md
debian/changelog
lib/noosfero/version.rb
lib/tasks/doc.rake
lib/tasks/error_messages.rake
@@ -92,6 +92,7 @@ Daniel Alves + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
 Daniel Bucher <daniel.bucher88@gmail.com>
 Daniel Cunha <daniel@colivre.coop.br>
+daniel <dtygel@eita.org.br>
 David Carlos <ddavidcarlos1392@gmail.com>
 diegoamc <diegoamc90@gmail.com>
 Diego Araújo + Alessandro Palmeira <diegoamc90@gmail.com>
@@ -120,6 +121,7 @@ Diego Araujo + Rodrigo Souto + Rafael Manzo &lt;rr.manzo@gmail.com&gt;
 Diego + Jefferson <diegoamc90@gmail.com>
 Diego Martinez <diegoamc90@gmail.com>
 Diego + Renan <renanteruoc@gmail.com>
+dtygel <dtygel@gmail.com>
 DylanGuedes <djmgguedes@gmail.com>
 Eduardo Passos <eduardo@risa.localdomain.localhost>
 Eduardo Passos <eduardosteps@gmail.com>
@@ -144,6 +146,7 @@ Italo Valcy &lt;italo@dcc.ufba.br&gt;
 Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes@gmail.com>
 Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes@gmail.com>
+Jérôme Jutteau <j.jutteau@gmail.com>
 João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo@gmail.com>
 João da Silva <jaodsilv@linux.ime.usp.br>
 João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv@linux.ime.usp.br>
@@ -247,8 +250,10 @@ Tallys Martins &lt;tallysmartins@gmail.com&gt;
 Tallys Martins <tallysmartins@yahoo.com.br>
 tallys <tallys@tallys>
 tallys <tallys@tallys.(none)>
+Thiago Casotti <thiago.casotti@uol.com.br>
 Thiago Zoroastro <thiago.zoroastro@bol.com.br>
 Tuux <tuxa@galaxie.eu.org>
+TWS <tablettws@gmail.com>
 Valessio Brito <contato@valessiobrito.com.br>
 Valessio Brito <contato@valessiobrito.info>
 Valessio Brito <valessio@gmail.com>
+noosfero (1.1) wheezy; urgency=low
+
+  * Noosfero 1.1 final release
+
+ -- Antonio Terceiro <terceiro@colivre.coop.br>  Mon, 04 May 2015 18:47:35 -0300
+
 noosfero (1.1~rc4) wheezy; urgency=medium
   * Fourth release candidate for Noosfero 1.1
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.1~rc4'
+  VERSION = '1.1'
 end
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -12,9 +12,8 @@ namespace :noosfero do
       end
     end
     task :unlink_plugins_textiles do
-      root = Pathname.new(File.dirname(__FILE__) + '/../..').expand_path
-      rm_f Dir.glob(root.join('doc/noosfero/plugins/*.textile')) -
-        [root.join('doc/noosfero/plugins/index.textile')]
+      rm_f Dir.glob('doc/noosfero/plugins/*.textile') -
+        ['doc/noosfero/plugins/index.textile']
     end
     input = Dir.glob('doc/noosfero/**/*.textile') + plugins_textiles.map{|i| "doc/noosfero/plugins/#{File.basename(i)}"}
     topics_xhtml = input.map { |item| item.sub('.textile', '.en.xhtml') }.uniq
@@ -4,7 +4,7 @@ targets = []
 templates.each do |template|
   target = template.gsub(/.erb$/, '')
   targets << target
-  file target => [:makemo, template] do
+  file target => [:makemo, template, :environment] do
     require 'erb'
     erb = ERB.new(File.read(template))
     File.open(target, 'w') do |file|
		1	+noosfero (1.1) wheezy; urgency=low
		2	+
		3	+ * Noosfero 1.1 final release
		4	+
		5	+ -- Antonio Terceiro <terceiro@colivre.coop.br> Mon, 04 May 2015 18:47:35 -0300
		6	+
1	noosfero (1.1~rc4) wheezy; urgency=medium	7	noosfero (1.1~rc4) wheezy; urgency=medium
2		8
3	* Fourth release candidate for Noosfero 1.1	9	* Fourth release candidate for Noosfero 1.1
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '1.1~rc4'	3	+ VERSION = '1.1'
4	end	4	end
5		5
6	root = File.expand_path(File.dirname(__FILE__) + '/../..')	6	root = File.expand_path(File.dirname(__FILE__) + '/../..')
	@@ -4,7 +4,7 @@ targets = []		@@ -4,7 +4,7 @@ targets = []
4	templates.each do \|template\|	4	templates.each do \|template\|
5	target = template.gsub(/.erb$/, '')	5	target = template.gsub(/.erb$/, '')
6	targets << target	6	targets << target
7	- file target => [:makemo, template] do	7	+ file target => [:makemo, template, :environment] do
8	require 'erb'	8	require 'erb'
9	erb = ERB.new(File.read(template))	9	erb = ERB.new(File.read(template))
10	File.open(target, 'w') do \|file\|	10	File.open(target, 'w') do \|file\|