Charles Oliveira / noosfero

14 Jan, 2015

1 commit

48c34b8c Merge branch 'master' into stable ... Browse Dir »
```
Conflicts:
	public/javascripts/application.js
```
Victor Costa
2015-01-14 17:55:35 -0300

12 Jan, 2015

1 commit

783dcf1e debian/control: tighten dependencies ... Browse Dir »
```
This should mitigate upgrade issues from squeeze when upgrading noosfero
without upgrading the entire system together.
```
Antonio Terceiro
2015-01-12 08:15:40 -0200

23 Dec, 2014

1 commit

1cd31972 Merge branch 'sanitize_comment' into stable Browse Dir »

Victor Costa
2014-12-23 11:00:08 -0300

22 Dec, 2014

2 commits

b1fb1825 Bumping version 1.0 Browse Dir »

Antonio Terceiro
2014-12-22 10:52:27 -0300
ec952935 Change default gravatar fallback ... Browse Dir »
```
wavatar produces shitty little monsters which is annoying
```
Antonio Terceiro
2014-12-22 10:57:00 -0200

18 Dec, 2014

1 commit

61b74832 Fix email addresses in changelog Browse Dir »

Antonio Terceiro
2014-12-18 18:00:03 -0200

20 Nov, 2014

1 commit

fb92dd6e Merge branch 'fix_role_edition' into stable Browse Dir »

Victor Costa
2014-11-20 11:37:58 -0300

19 Nov, 2014

2 commits

81e8bef0 debian: Remove test and cucumber sections from Gemfile Browse Dir »

Antonio Terceiro
2014-11-19 14:21:07 -0200
d5b1b9d8 Bumping version 1.0~rc4 Browse Dir »

Antonio Terceiro
2014-11-19 10:31:23 -0300

12 Nov, 2014

1 commit

63ed4135 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-11-12 12:34:02 -0300

10 Nov, 2014

2 commits

d0271b8a fix direction of symlink Browse Dir »

Antonio Terceiro
2014-11-10 19:11:52 -0200
2e3c97a0 Merge branch 'fix_notification_mail' into stable Browse Dir »

Victor Costa
2014-11-10 10:07:22 -0300

08 Nov, 2014

1 commit

0ee3ff4d debian/control: add dependency needed for spaminator plugin Browse Dir »

Antonio Terceiro
2014-11-08 21:27:21 -0200

28 Oct, 2014

1 commit

cde58fc4 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-10-28 09:34:50 -0300

27 Oct, 2014

2 commits

8fbadc47 debian/changelog: move 0.47.5 entry to its place Browse Dir »

Antonio Terceiro
2014-10-27 15:45:38 -0200
49ab47a7 Merge branch 'stable' ... Browse Dir »
```
Ignored changes on po file

Conflicts:
	debian/changelog
	lib/noosfero.rb
	po/pt/noosfero.po
```
Daniela Feitosa
2014-10-27 14:20:57 -0300

23 Oct, 2014

1 commit

c265f164 Bumping version 0.47.5 Browse Dir »

Daniela Feitosa
2014-10-23 02:25:36 +0000

30 Sep, 2014

1 commit

2efb80a2 Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	Gemfile
	Gemfile.lock
```
Victor Costa
2014-09-30 12:06:48 -0300

29 Sep, 2014

1 commit

f323c51d Improve interoperability with non-Debian environments ... Browse Dir »

Instead of freezing the Debian-specific dependency tree in Gemfile.lock,
let's specify the Debian versions with ~> in Gemfile, and let other
systems provide specific versions in the best way they can.

2014-09-29 13:46:51 -0300

26 Sep, 2014

1 commit

77fa2aec debian/control: bump dependency on rails Browse Dir »

Antonio Terceiro
2014-09-26 16:14:02 -0300

22 Sep, 2014

1 commit

9804917f Merge branch 'master' into rails3_stable ... Browse Dir »
```
Conflicts:
	Gemfile
	Gemfile.lock
	lib/tasks/gettext.rake
	test/unit/dates_helper_test.rb
```
Victor Costa
2014-09-22 16:38:12 -0300

12 Sep, 2014

6 commits

cb7466c4 Bumping version 1.0~rc3 Browse Dir »

Antonio Terceiro
2014-09-12 16:21:02 -0300
1f569f3a debian/crontol: add missing dependency Browse Dir »

Antonio Terceiro
2014-09-12 16:20:11 -0300

13cfe013 debian/control: Pre-Depend on the latest ruby1.8 ... Browse Dir »

This will force the latest ruby1.8 (which provides an alternative entry
for /usr/bin/ruby) to be configured before Noosfero is stopped.

This is hopefully the final touch to have clean upgrades from
squeeze+noosfero-0.47 to wheezy+noosfero-1.0, at least with regards to
proper package management.

2014-09-12 15:53:23 -0300

c98513a1 Revert "debian/control: fix upgrades from squeeze" ... Browse Dir »
```
This reverts commit 9acab92a5a40244819b27fd5d9cb4a6b71fcb575, which does
not fix anything. On the contrary, it makes the situation a lot worse.
```
Antonio Terceiro
2014-09-12 14:57:41 -0300

9acab92a debian/control: fix upgrades from squeeze ... Browse Dir »

We need ruby >= 1.9.3 to be already configured (hopefully) before even
starting to replace the old noosfero package; before ruby is fully
configured, there is no /usr/bin/ruby because of the update-alternatives
dance, which only finishes right before dpkg is done configuring ruby.

2014-09-12 14:54:43 -0300

cf457ea2 Bumping version 1.0~rc2 Browse Dir »

Antonio Terceiro
2014-09-12 14:54:43 -0300

11 Sep, 2014

1 commit

6bc2c9c5 Merge branch 'stable' into stable-merge ... Browse Dir »

Conflicts:
	AUTHORS
	app/controllers/public/content_viewer_controller.rb
	debian/changelog
	lib/noosfero.rb
	po/de/noosfero.po
	po/eo/noosfero.po
	po/es/noosfero.po
	po/fr/noosfero.po
	po/hy/noosfero.po
	po/it/noosfero.po
	po/noosfero.pot
	po/pt/noosfero.po
	po/ru/noosfero.po

2014-09-11 19:53:28 -0300