Omar Junior / Noosfero

16 Jan, 2014

2 commits

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

3 commits

d1609c73 Merge remote branch 'unb-gama/AI2852-article_access_level' into AI2852 ... Browse Dir »
```
Conflicts:
	app/models/person.rb
	db/schema.rb
```
Daniela Feitosa
2014-01-15 12:44:00 +0000
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

b3fb1448 forum_use_terms: add user term to forums ... Browse Dir »

(ActionItem2513)

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-01-15 00:40:00 +0000

09 Jan, 2014

1 commit

9f616e0b access_level: Custom permission for community users to access an article ... Browse Dir »

- Added a field on article new/edit to specify which users can access the article
- Added a relationship has_and_belongs_to_many between Article and Person
- Created a new table article_privacy_exceptions for has_and_belongs_to_many
- Added cucumber tests
- Added a new cucumber step to add a user to the exception users list

(ActionItem2852)

Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>

2014-01-09 12:12:04 -0200

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

02 Jan, 2014

1 commit

9b5026be Merge remote branch 'unb-gama-mes/ActionItem2838-BackButtonOutsideArticle' Browse Dir »

Daniela Feitosa
2014-01-02 20:07:11 +0000

18 Dec, 2013

4 commits

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
e28da510 Merge remote-tracking branch 'participa/AI2892-display_content_order_attributes'… ... Browse Dir »
```
… into order-attributes
```
Rodrigo Souto
2013-12-18 17:35:38 -0300
dc423036 Merge remote branch 'mine/stoa-change-password' Browse Dir »

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

16 Dec, 2013

6 commits

3583e31a Move article image out of the lead Browse Dir »

Victor Costa
2013-12-16 17:30:26 -0300
bb58ba05 Remove unused code at lead_and_body partial Browse Dir »

Victor Costa
2013-12-16 17:26:18 -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
9b038076 users-list-css: minor improvements Browse Dir »

Rodrigo Souto
2013-12-16 05:40:22 -0300
ed088d0b users-list: fix identation Browse Dir »

Rodrigo Souto
2013-12-16 04:35:02 -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

1 commit

3ae186b5 Move the "back button" to the outside of the article body. ... Browse Dir »
```
(ActionItem2838)
```
Victor Hugo Alves de Carvalho
2013-12-13 19:21:08 -0200

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

05 Dec, 2013

2 commits

8d5373b9 Merge commit 'refs/merge-requests/413' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/413
```
Rodrigo Souto
2013-12-05 15:01:52 -0300
01bea002 Fix bug with the new image field at suggest article Browse Dir »

Victor Costa
2013-12-05 14:20:09 -0300

02 Dec, 2013

2 commits

bd4954d3 Merge branch 'master' into next-origin ... Browse Dir »

Conflicts:
	app/models/category.rb
	app/models/uploaded_file.rb
	test/functional/memberships_controller_test.rb
	test/functional/profile_controller_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2013-12-02 20:33:51 -0300

8c7fd1cd Merge branch 'stable' Browse Dir »

Rodrigo Souto
2013-12-02 15:22:52 -0300

28 Nov, 2013

1 commit

0834d18f improving agenda/events ... Browse Dir »

Show events by month
Event list now only show 10 events when listing events for month
(events for a day still listing all events)
Add information on indefined place
Enhance layout

(ActionItem2587)

Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by; Gabriela Navarro <navarro1703@gmail.com>