Charles Oliveira / noosfero

02 Apr, 2014

1 commit

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

0ef66132 content-viewer-controller-test: adapt tests to new file_presenter infras Browse Dir »

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

31 Mar, 2014

1 commit

e44679ef search-test: fix missing person creation Browse Dir »

Rodrigo Souto
2014-03-31 17:41:11 +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

20 Mar, 2014

3 commits

9c9e90ee Merge branch 'master' of https://gitlab.com/noosfero/noosfero into merging Browse Dir »

Rodrigo Souto
2014-03-20 11:55:03 -0300
68426a08 Merge branch 'master' into AI2694-network_activity_email Browse Dir »

Joenio Costa
2014-03-20 11:41:07 -0300

6e10728c Merge branch 'stable' ... Browse Dir »

Conflicts:
	app/views/themes/index.rhtml
	db/schema.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	test/unit/person_test.rb

2014-03-20 10:58:42 -0300

19 Mar, 2014

2 commits

c19a7b46 content-viewer: remove obsolete test Browse Dir »

Rodrigo Souto
2014-03-19 22:05:19 +0000
8bef50d2 search-optimizations: fix broken tests Browse Dir »

Rodrigo Souto
2014-03-19 17:15:36 +0000

18 Mar, 2014

1 commit

a91ba23d Removed unused method ... Browse Dir »
```
Also included tests for meta tags and removed not-needed tests

(ActionItem2610)
```
Daniela Feitosa
2014-03-18 18:40:07 +0000

17 Mar, 2014

2 commits

645f9328 Merge branch 'master' into AI2694-network_activity_email Browse Dir »

Joenio Costa
2014-03-17 20:14:21 -0300
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

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

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

20 Feb, 2014

2 commits

f099dfa6 Remove unused method (profile_info) from profile_controller ... Browse Dir »
```
(ActionItem3015)
```
Victor Costa
2014-02-20 15:45:55 -0300
61af39c0 Merge branch 'master_colivre' into AI2694-network_activity_email ... Browse Dir »
```
Conflicts:
	test/unit/person_test.rb
```
Victor Costa
2014-02-20 10:55:47 -0300

13 Feb, 2014

2 commits

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

Rodrigo Souto
2014-02-13 22:41:31 -0300
781ee37c themes-controller-test: test themes are not duplicated when allowed by the envir… ... Browse Dir »
```
…onment and by the user
```
Rodrigo Souto
2014-02-13 22:41:25 -0300

11 Feb, 2014

2 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

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

29 Jan, 2014

3 commits

480247c5 catalog-tests: fix per page value and remove obsolete test Browse Dir »

Rodrigo Souto
2014-01-29 18:02:08 -0300
66707ca9 profile-design-tests: add new ProductCategoriesBlock to enterprises block Browse Dir »

Rodrigo Souto
2014-01-29 18:01:15 -0300
4f784bd7 template-tests: add is_template to fix templates tests Browse Dir »

Rodrigo Souto
2014-01-29 18:00:18 -0300

28 Jan, 2014

2 commits

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

Conflicts:
	INSTALL
	script/install-dependencies/debian-squeeze.sh
```
Rodrigo Souto
2014-01-28 16:45:47 -0300
caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse Dir »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

23 Jan, 2014

4 commits

6d7a0824 Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2014-01-23 19:15:27 -0300

297b3b72 Fixing AI2897 problems: ... Browse Dir »

-Changed update_attribute to setting the attribute then 'save!'
-Removed some whitespaces
-The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.

(ActionItem2897)

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

2014-01-23 16:28:03 -0200

b0874b74 Allow the admin users to change the environment theme on the admin panel. Browse Dir »

Eduardo Tourinho Edington
2014-01-23 16:23:02 -0200
8625b2c8 fix: catalog configuration only for enterprises ... Browse Dir »
```
(ActionItem896)
```
Daniela Feitosa
2014-01-23 16:37:40 +0000

22 Jan, 2014

1 commit

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

Conflicts:
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
```
Rodrigo Souto
2014-01-22 22:03:11 +0000