Omar Junior / Noosfero

21 May, 2013

1 commit

c893df1c Moving acts_as_faceted test to solr plugin Browse Dir »

Rodrigo Souto
2013-05-21 19:43:27 -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

20 Apr, 2013

1 commit

2d5abd83 mergin with master Browse Dir »

root
2013-04-20 21:31:06 -0300

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

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

18 Mar, 2013

1 commit

67e8ceed Merge branch 'master' into pluginize-solr Browse Dir »

Rodrigo Souto
2013-03-18 21:16:54 -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

05 Mar, 2013

2 commits

755f9431 Fixing search controller tests Browse Dir »

Rodrigo Souto
2013-03-05 19:37:28 -0300
0fb41209 Removing solr from region tests ... Browse Dir »
```
Also removing region unit tests that are already being done in the
functional test.
```
Rodrigo Souto
2013-03-05 16:32:16 -0300

28 Feb, 2013

1 commit

b9a0b4d3 Preparing search filter scheme Browse Dir »

Rodrigo Souto
2013-02-28 21:59:36 +0000

27 Feb, 2013

3 commits

5954b097 Concentrating find_by_contents on application controller Browse Dir »

Rodrigo Souto
2013-02-27 20:29:56 -0300
de5477c7 Merge branch 'stable' into pluginize-solr ... Browse Dir »
```
Conflicts:
	app/models/comment.rb
	app/views/layouts/application-ng.rhtml
	test/unit/category_test.rb
```
Rodrigo Souto
2013-02-27 16:57:56 -0300
9360007a Solr on the way... Browse Dir »

Rodrigo Souto
2013-02-27 16:55:59 -0300

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

21 Jan, 2013

1 commit

096a8402 Merge branch 'ActionItem2544' of git://gitorious.serpro/noosfero/noosfero-develo… ... Browse Dir »
```
…pment into ActionItem2544
```
Leandro Nunes dos Santos
2013-01-21 15:27:21 -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

af3c320b adding hotspots to make possible add other blocks Browse Dir »

Leandro Nunes dos Santos
2013-01-15 14:06:26 -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