Software Publico / Noosfero

17 Mar, 2014

4 commits

50f90482 Merge branch 'master' into AI2993-display_content_plugin_content Browse Code »

Joenio Costa
2014-03-17 15:59:01 -0300
bf05a1ac Merge branch 'AI2945_context_content_fixes' into 'master' ... Browse Code »
```
Ai2945 Context Content Fixes

context_content: fix pagination view
Action Item 2945
```
Daniela Feitosa
2014-03-17 01:09:39 +0000
8fb9d223 context_content: fix pagination view Browse Code »

Victor Costa
2014-03-17 01:04:56 +0000
b12c55b3 Merge branch 'AI3015-fix_profile_controller' Browse Code »

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

16 Mar, 2014

5 commits

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

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

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

- 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 Code »

- 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 Code »
```
…sfero into AI3015-fix_profile_controller
```
Daniela Feitosa
2014-03-16 23:41:55 +0000
031e5bd1 Fixed failing tests ... Browse Code »
```
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

1 commit

8f30e7a2 shopping-cart: change free delivery price label Browse Code »

Rodrigo Souto
2014-03-14 14:18:04 -0300

13 Mar, 2014

7 commits

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

Joenio Costa
2014-03-13 18:21:41 -0300
a72fb5dd Better styles for default layout and small improvements in the UI ... Browse Code »
```
(ActionItem2928)
```
Joenio Costa
2014-03-13 18:20:39 -0300
f835862a Avoid crash when try to remove unexistent profile ... Browse Code »
```
(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 Code »

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

(ActionItem2962)
```
Daniela Feitosa
2014-03-13 16:22:25 +0000
da3f1073 Removed inline style from table ... Browse Code »
```
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 Code »
```
…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 Code »

-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 Code »

(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 Code »
```
(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 Code »

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

11 Mar, 2014

1 commit

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

10 Mar, 2014

1 commit

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

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

07 Mar, 2014

4 commits

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

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

49e6135e Bumping version 0.46.1 Browse Code »

Daniela Feitosa
2014-03-07 13:04:39 +0000
c34cadf1 Fixed failing tests Browse Code »

Daniela Feitosa
2014-03-07 10:25:18 +0000
ebdbd8ac Removed unused method ... Browse Code »
```
It's not used anymore since:
ca5ebf95375cd5dbb80a047dc79f4c31e36df899
```
Daniela Feitosa
2014-03-07 10:11:05 +0000

05 Mar, 2014

1 commit

ffbf0914 Merge branch 'AI2943_container_block_fixes' into 'stable' ... Browse Code »
```
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 Code »
```
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 Code »
```
…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 Code »
```
…into merge-requests/398

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

01 Mar, 2014

2 commits

c1fce26e Removed unnecessary assertion on test ... Browse Code »
```
(ActionItem2909)
```
Daniela Feitosa
2014-03-01 15:40:24 +0000
a508d544 fix: failing test on first and last day of a month Browse Code »

Daniela Feitosa
2014-03-01 15:32:57 +0000

28 Feb, 2014

1 commit

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

24 Feb, 2014

2 commits

cf53d339 comment_classification: added dependency on README Browse Code »

Daniela Feitosa
2014-02-24 10:52:17 +0000
4bd118d0 Merge remote branch 'danielafeitosa/comment_classification' Browse Code »

Daniela Feitosa
2014-02-24 10:46:07 +0000

20 Feb, 2014

3 commits

f099dfa6 Remove unused method (profile_info) from profile_controller ... Browse Code »
```
(ActionItem3015)
```
Victor Costa
2014-02-20 15:45:55 -0300
42b56ea9 Fix creation of admin url on profile_image and profile_info blocks ... Browse Code »
```
(ActionItem3015)
```
Victor Costa
2014-02-20 15:45:40 -0300
d6ee7e3d context_content: fix pagination view Browse Code »

Victor Costa
2014-02-20 13:25:02 -0300

13 Feb, 2014

1 commit

a8a8780b themes-controller-test: add test to sort themes Browse Code »

Rodrigo Souto
2014-02-13 22:41:31 -0300