NoosferoGov / noosfero

30 Sep, 2014

2 commits

edb151a8 Merge branch 'AI3220_proposals' into rails3_stable Browse Code »

Victor Costa
2014-09-30 09:48:34 -0300
dc4cecf1 proposals_discussion: fix new proposal height Browse Code »

Victor Costa
2014-09-30 09:48:12 -0300

26 Sep, 2014

6 commits

d12e9070 Merge branch 'AI3220_proposals' into rails3_stable Browse Code »

Victor Costa
2014-09-26 15:07:41 -0300
7743caf8 proposals_discussiom: hide default topic title only Browse Code »

Victor Costa
2014-09-26 15:07:24 -0300
4f827a17 Merge branch 'AI3220_proposals' into rails3_stable Browse Code »

Victor Costa
2014-09-26 15:03:02 -0300
70498559 proposals_discussion: fix css Browse Code »

Victor Costa
2014-09-26 15:02:48 -0300
faa13355 Merge branch 'rails3-custom_fields' into rails3_stable Browse Code »

Victor Costa
2014-09-26 13:54:11 -0300
fa694deb Merge branch 'master' into rails3_stable Browse Code »

Victor Costa
2014-09-26 13:29:29 -0300

25 Sep, 2014

3 commits

bda87f25 noosfero-plugins: resist incomplete /etc/default/noosfero Browse Code »

Antonio Terceiro
2014-09-25 12:20:59 -0300
b76a4336 Merge branch 'rails3_community_dashboard' into rails3_stable ... Browse Code »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
```
Victor Costa
2014-09-25 11:43:30 -0300
e37bc72b community_dashboard: fix view_page Browse Code »

Victor Costa
2014-09-25 11:41:22 -0300

24 Sep, 2014

8 commits

3734298f Merge branch 'ai3293' into 'master' ... Browse Code »
```
Upgrade solr plugin to rails3

http://noosfero.org/Development/ActionItem3293

See merge request !321
```
Antonio Terceiro
2014-09-24 21:36:10 +0000
df002879 ArticleTest: another attempt at fixing this fragile test Browse Code »

Antonio Terceiro
2014-09-24 18:12:36 -0300
d9f771c3 Fix broken test Browse Code »

Antonio Terceiro
2014-09-24 15:02:10 -0300
84b5bdee ackrc: don't search under cached assets Browse Code »

Antonio Terceiro
2014-09-24 14:53:38 -0300
143bd4b0 Add piwik of estatisticas.presidencia.gov.br Browse Code »

Victor Costa
2014-09-24 13:03:53 -0300
c50b4ad8 Avoid infinite loop with person notification Browse Code »

Victor Costa
2014-09-24 12:56:01 -0300
0cd81fcc Fix article rendering for UploadedFile Browse Code »

Victor Costa
2014-09-24 12:54:38 -0300
299fbfe0 Fix the path order to search for partial views Browse Code »

Victor Costa
2014-09-24 12:52:40 -0300

23 Sep, 2014

2 commits

e1fa81e8 Merge branch 'fix_template_with_container_block' into rails3_stable Browse Code »

Victor Costa
2014-09-23 16:17:44 -0300
df2206b2 container_block: fix the use of container blocks with templates ... Browse Code »
```
fixes #7
```
Victor Costa
2014-09-23 16:16:29 -0300

22 Sep, 2014

5 commits

7205d162 Merge branch 'rails3_community_dashboard' into rails3_stable Browse Code »

Victor Costa
2014-09-22 17:43:57 -0300
f08ab7d7 community_hub: fix mediation tab Browse Code »

Victor Costa
2014-09-22 17:43:22 -0300
3fc4365b Merge branch 'AI3220_proposals' into rails3_stable Browse Code »

Victor Costa
2014-09-22 16:42:43 -0300
9804917f Merge branch 'master' into rails3_stable ... Browse Code »
```
Conflicts:
	Gemfile
	Gemfile.lock
	lib/tasks/gettext.rake
	test/unit/dates_helper_test.rb
```
Victor Costa
2014-09-22 16:38:12 -0300
0a52b558 proposals_discussion: fix infinite loading bug Browse Code »

Victor Costa
2014-09-22 15:56:56 -0300

19 Sep, 2014

2 commits

b1d08c1c solr-plugin: port to rails 3 Browse Code »

Braulio Bhavamitra
2014-09-19 22:24:27 -0300
bcd5cd44 Update acts_as_solr_reloaded Browse Code »

Braulio Bhavamitra
2014-09-19 22:24:21 -0300

18 Sep, 2014

3 commits

50c2d5c8 Merge branch 'AI3292_signup_image_upload' into 'master' ... Browse Code »
```
Ai3292 signup image upload

Action Item: http://noosfero.org/Development/ActionItem3292

See merge request !318
```
Antonio Terceiro
2014-09-18 19:42:39 +0000
b10e27f5 cucumber: don't output ANSI escapes to non-terminals Browse Code »

Antonio Terceiro
2014-09-18 15:50:43 -0300
08b0c25c ProfileInfoBlockTest: remove useless test Browse Code »

Antonio Terceiro
2014-09-18 15:42:39 -0300

17 Sep, 2014

1 commit

d50d9438 bug fixes Browse Code »

Francisco Júnior
2014-09-17 16:54:13 -0300

16 Sep, 2014

1 commit

5f7d75d5 script/quick-start: don't throw ANSI escapes at non-terminals Browse Code »

Antonio Terceiro
2014-09-16 11:41:36 -0300

15 Sep, 2014

2 commits

8ee125a8 signup_image_upload: Add image on user signup ... Browse Code »

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-09-15 15:56:21 -0300

dfe39540 signup_image_upload: Put file_field as a optional_field. ... Browse Code »
```
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
```
David Silva
2014-09-15 14:23:04 -0300

12 Sep, 2014

5 commits

a405a4a6 release: ask before creating tags Browse Code »

Antonio Terceiro
2014-09-12 17:00:38 -0300
cb7466c4 Bumping version 1.0~rc3 Browse Code »

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

Antonio Terceiro
2014-09-12 16:20:11 -0300
c28187ff release: actually allow to override the suggested version Browse Code »

Antonio Terceiro
2014-09-12 16:02:18 -0300

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

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