Thiago Ribeiro / Noosfero

15 Jan, 2014

4 commits

6a3caadd sort_members: sort community members alphabetically in manage members and view all page ... Browse Dir »
```
(ActionItem2909)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
SIgned-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Arthur Del Esposte
2014-01-15 17:46:57 +0000
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

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

3 commits

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

Rodrigo Souto
2014-01-06 19:27:45 +0000
b2294d44 person: simplifying memberships_by_role Browse Dir »

Rodrigo Souto
2014-01-06 18:04:14 +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

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

6 commits

5ead2c2f context_content: adapt to new file presenter Browse Dir »

Rodrigo Souto
2013-12-16 18:08:17 -0300
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
130acb98 Merge commit 'refs/merge-requests/387' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/387

Conflicts:
	app/helpers/application_helper.rb
	public/designs/themes/base/style.css
```
Rodrigo Souto
2013-12-16 15:36:30 -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
d11a19b9 box: fix and avoid instance/class confusions Browse Dir »

Rodrigo Souto
2013-12-16 08:01:27 -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

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

Rodrigo Souto
2013-12-13 20:21:38 -0300

12 Dec, 2013

1 commit

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

05 Dec, 2013

1 commit

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

02 Dec, 2013

1 commit

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

28 Nov, 2013

2 commits

65e72323 Replaced link_to with button class by button ... Browse Dir »
```
Also:
- Removed unused code
- Fixed identation

(ActionItem2587)
```
Daniela Feitosa
2013-11-28 22:51:45 +0000

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>

2013-11-28 01:30:56 -0200

27 Nov, 2013

1 commit

96ad392a Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/manage_products.feature
```
Rodrigo Souto
2013-11-27 14:13:20 -0300