[noosfero/noosfero][next] 5 commits: Updating authors file
Antonio Terceiro
gitlab at gitlab.com
Mon May 4 20:00:02 BRT 2015
Antonio Terceiro pushed to branch next at Noosfero / noosfero
Commits:
7603db29 by Antonio Terceiro at 2015-05-04T17:57:31Z
Updating authors file
- - - - -
efcf512c by Antonio Terceiro at 2015-05-04T18:44:40Z
noosfero:doc:clean: don't remove core documentation
- - - - -
1b7a58a7 by Antonio Terceiro at 2015-05-04T18:44:58Z
Fix `rake noosfero:error-pages:translate`
- - - - -
936d1cae by Antonio Terceiro at 2015-05-04T18:47:51Z
Bumping version 1.1
- - - - -
ee712409 by Antonio Terceiro at 2015-05-04T19:59:16Z
Merge branch 'master' into next
- - - - -
5 changed files:
- AUTHORS.md
- debian/changelog
- lib/noosfero/version.rb
- lib/tasks/doc.rake
- lib/tasks/error_messages.rake
Changes:
=====================================
AUTHORS.md
=====================================
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -92,6 +92,7 @@ Daniel Alves + Rafael Manzo <rr.manzo at gmail.com>
Daniela Soares Feitosa <danielafeitosa at colivre.coop.br>
Daniel Bucher <daniel.bucher88 at gmail.com>
Daniel Cunha <daniel at colivre.coop.br>
+daniel <dtygel at eita.org.br>
David Carlos <ddavidcarlos1392 at gmail.com>
diegoamc <diegoamc90 at gmail.com>
Diego Araújo + Alessandro Palmeira <diegoamc90 at gmail.com>
@@ -120,6 +121,7 @@ Diego Araujo + Rodrigo Souto + Rafael Manzo <rr.manzo at gmail.com>
Diego + Jefferson <diegoamc90 at gmail.com>
Diego Martinez <diegoamc90 at gmail.com>
Diego + Renan <renanteruoc at gmail.com>
+dtygel <dtygel at gmail.com>
DylanGuedes <djmgguedes at gmail.com>
Eduardo Passos <eduardo at risa.localdomain.localhost>
Eduardo Passos <eduardosteps at gmail.com>
@@ -144,6 +146,7 @@ Italo Valcy <italo at dcc.ufba.br>
Jefferson Fernandes + Diego Araujo + Rafael Manzo <jeffs.fernandes at gmail.com>
Jefferson Fernandes + Joao M. M. da Silva <jeffs.fernandes at gmail.com>
Jefferson Fernandes + Joao M. M. Silva <jeffs.fernandes at gmail.com>
+Jérôme Jutteau <j.jutteau at gmail.com>
João da Silva + Eduardo Morais + Rafael Manzo <rr.manzo at gmail.com>
João da Silva <jaodsilv at linux.ime.usp.br>
João Marco Maciel da Silva + Rafael Manzo + Renan Teruo <jaodsilv at linux.ime.usp.br>
@@ -247,8 +250,10 @@ Tallys Martins <tallysmartins at gmail.com>
Tallys Martins <tallysmartins at yahoo.com.br>
tallys <tallys at tallys>
tallys <tallys at tallys.(none)>
+Thiago Casotti <thiago.casotti at uol.com.br>
Thiago Zoroastro <thiago.zoroastro at bol.com.br>
Tuux <tuxa at galaxie.eu.org>
+TWS <tablettws at gmail.com>
Valessio Brito <contato at valessiobrito.com.br>
Valessio Brito <contato at valessiobrito.info>
Valessio Brito <valessio at gmail.com>
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+noosfero (1.1) wheezy; urgency=low
+
+ * Noosfero 1.1 final release
+
+ -- Antonio Terceiro <terceiro at 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
=====================================
lib/noosfero/version.rb
=====================================
--- a/lib/noosfero/version.rb
+++ b/lib/noosfero/version.rb
@@ -1,6 +1,6 @@
module Noosfero
PROJECT = 'noosfero'
- VERSION = '1.1~rc4'
+ VERSION = '1.1'
end
root = File.expand_path(File.dirname(__FILE__) + '/../..')
=====================================
lib/tasks/doc.rake
=====================================
--- a/lib/tasks/doc.rake
+++ b/lib/tasks/doc.rake
@@ -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
=====================================
lib/tasks/error_messages.rake
=====================================
--- a/lib/tasks/error_messages.rake
+++ b/lib/tasks/error_messages.rake
@@ -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|
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/d50a0b4f5e7bc68ac7e6dc753fad790dbfa16aa9...ee712409e0385611d080e9ee05d8927c3b7676f7
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150504/e98e0fc7/attachment-0001.html>
More information about the Noosfero-dev
mailing list