Software Publico / Noosfero

22 Jan, 2013

1 commit

fb699ea1 Adding honeypot plugin Browse Dir »

Rodrigo Souto
2013-01-22 23:04:17 +0000

19 Jan, 2013

3 commits

72ae13eb Bumping version to 0.40.0 Browse Dir »

Rodrigo Souto
2013-01-19 21:59:01 +0000
4e1edc60 Merge branch 'stable' Browse Dir »

Rodrigo Souto
2013-01-19 21:25:45 +0000
38b450a5 Bumping version to 0.39.3 Browse Dir »

Rodrigo Souto
2013-01-19 21:04:45 +0000

17 Jan, 2013

1 commit

8f69c31b Merge branch 'redemoinho-improvements' ... Browse Dir »

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/lib/shopping_cart_plugin.rb
	plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
	plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb

2013-01-17 00:56:16 +0000

16 Jan, 2013

2 commits

fad353e4 Passing only product to asset_product_extras hotspot Browse Dir »

Rodrigo Souto
2013-01-16 19:27:24 +0000
8f4b2c3d Bumping to version 0.39.2 Browse Dir »

Rodrigo Souto
2013-01-16 18:38:26 +0000

03 Jan, 2013

1 commit

44a21bb9 Merge branch 'master' into redemoinho-improvements Browse Dir »

Rodrigo Souto
2013-01-03 18:53:09 -0300

20 Dec, 2012

1 commit

c305f512 Bumping version number Browse Dir »

Daniela Feitosa
2012-12-20 15:48:47 -0200

07 Dec, 2012

1 commit

82ae16fc Bumping version number Browse Dir »

Daniela Feitosa
2012-12-07 09:57:29 -0200

03 Dec, 2012

3 commits

9128b0ff Fixing merge mistake Browse Dir »

Rodrigo Souto
2012-12-03 16:53:49 +0000
53d8ceb4 Merge branch 'merge-requests/248' into redemoinho ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin/settings.rb
	test/unit/plugin_settings_test.rb
```
Rodrigo Souto
2012-12-03 13:34:00 -0300
45b48472 Merge commit 'refs/merge-requests/248' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/248

Conflicts:
	app/models/person.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css
	test/functional/catalog_controller_test.rb
```
Rodrigo Souto
2012-12-03 15:19:34 +0000

30 Nov, 2012

1 commit

e17f85d6 Creating generic settings for plugins (moving part of it from AntiSpam Plugin) Browse Dir »

Rodrigo Souto
2012-11-30 12:35:34 -0200

01 Nov, 2012

1 commit

45e5189b Merge branch 'work-assignment' into features ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/functional/cms_controller_test.rb
	test/unit/article_test.rb
```
Rodrigo Souto
2012-11-01 18:51:32 -0200

25 Oct, 2012

2 commits

7911d32b Extending hotspot for removing new and upload buttons from article actions Browse Dir »

Rodrigo Souto
2012-10-25 18:04:20 +0000
518ec830 Merge commit 'refs/merge-requests/233' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/233

Conflicts:
	test/integration/routing_test.rb
```
Daniela Feitosa
2012-10-25 00:39:00 -0200

24 Oct, 2012

1 commit

2536d367 Improving new content hotspot description Browse Dir »

Rodrigo Souto
2012-10-24 16:57:39 -0200

22 Oct, 2012

1 commit

7843b795 Generic Settings for Plugins ... Browse Dir »

This patch extends the infra developed on the spaminator branch to build
generic settings for plugin by allowing the setting to be instatiated
with any model that supports settings (and respond to the method
settings).

This way a plugin can have any number of settings over any model
instance like a Profile or an Article and not only the Environment.

!! This might conflict with the commit that introduces this idea !!
!! The commit is 7afc68410de26905e442714857effa3e3a13ad1a        !!

2012-10-22 19:03:06 +0000

21 Oct, 2012

1 commit

7bac7ef7 adding some hotspots to make the openid plugin works. Browse Dir »

Leandro Nunes dos Santos
2012-10-21 18:42:30 -0200

15 Oct, 2012

2 commits

c23f40da Removed whitespaces Browse Dir »

Daniela Feitosa
2012-10-15 16:52:59 -0300
1ccb62af Merge commit 'refs/merge-requests/218' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/218

Conflicts:
	lib/noosfero/plugin.rb
```
Daniela Feitosa
2012-10-15 16:52:53 -0300

07 Oct, 2012

1 commit

fc8557c3 Merge commit 'refs/merge-requests/213' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/213

Conflicts:
	app/controllers/application_controller.rb
	app/helpers/application_helper.rb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/view_page.rhtml
	lib/noosfero/plugin.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/comment_test.rb

2012-10-07 01:08:23 -0300