Charles Oliveira / noosfero

02 Apr, 2014

3 commits

845ae13e minor: removing empty lines and trailing whitespaces Browse Dir »

Rodrigo Souto
2014-04-02 20:18:43 +0000
a739edce Merge branch 'article-version' of https://gitlab.com/juniorsilva1001/noosfero in… ... Browse Dir »
```
…to juniorsilva1001/noosfero-article-version

Conflicts:
	app/views/content_viewer/versioned_article.rhtml
	db/schema.rb
	public/stylesheets/application.css
```
Rodrigo Souto
2014-04-02 19:52:23 +0000

48038fc5 Merge branch 'stable' into noosfero_0.47.0 ... Browse Dir »

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/categories_block.feature
	po/eo/noosfero.po
	po/es/noosfero.po
	po/it/noosfero.po
	test/unit/block_test.rb

2014-04-02 19:40:37 +0000

01 Apr, 2014

1 commit

67f6ebd9 content-viewer-controller: user_is_a_bot consider possible empty user_agent Browse Dir »

Rodrigo Souto
2014-04-01 18:30:30 +0000

26 Mar, 2014

2 commits

84503cc0 view-page: do not count hits on bot access ... Browse Dir »
```
(ActionItem3063)
```
Rodrigo Souto
2014-03-26 19:00:38 +0000

fe3ebd1c Added pagination on events ... Browse Dir »

agenda_improvements: Changed the limit to show the events

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>

(ActionItem3048)

2014-03-26 10:17:05 +0000

19 Mar, 2014

2 commits

dbb81838 extracted repeated code to a method Browse Dir »

Daniela Feitosa
2014-03-19 14:55:51 +0000

964df626 Merge branch 'signup_redirect_improvements' into 'master' ... Browse Dir »

Signup Redirect Improvements

Add environment feature for choosing where to redirect the user after signup. The options are the same as the ones for the login redirection options existing today.

This feature takes in consideration that the usar may have to follow a confirmation URL recieved by eletronic mail.

2014-03-19 14:56:00 +0000

18 Mar, 2014

2 commits

6ed2fbe7 create_topics: saving number of access to db ... Browse Dir »
```
Also fixed typo

(ActionItem2997)
```
Daniela Feitosa
2014-03-18 20:09:50 +0000
02b13044 Merge branch 'AI2997-create_topics_forum' of https://gitlab.com/unb-gama/noosfero Browse Dir »

Daniela Feitosa
2014-03-18 20:09:30 +0000

17 Mar, 2014

1 commit

b12c55b3 Merge branch 'AI3015-fix_profile_controller' Browse Dir »

Daniela Feitosa
2014-03-17 00:01:53 +0000

16 Mar, 2014

5 commits

040b05e2 Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Dir »

Joenio Costa
2014-03-16 22:50:53 -0300

1c950250 Revert part of the last commit in order to not remove the EnvironmentStatisticsBlock ... Browse Dir »

- EnvironmentStatisticsBlock was marked as DEPRECATED, it will be
  removed in the next Noosfero release, see ActionItem3045

Thanks for the tip Daniela Feitosa ;)

(ActionItem2851)

2014-03-16 22:49:21 -0300

c3453051 Make a plugin to display statistics from Environment and Profiles ... Browse Dir »

- Removed EnvironmentStatisticsBlock from core. Environment's admins
  should enable the statistics block for its environment

Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
Signed-off-by: Victor Costa <vfcosta@gmail.com>

(ActionItem2851)

2014-03-16 20:48:37 -0300

a3a68964 Merge branch 'AI3015-fix_profile_controller' of https://gitlab.com/participa/noo… ... Browse Dir »
```
…sfero into AI3015-fix_profile_controller
```
Daniela Feitosa
2014-03-16 23:41:55 +0000
031e5bd1 Fixed failing tests ... Browse Dir »
```
test/functional/application_controller_test.rb
test/functional/profile_themes_controller_test.rb
```
Daniela Feitosa
2014-03-16 22:50:45 +0000

14 Mar, 2014

3 commits

bec2b3cd bug_fix: redirection_after_login feature now works when ... Browse Dir »
```
allow_change_of_redirection is disabled.

(ActionItem2998)
```
Daniel
2014-03-14 20:03:25 -0300
b461081b admin_features: Add redirection options after signup when confirmation ... Browse Dir »
```
email is enabled.

(ActionItem2998)

Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
```
Daniel
2014-03-14 20:03:16 -0300
88f4efc5 admin_features: Add support for selecting where to redirect users after ... Browse Dir »
```
signup.

(ActionItem2998)

Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
```
Daniel
2014-03-14 20:02:49 -0300

13 Mar, 2014

3 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

12 Mar, 2014

3 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

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

3 commits

1c211c78 create_topics: Corrections for merge-request. ... Browse Dir »
```
(ActionItem2997)

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Gabriela Navarro
2014-03-07 14:38:31 +0000

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

1121fdb7 create_topics: Add logic to show the create topic button to community members ... Browse Dir »
```
(ActionItem2997)

Signed_off_by: Gabriela Navarro <navarro1703@gmail.com>
Signed_off_by: Gustavo Jaruga <darksshades@gmail.com>
```
Gabriela Navarro
2014-03-07 09:31:36 -0300

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

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

20 Feb, 2014

2 commits

1221eda4 versions-diff: included js to radio_button control and adjusts on look-and-feel ... Browse Dir »
```
AI2822
```
Junior Silva
2014-02-20 19:56:28 -0300
f099dfa6 Remove unused method (profile_info) from profile_controller ... Browse Dir »
```
(ActionItem3015)
```
Victor Costa
2014-02-20 15:45:55 -0300

13 Feb, 2014

1 commit

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

12 Feb, 2014

1 commit

10ab44f4 Sort theme listing Browse Dir »

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

11 Feb, 2014

4 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

10 Feb, 2014

1 commit

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