Thiago Ribeiro / Noosfero

14 Mar, 2014

2 commits

fd488954 environment_features: Add redirection option for signup on admin ... Browse Dir »
```
features page.

(ActionItem2998)
```
Daniel
2014-03-14 19:20:27 -0300
6368c78e environment_features: Add redirection_after_signup option for ... Browse Dir »
```
Environment.

(ActionItem2998)
```
Daniel
2014-03-14 19:20:27 -0300

13 Mar, 2014

7 commits

da22d0c8 Merge branch 'master' into AI2928-categories Browse Dir »

Joenio Costa
2014-03-13 18:21:41 -0300
a72fb5dd Better styles for default layout and small improvements in the UI ... Browse Dir »
```
(ActionItem2928)
```
Joenio Costa
2014-03-13 18:20:39 -0300
f835862a Avoid crash when try to remove unexistent profile ... Browse Dir »
```
(ActionItem3021)
```
Daniela Feitosa
2014-03-13 19:22:06 +0000
9a1bc7ba Merge branch 'AI3021-ban_user' of https://gitlab.com/unb-gama/noosfero into AI3021-ban_user Browse Dir »

Daniela Feitosa
2014-03-13 16:53:29 +0000
cd79e9fb Tabs to display fields for each kind of profile ... Browse Dir »
```
Also fixed tests

(ActionItem2962)
```
Daniela Feitosa
2014-03-13 16:22:25 +0000
da3f1073 Removed inline style from table ... Browse Dir »
```
Also changed selenium tests to use defined steps

(ActionItem2962)
```
Daniela Feitosa
2014-03-13 15:42:41 +0000
ff489c4b Merge branch 'AI2962-check_all_manage_fields' of https://gitlab.com/unb-gama/noo… ... Browse Dir »
```
…sfero into AI2962-check_all_manage_fields
```
Daniela Feitosa
2014-03-13 13:16:47 +0000

12 Mar, 2014

4 commits

d0cd6046 Addded cucumber test ... Browse Dir »

-Added tests for ban user
-Added also tests for activate/deactivate users
-Added also tests for set admin role

(ActionItem3021)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>

2014-03-12 17:27:37 +0000

2915c278 Add confirm message for ban, activate/deactivate ... Browse Dir »

(ActionItem3021)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>

2014-03-12 16:49:56 +0000

377d910b ban_user: Creating ban button and ban method in user controller ... Browse Dir »
```
(ActionItemAI3021)

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
```
David Silva
2014-03-12 16:49:56 +0000
9a799cfa Merge branch 'AI2928-categories' of https://gitlab.com/participa/noosfero into AI2928-categories Browse Dir »

Joenio Costa
2014-03-12 10:57:35 -0300

11 Mar, 2014

1 commit

8e7fe1a5 Improved layout for categories selection ... Browse Dir »
```
(ActionItem2928)
```
Victor Costa
2014-03-11 17:33:42 -0300

10 Mar, 2014

1 commit

1dfa6f09 Merge branch 'master' into AI2928-categories Browse Dir »

Joenio Costa
2014-03-10 10:10:22 -0300

07 Mar, 2014

1 commit

d0561132 Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/controllers/my_profile/profile_themes_controller.rb
	test/unit/comment_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2014-03-07 13:17:54 +0000

05 Mar, 2014

1 commit

ffbf0914 Merge branch 'AI2943_container_block_fixes' into 'stable' ... Browse Dir »
```
Ai2943 Container Block Fixes

Fix broken edition for container block with the new css for sideboxes view.
```
Daniela Feitosa
2014-03-05 17:53:53 +0000

03 Mar, 2014

1 commit

abdf6fab Moved style of elements to CSS file ... Browse Dir »
```
Also removed wrong class from link-title

(ActionItem2925)
```
Daniela Feitosa
2014-03-03 02:28:04 +0000

02 Mar, 2014

2 commits

5ff853b4 Merge branch 'AI2925-add_tittle_field_on_link_list_block' of https://gitlab.com/… ... Browse Dir »
```
…unb-gama/noosfero into AI2925-add_tittle_field_on_link_list_block

Conflicts:
	app/views/box_organizer/_link_list_block.rhtml
```
Daniela Feitosa
2014-03-02 13:38:51 +0000
7b1dae3c Merge commit 'refs/merge-requests/398' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/398

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Daniela Feitosa
2014-03-02 09:55:41 +0000

28 Feb, 2014

1 commit

f15193c3 Merge branch 'ActionItem2909-SortUsersAlphabetically' of https://gitlab.com/unb-… ... Browse Dir »
```
…gama/noosfero into ActionItem2909-SortUsersAlphabetically
```
Daniela Feitosa
2014-02-28 22:09:05 +0000

13 Feb, 2014

2 commits

a38702e3 Merge branch 'ai2992' of https://gitlab.com/brauliobo/noosfero into brauliobo/noosfero-ai2992 Browse Dir »

Rodrigo Souto
2014-02-13 22:05:32 -0300

e95275da Revert "application_helper: use Nokogiri in convert_macro() instead of Hpricot" ... Browse Dir »

This reverts commit d726e40eb2b02f88051c1695596738a42c0eb561.

Reverting substitution of hpricot for nokogiri on macros infra due to
segfault problem with nokogiri 1.4.0.

Conflicts:

	app/helpers/application_helper.rb

2014-02-13 20:34:10 -0300

12 Feb, 2014

1 commit

10ab44f4 Sort theme listing Browse Dir »

Braulio Bhavamitra
2014-02-12 14:35:58 -0300

11 Feb, 2014

5 commits

c51270d7 users-controller: default filter to all_users ... Browse Dir »
```
(ActionItem2995)
```
Rodrigo Souto
2014-02-11 23:28:10 +0000
f8b1f66d users-controller: order users by name ... Browse Dir »
```
Also adding a new assert helper to test the order of a collection
without assuming all elements inside it.

(ActionItem2996)
```
Rodrigo Souto
2014-02-11 23:27:45 +0000
27ef9853 Don't duplicate themes Browse Dir »

Braulio Bhavamitra
2014-02-11 18:06:18 -0300

712b5f51 Merge branch 'ai2977' into 'stable' ... Browse Dir »

Don't render layout for javascript format

This is the default behaviour for Rails when rendering .js.erb files. Check http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug

2014-02-11 02:36:16 +0000

e066c0a5 Merge branch 'ai2961' into 'stable' ... Browse Dir »
```
Remove extra div close tag on location block

http://noosfero.org/Development/ActionItem2961
```
Rodrigo Souto
2014-02-11 01:45:54 +0000

10 Feb, 2014

4 commits

09db6ba7 Merge branch 'AI2897-environment_theme' of https://gitlab.com/unb-gama/noosfero … ... Browse Dir »
```
…into unb-gama/noosfero-AI2897-environment_theme
```
Rodrigo Souto
2014-02-10 22:15:25 -0300
1d8eeefb Merge branch 'noosfero_0.46.0' Browse Dir »

Rodrigo Souto
2014-02-10 22:13:58 -0300
0c8b3cbe Merge branch 'noosfero_0.46.0' into stable Browse Dir »

Rodrigo Souto
2014-02-10 22:12:52 -0300
bfaf1bdd Added hotspots for comments Browse Dir »

Daniela Feitosa
2014-02-10 10:13:28 +0000

08 Feb, 2014

1 commit

e381bcc6 Destroy roles when environment is destroyed ... Browse Dir »
```
(ActionItem2987)
```
Daniela Feitosa
2014-02-08 15:30:01 +0000

05 Feb, 2014

1 commit

15080d64 Don't render layout for javascript format ... Browse Dir »

This is the default behaviour for Rails when rendering .js.erb files.
Check
http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug

2014-02-05 12:11:39 -0300

04 Feb, 2014

2 commits

aa0f384c Merge branch 'AI2922-wall_tab_by_default' into 'master' ... Browse Dir »
```
Ai2922 Wall Tab By Default

Display the wall tab by default on user's profile
```
Antonio Terceiro
2014-02-04 18:58:30 +0000
c21b9081 Merge branch 'AI2924-add_verb_users_wall' into 'master' ... Browse Dir »
```
AI2924 Add verb for the activities on user's wall

ActionItem: http://noosfero.org/Development/ActionItem2924
```
Antonio Terceiro
2014-02-04 18:54:53 +0000

31 Jan, 2014

2 commits

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

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Rodrigo Souto
2014-01-31 16:37:47 -0300
4badf6ba comment-reply-feature: add reply title and fix test Browse Dir »

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

28 Jan, 2014

1 commit

440535cf convert-macro: unescaping html converted by macros Browse Dir »

Rodrigo Souto
2014-01-28 21:35:09 +0000