Thiago Ribeiro / Noosfero

17 Apr, 2013

2 commits

97fe0f50 Fixing master tests after merge with stable Browse Dir »

Rodrigo Souto
2013-04-17 22:16:28 -0300

527ee379 Merge branch 'stable' ... Browse Dir »

Basically html_safe in some places that the stable branch had.

Conflicts:
	app/models/article_block.rb
	app/models/tags_block.rb

2013-04-17 17:12:26 -0300

15 Apr, 2013

1 commit

09dd907e Just changing the tempalates named_scope to receive environment instead of environment_id Browse Dir »

Rodrigo Souto
2013-04-15 15:12:01 -0300

12 Apr, 2013

1 commit

3599b17b Restricting template alternatives to those inside the current environment ... Browse Dir »
```
ActionItem2608
```
Visita
2013-04-12 19:40:37 -0300

10 Apr, 2013

1 commit

1df7a3b9 Escaping title html in block_helper::block_title() ... Browse Dir »
```
ActionItem2632
```
Visita
2013-04-10 12:19:01 -0300

09 Apr, 2013

1 commit

cd916007 Adding support to choose which attributes will be displayed Browse Dir »

Leandro Nunes dos Santos
2013-04-09 13:39:25 -0300

04 Apr, 2013

1 commit

46095aa0 Show only text article and folders on tree content Browse Dir »

Leandro Nunes dos Santos
2013-04-04 17:23:40 -0300

03 Apr, 2013

4 commits

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

Conflicts:
	test/unit/application_helper_test.rb
```
Rodrigo Souto
2013-04-03 21:51:17 -0300
c4fe95aa Fixing conflicting link_to_article method signature Browse Dir »

Rodrigo Souto
2013-04-03 21:46:20 -0300
1d0e84f4 Fixing short html article test Browse Dir »

Rodrigo Souto
2013-04-03 20:36:23 -0300
3ea04c54 Merge commit 'refs/merge-requests/188' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/188
```
Rodrigo Souto
2013-04-03 19:41:21 -0300

28 Mar, 2013

3 commits

aaccd5c4 makes Article::to_html finally configurable Browse Dir »

Aurélio A. Heckert
2013-03-28 22:43:45 -0300
76ea3016 move display_short_format to the generic ApplicationHelper Browse Dir »

Aurélio A. Heckert
2013-03-28 22:38:01 -0300
0f6edf86 condensed date periods Browse Dir »

Aurélio A. Heckert
2013-03-28 21:59:33 -0300

15 Mar, 2013

2 commits

c6bf7b15 Merge commit 'refs/merge-requests/253' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/253
```
Rodrigo Souto
2013-03-15 20:07:18 -0300
94a1c70a Merge commit 'refs/merge-requests/171' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/171
```
Rodrigo Souto
2013-03-15 20:43:42 +0000

14 Mar, 2013

1 commit

b931c603 Fixed bug when sending email to community members ... Browse Dir »
```
(ActionItem2618)
```
Daniela Feitosa
2013-03-14 15:11:31 -0300

07 Mar, 2013

1 commit

067f66a9 Fixing article author test Browse Dir »

Rodrigo Souto
2013-03-07 18:35:12 +0000

06 Feb, 2013

1 commit

4de6c173 Filter useful folders to upload images and pre-select a gallery ... Browse Dir »
```
closes ActionItem2567
```
Aurélio A. Heckert
2013-02-06 17:09:46 -0300

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

15 Jan, 2013

1 commit

a5586b3b adding DisplayContent plugin Browse Dir »

Leandro Nunes dos Santos
2013-01-15 14:12:55 -0300

08 Jan, 2013

1 commit

5e431913 Fixing tests for disabled enterprise message changing Browse Dir »

Rodrigo Souto
2013-01-08 02:13:57 +0000

07 Jan, 2013

1 commit

54db2305 Merge commit 'refs/merge-requests/95' of git://gitorious.org/noosfero/noosfero i… ... Browse Dir »

…nto merge-requests/95

Since this patch is very old, I needed to fix the correction in the
model a little.

Also replaced the "profile2" variable name used to "author".

Conflicts:
	app/models/comment.rb
	test/unit/comment_notifier_test.rb

2013-01-07 22:46:33 +0000

03 Jan, 2013

2 commits

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

Rodrigo Souto
2013-01-03 18:53:09 -0300
c798281d Fixing route to tasks when profile has its own domain ... Browse Dir »
```
(ActionItem2529)
```
Rodrigo Souto
2013-01-03 02:15:22 +0000

02 Jan, 2013

1 commit

923d4164 Merge commit 'refs/merge-requests/260' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/260
```
Rodrigo Souto
2013-01-02 18:37:32 -0300

28 Dec, 2012

2 commits

a6147783 Testing article approval with an article that has a nil author Browse Dir »

Rodrigo Souto
2012-12-28 20:13:02 +0000
8ca4dca6 new users should create person with name equals to user name not user login Browse Dir »

Leandro Nunes dos Santos
2012-12-28 11:39:37 -0300

27 Dec, 2012

1 commit

622e2512 creating author_id method in article class to return the author id when the author exists Browse Dir »

Leandro Nunes dos Santos
2012-12-27 16:49:56 -0300

20 Dec, 2012

1 commit

bbd50ab9 Added limit to names of articles ... Browse Dir »
```
(ActionItem2522)
```
Daniela Feitosa
2012-12-20 14:29:24 -0200

18 Dec, 2012

1 commit

e042473d Spammer logger ... Browse Dir »
```
Also logging spammer when comment is marked as spam
```
Rodrigo Souto
2012-12-18 18:45:17 +0000

12 Dec, 2012

1 commit

79b5d826 Login with login OR email Browse Dir »

Braulio Bhavamitra
2012-12-12 21:29:23 +0000

03 Dec, 2012

2 commits

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

4 commits

f0d6e0a3 Tests for sending emails on spaminator Browse Dir »

Daniela Feitosa
2012-11-30 12:35:34 -0200
e17f85d6 Creating generic settings for plugins (moving part of it from AntiSpam Plugin) Browse Dir »

Rodrigo Souto
2012-11-30 12:35:34 -0200
69b22fc8 Defining abuser Browse Dir »

Rodrigo Souto
2012-11-30 12:35:34 -0200
4d520921 Redefining tasks status named_scopes Browse Dir »

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

27 Nov, 2012

2 commits

70890398 Adding new fields to shopping_cart Browse Dir »

Rodrigo Souto
2012-11-27 14:03:00 -0300
483f5d55 Merge remote branch 'diguliu/features' into work-assignment ... Browse Dir »
```
Conflicts:
	test/functional/cms_controller_test.rb
	test/unit/article_test.rb
```
Daniela Feitosa
2012-11-27 15:00:21 -0200