Software Publico / Noosfero

23 Apr, 2014

1 commit

d08608af Merge remote-tracking branch 'origin' into stable ... Browse File »

Conflicts:
	app/views/content_viewer/view_page.rhtml
	app/views/profile_editor/index.rhtml
	debian/changelog
	lib/noosfero.rb
	plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb

2014-04-23 10:52:54 -0300

08 Apr, 2014

1 commit

7b1826d2 zoom-article-image: enabling zoom button on article images by default ... Browse File »
```
AI3086
```
Junior Silva
2014-04-08 15:41:41 -0300

04 Apr, 2014

1 commit

e8c00784 zoom-article-image: added 'show_zoom_button_on_article_images' in 'enable_default_features' method ... Browse File »
```
AI3086
```
Junior Silva
2014-04-04 18:21:24 -0300

20 Mar, 2014

1 commit

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

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

1 commit

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

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

16 Mar, 2014

2 commits

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

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

- 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

14 Mar, 2014

1 commit

6368c78e environment_features: Add redirection_after_signup option for ... Browse File »
```
Environment.

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

07 Mar, 2014

1 commit

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

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

03 Mar, 2014

2 commits

0497c662 Rename contact_email with noreply_email when pertinent Browse File »

Braulio Bhavamitra
2014-03-03 15:28:51 -0300
d96fa2ea Replace contact_email with noreply_email on environment Browse File »

Braulio Bhavamitra
2014-03-03 14:47:30 -0300

10 Feb, 2014

1 commit

0c8b3cbe Merge branch 'noosfero_0.46.0' into stable Browse File »

Rodrigo Souto
2014-02-10 22:12:52 -0300

08 Feb, 2014

1 commit

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

23 Jan, 2014

2 commits

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

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

Eduardo Tourinho Edington
2014-01-23 16:23:02 -0200

22 Jan, 2014

1 commit

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

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

21 Jan, 2014

1 commit

0cddc2c3 Merge commit 'refs/merge-requests/337' of git://gitorious.org/noosfero/noosfero … ... Browse File »

…into merge-requests/337

Conflicts:
	app/controllers/public/catalog_controller.rb
	app/helpers/application_helper.rb
	app/helpers/catalog_helper.rb
	app/views/catalog/index.rhtml
	public/stylesheets/application.css

2014-01-21 15:41:30 -0300

02 Dec, 2013

1 commit

bd4954d3 Merge branch 'master' into next-origin ... Browse File »

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

27 Nov, 2013

1 commit

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

21 Nov, 2013

1 commit

acd66894 environment: destroy child profiles when destroyed ... Browse File »
```
Also includes migration to remove already orphaned profiles.

(ActionItem2906)
```
Rodrigo Souto
2013-11-21 13:57:40 -0300

16 Nov, 2013

2 commits

04e25fca Add option to disable enterprises list on user menu ... Browse File »
```
(ActionItem2903)
```
Daniela Feitosa
2013-11-16 17:39:17 +0000
c3308c85 Changed a setting name to be less confusing ... Browse File »
```
(ActionItem2901)
```
Daniela Feitosa
2013-11-16 16:34:06 +0000

18 Oct, 2013

1 commit

da23338a Makes My Communities menu optional Browse File »

Larissa Reis
2013-10-18 11:22:37 -0300

07 Oct, 2013

1 commit

e7aa3273 Merge commit 'refs/merge-requests/328' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/328

Conflicts:
	app/controllers/public/catalog_controller.rb
```
Rodrigo Souto
2013-10-07 16:28:47 -0300

22 Jul, 2013

1 commit

7798223b Adding default value for environment cross domain origin Browse File »

Rodrigo Souto
2013-07-22 12:30:55 -0300

15 Jul, 2013

2 commits

07caf3d4 [macro-support-review] Refactoring macros infra-structure Browse File »

Rodrigo Souto
2013-07-15 19:14:08 -0300
196faf05 Add STI, serialized field and rename enterprise_id Browse File »

Braulio Bhavamitra
2013-07-15 09:08:27 -0300

13 Jul, 2013

1 commit

ba61c659 Merge commit 'refs/merge-requests/283' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/283

Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2013-07-13 14:10:04 -0300

11 Jul, 2013

3 commits

2e6acc56 Fixing typo on trusted sites permission name Browse File »

Rodrigo Souto
2013-07-11 18:29:18 -0300
f3bfbfc0 Merge commit 'refs/merge-requests/331' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/331
```
Rodrigo Souto
2013-07-11 17:37:43 -0300
e61a0cba Merge commit 'refs/merge-requests/287' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/287

Conflicts:
	app/models/environment.rb
```
Rodrigo Souto
2013-07-11 13:00:57 -0300

08 Jul, 2013

1 commit

d0a55e25 merging with stable Browse File »

Leandro Nunes dos Santos
2013-07-08 16:50:24 -0300

27 Jun, 2013

1 commit

8f42e790 merging with stable Browse File »

Leandro Nunes dos Santos
2013-06-27 10:05:35 -0300

26 Jun, 2013

1 commit

f1bd3825 Confirm if env templates are set as template ... Browse File »
```
Adds "if <profile>.is_template" to <profile>_template methods.
```
Aurélio A. Heckert
2013-06-26 15:52:41 -0300

10 Jun, 2013

1 commit

36d9601b provide interface to manage trusted sites ... Browse File »
```
ActionItem2675
```
Lucas Melo
2013-06-10 16:03:56 -0300

01 Jun, 2013

1 commit

5a86933d Translate disable_products_for_enterprises_enabled env setting ... Browse File »

The disable_* settings for environment are incoherent with the
user interface and with the code itself. This changes correct
only one incoherent setting as an example how to do with all
others.

2013-06-01 09:54:17 -0300

28 Mar, 2013

1 commit

c5b9f977 Merge branch 'master' into solr-commits Browse File »

Rodrigo Souto
2013-03-28 16:55:47 +0000

13 Mar, 2013

1 commit

f59d7baf Support Access-Control-Allow-Origin configuration and use Browse File »

Braulio Bhavamitra
2013-03-13 18:07:33 +0000

05 Mar, 2013

1 commit

45b092d6 Merge branch 'capybara' into webrat_to_capybara Browse File »

Daniela Feitosa
2013-03-05 14:41:04 -0300

27 Feb, 2013

1 commit

de5477c7 Merge branch 'stable' into pluginize-solr ... Browse File »
```
Conflicts:
	app/models/comment.rb
	app/views/layouts/application-ng.rhtml
	test/unit/category_test.rb
```
Rodrigo Souto
2013-02-27 16:57:56 -0300