Thiago Ribeiro / Noosfero

22 Jan, 2014

4 commits

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

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
```
Rodrigo Souto
2014-01-22 22:03:11 +0000
8caf11c4 product-categories-block: add 'catalog_only' option and define it as default Browse Dir »

Rodrigo Souto
2014-01-22 20:20:34 +0000
f7c88798 block: add support for custom display modes for blocks Browse Dir »

Rodrigo Souto
2014-01-22 20:17:48 +0000
43535f4f boxes-helper: add params to context passed to the block Browse Dir »

Rodrigo Souto
2014-01-22 20:04:18 +0000

21 Jan, 2014

4 commits

764f2771 clone-block: replace enabled=false by display=:never Browse Dir »

Rodrigo Souto
2014-01-21 20:02:46 +0000
e80da508 Merge commit 'refs/merge-requests/339' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/339

Conflicts:
	app/models/block.rb
	public/designs/icons/tango/style.css
	test/unit/block_test.rb
```
Rodrigo Souto
2014-01-21 16:45:31 -0300
e59c8ae2 product-categories-block: not visible when products are disabled on the environment Browse Dir »

Rodrigo Souto
2014-01-21 19:34:30 +0000

0cddc2c3 Merge commit 'refs/merge-requests/337' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

…into merge-requests/337

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/helpers/application_helper.rb
	app/helpers/catalog_helper.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css

2014-01-21 15:41:30 -0300

17 Jan, 2014

3 commits

4ad91064 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2014-01-17 18:08:25 +0000
6f8f36f0 cms-helper-tests: fix bug due to blog without profile Browse Dir »

Rodrigo Souto
2014-01-17 18:04:31 +0000
b1bcaade Merge branch 'next' Browse Dir »

Joenio Costa
2014-01-17 09:56:15 -0300

16 Jan, 2014

3 commits

757bfb50 Merge branch 'AI2844' Browse Dir »

Daniela Feitosa
2014-01-16 17:35:52 +0000
496d5a24 join_button: removing footer content from model ... Browse Dir »
```
- leaving code to be displayed on views (MVC)

(ActionItem2844)
```
Daniela Feitosa
2014-01-16 16:50:52 +0000
2de692cd Merge remote branch 'unb-gama/AI2844-join_button' into AI2844 Browse Dir »

Daniela Feitosa
2014-01-16 02:27:37 +0000

15 Jan, 2014

2 commits

5187f433 Merge remote-tracking branch 'participa/AI2919-track_fixes' into track-fixes ... Browse Dir »
```
Conflicts:
	test/functional/cms_controller_test.rb
	test/unit/profile_test.rb
```
Rodrigo Souto
2014-01-15 16:44:17 -0300
527a4b0d Moved logic from controller to model ... Browse Dir »
```
- Also included new db/schema
- Removed unused partial

(ActionItem2513)
```
Daniela Feitosa
2014-01-15 05:54:40 +0000

13 Jan, 2014

5 commits

771a0594 Add missing unit tests for the MainBlock ... Browse Dir »
```
(ActionItem2914)
```
Joenio Costa
2014-01-13 22:38:32 -0300
c06aaf3e profile-test: remove unnecessary Article.destroy_all Browse Dir »

Rodrigo Souto
2014-01-13 22:02:24 +0000
88ba5f6e ProfileTest: compare array correctly Browse Dir »

Leandro Nunes dos Santos
2014-01-13 21:16:59 +0000
c719f4bd UserTest: avatar information could come in different url positions Browse Dir »

Leandro Nunes dos Santos
2014-01-13 21:06:52 +0000
d0894925 box-test: fix test due to method to_css_class_name improvement Browse Dir »

Rodrigo Souto
2014-01-13 18:31:38 +0000

10 Jan, 2014

1 commit

70c90e47 Fix: comments list when there is spam on thread ... Browse Dir »
```
(ActionItem2918)
```
Daniela Feitosa
2014-01-10 20:21:08 +0000

08 Jan, 2014

1 commit

2c251ae8 join_button: Join/Leave/Login Button ... Browse Dir »

- Added buttons at members block.
- Added checkbox to show or not the buttons on the community members.
- Removed the render button "enter/leave" when the checkbox that enables the button is unchecked
- Adjusted style CSS and display button
- Added cucumber and unit tests.
- Removed some spaces.
- There are two cucumber tests that wasn't done by the our team that fail if you don't use selenium. The files are publish_article.feature line 20 and search_enterprises.feature line 33 and we didn't modify them.

(ActionItem2844)

Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>

2014-01-08 14:38:27 +0000

07 Jan, 2014

1 commit

c9eccb09 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +0000

06 Jan, 2014

2 commits

3e8bfd50 application-helper: refactor gravatar logic Browse Dir »

Rodrigo Souto
2014-01-06 19:27:45 +0000
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

30 Dec, 2013

1 commit

8c036118 Merge remote-tracking branch 'participa/AI2914-main_block_options' into next Browse Dir »

Joenio Costa
2013-12-30 10:42:26 -0300

18 Dec, 2013

5 commits

d7f514c2 Merge branch 'AI2888-context_block' of /mnt/ebs/repositories/participa/noosfero Browse Dir »

Rodrigo Souto
2013-12-18 22:26:55 +0000
dbd92aba Merge branch 'container-block' ... Browse Dir »
```
Conflicts:
	plugins/display_content/lib/display_content_block.rb
```
Rodrigo Souto
2013-12-18 18:48:14 -0300
9238c40c Merge branch 'users-management' Browse Dir »

Rodrigo Souto
2013-12-18 18:40:51 -0300
84cd2030 Merge remote branch 'mine/stoa-webservice' ... Browse Dir »
```
Conflicts:
	test/unit/profile_test.rb
```
Rodrigo Souto
2013-12-18 14:54:23 -0300
dc423036 Merge remote branch 'mine/stoa-change-password' Browse Dir »

Rodrigo Souto
2013-12-18 14:47:47 -0300

16 Dec, 2013

4 commits

4b0c7f1f Merge branch 'next' into AI2888-context_block ... Browse Dir »
```
Conflicts:
	test/unit/article_test.rb
```
Victor Costa
2013-12-16 17:47:15 -0300
2d3800c3 erge commit 'refs/merge-requests/390' of git://gitorious.org/noosfero/noosfero i… ... Browse Dir »
```
…nto merge-requests/390
```
Rodrigo Souto
2013-12-16 15:02:07 -0300
87318d7b person-and-users-tests: refactor Browse Dir »

Rodrigo Souto
2013-12-16 04:33:24 -0300
2e30180c profile-templates: remove environment parameter from profile templates named_scope Browse Dir »

Rodrigo Souto
2013-12-16 04:22:46 -0300

13 Dec, 2013

2 commits

d9620af2 string-ext: convert class name to valid css class Browse Dir »

Rodrigo Souto
2013-12-13 20:21:38 -0300
ebbd2aa4 Allow the display field of MainBlock to be edited. ... Browse Dir »
```
Enable options to display the main block at all pages and all pages except in the homepage.
```
Eduardo Tourinho Edington
2013-12-13 15:29:29 -0300

12 Dec, 2013

2 commits

6cc3ecdd Merge commit 'refs/merge-requests/410' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/410
```
Rodrigo Souto
2013-12-12 18:00:41 -0300

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