Software Publico / Noosfero

22 Jan, 2014

1 commit

6abd4658 rails3: fix mass-assignment errors on functional tests Browse Dir »

Victor Costa
2014-01-22 16:40:47 -0300

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse Dir »

Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb

2014-01-09 15:17:55 +0000

06 Jan, 2014

2 commits

4ee05c1c Filter only profile related roles Browse Dir »

Larissa Reis
2014-01-06 15:55:20 -0300
ab843111 Merge remote-tracking branch 'larissa/filter-communities' into filter-communities ... Browse Dir »
```
Conflicts:
	test/functional/memberships_controller_test.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-06 17:56:58 +0000

12 Dec, 2013

1 commit

d74aa7ba blog: add cover image for blog ... Browse Dir »

(ActionItem2849)

Signed-off-by: Marcos Ramos <ms.ramos@outlook.com
Signed-off-by: Valéssio Brito <contato@valessiobrito.com.br>
Signed-off-by: Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>

2013-12-12 16:26:28 -0200

25 Nov, 2013

3 commits

88549694 Cosmetics improvements ... Browse Dir »
```
- Added translation markup
- Fixed indentation
- css of link

(ActionItem2875)
```
Daniela Feitosa
2013-11-25 12:24:36 +0000
6c01c176 Fixed: message on notice after configure homepage ... Browse Dir »
```
(ActionItem2875)
```
Daniela Feitosa
2013-11-25 11:47:35 +0000
3f27e6f1 Merge commit 'refs/merge-requests/417' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/417
```
Daniela Feitosa
2013-11-25 09:50:27 +0000

21 Nov, 2013

1 commit

a67cc855 Adding Community Track Plugin Browse Dir »

Leandro Nunes dos Santos
2013-11-21 17:43:37 +0000

20 Nov, 2013

2 commits

8690de54 refactoring set_homepage method Browse Dir »

Leandro Nunes dos Santos
2013-11-20 17:46:18 -0300
83fd2007 Change the Content Management form to allow the reset of the profile's homepage. Browse Dir »

Leandro Nunes dos Santos
2013-11-20 17:13:40 -0300

23 Oct, 2013

1 commit

389f1db0 Adds filter by role in memberships listing Browse Dir »

Larissa Reis
2013-10-23 13:23:10 -0300

14 Oct, 2013

1 commit

44627b4a use anti_spam plugin in suggest_articles ... Browse Dir »
```
ActionItem2691
```
Lucas Melo
2013-10-14 19:29:05 +0000

09 Oct, 2013

1 commit

e5dfdd15 rails3: fix community tests ... Browse Dir »
```
PS: still failing on test related to
ActionTracker::Record#current_user_from_model
```
Rodrigo Souto
2013-10-09 17:17:34 +0000

07 Oct, 2013

1 commit

e7aa3273 Merge commit 'refs/merge-requests/328' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/328

Conflicts:
	app/controllers/public/catalog_controller.rb
```
Rodrigo Souto
2013-10-07 16:28:47 -0300

11 Jul, 2013

1 commit

5e9787c8 Merge commit 'refs/merge-requests/291' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/291
```
Rodrigo Souto
2013-07-11 13:14:56 -0300

01 Jun, 2013

1 commit

5a86933d Translate disable_products_for_enterprises_enabled env setting ... Browse Dir »

The disable_* settings for environment are incoherent with the
user interface and with the code itself. This changes correct
only one incoherent setting as an example how to do with all
others.

2013-06-01 09:54:17 -0300

07 May, 2013

1 commit

b2a0c431 Merge branch 'master' into pluginize-solr ... Browse Dir »
```
Conflicts:
	app/models/article.rb
	app/views/layouts/application-ng.rhtml
	lib/noosfero/plugin.rb
	script/noosfero-plugins
```
Rodrigo Souto
2013-05-07 13:36:10 -0300