AvaliaSPB / Noosfero

12 Aug, 2014

1 commit

2620604b Change the category color selection to use a colorpicker component. ... Browse File »
```
The field display_color has turned into char(6) and stores the color rgb hex code.
(ActionItem2915)
```
Victor Costa
2014-08-12 09:44:00 -0300

05 Jun, 2014

1 commit

303c546a Merge branch 'master' into AI3042-custom_signup_welcome Browse File »

Joenio Costa
2014-06-05 13:03:26 -0300

13 May, 2014

1 commit

23914711 Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb

2014-05-13 10:43:37 -0300

08 May, 2014

1 commit

84bbcd40 rails3: fix unit tests Browse File »

Victor Costa
2014-05-08 14:14:52 -0300

06 May, 2014

1 commit

1182476c Merge branch 'rails235' into rails3 ... Browse File »

* rails235: (168 commits)
  L10n: support for custom locales
  enhancements: visualization of suggested usernames
  Allowing translation for url checking string
  Removed unnecessary lines on test
  Removed unit tests from functionals file
  Fixed html and test syntax
  Removed needless condition
  Fixed suggestions of usernames
  Test files should ends with "_test.rb"
  Added pagination on events_by_day on profile agenda
  Fix missing variable in funcional test
  Fix unit tests
  Change routes from embed controller
  Remove unused code
  Autocomplete fields on page load
  Blocks can returns a block of code to be evaluated
  Avoid randomness on tests
  comment-group-plugin: avoid randomness on tests
  community-track-plugin: fix tests by creating a profile with default boxes
  anti-spam-plugin-wrapper: ensure to load concrete wrappers
  ...

Conflicts:
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/contact.rb
	app/models/event.rb
	app/models/mailing.rb
	app/models/organization.rb
	app/models/organization_mailing.rb
	app/models/pending_task_notifier.rb
	app/models/person.rb
	app/models/profile.rb
	app/models/scrap.rb
	app/models/task_mailer.rb
	app/models/user.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/profile_image.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/box_organizer/_link_list_block.rhtml
	app/views/box_organizer/edit.rhtml
	app/views/features/_manage_community_fields.rhtml
	app/views/features/_manage_enterprise_fields.rhtml
	app/views/features/_manage_person_fields.rhtml
	app/views/features/index.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/users/_users_list.rhtml
	db/schema.rb
	features/forum.feature
	lib/feed_handler.rb
	lib/noosfero/plugin.rb
	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	plugins/spaminator/lib/spaminator_plugin/mailer.rb
	test/functional/content_viewer_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/profile_design_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/contact_sender_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/environment_mailing_test.rb
	test/unit/mailing_test.rb
	test/unit/organization_mailing_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
	test/unit/uploaded_file_test.rb
	vendor/plugins/action_tracker/lib/action_tracker_model.rb

2014-05-06 18:00:26 -0300

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

24 Mar, 2014

1 commit

576c5dbe added tests for welcome screen settings Browse File »

Victor Costa
2014-03-24 14:51:29 -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

2 commits

423aba17 Merge branch 'master' into rails3 ... Browse File »
```
Conflicts:
	config/initializers/dependencies.rb
	debian/control
	lib/noosfero/core_ext.rb
	lib/noosfero/plugin/routes.rb
```
Daniela Feitosa
2014-03-07 14:35:37 +0000

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

11 Feb, 2014

1 commit

e9fea38f Merge branch 'master' into rails3-merge ... Browse File »

Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb

2014-02-11 17:35:19 -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

29 Jan, 2014

1 commit

4f784bd7 template-tests: add is_template to fix templates tests Browse File »

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

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

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse File »

Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb

2014-01-09 15:17:55 +0000

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

19 Nov, 2013

1 commit

c74b012c rails3: fix environment tests Browse File »

Rodrigo Souto
2013-11-19 13:43:08 -0300

05 Nov, 2013

1 commit

3133eb48 Merge branch 'stable' ... Browse File »

Conflicts:
	script/quick-start
	test/unit/application_helper_test.rb
	test/unit/environment_statistics_block_test.rb
	test/unit/environment_test.rb

2013-11-05 19:10:53 -0300

31 Oct, 2013

1 commit

ad864378 environment_tests: fix tests due to new enable feature save as default behaviour Browse File »

Rodrigo Souto
2013-10-31 20:57:07 +0000

10 Oct, 2013

1 commit

688b3512 environment_features: passing false on enable/disable in cases where should not save the environment Browse File »

Rodrigo Souto
2013-10-10 21:25:13 -0300

05 Sep, 2013

1 commit

6d2a0edf rails3: refactor deprecated invalid? of ActiveRecord::Errors from all tests Browse File »

Rodrigo Souto
2013-09-05 23:57:39 +0000

15 Jul, 2013

1 commit

196faf05 Add STI, serialized field and rename enterprise_id Browse File »

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

12 Dec, 2012

1 commit

f4be5188 [pluginize-solr] Moving find_by_contents tests Browse File »

Rodrigo Souto
2012-12-12 01:21:15 +0000

04 Nov, 2012

1 commit

c729594d Merge remote branch 'remotes/diguliu/language-selection' into language-selection ... Browse File »
```
Conflicts:
	app/sweepers/article_sweeper.rb
	db/schema.rb
	test/unit/environment_test.rb
```
Daniela Feitosa
2012-11-04 18:23:45 -0200

29 Oct, 2012

1 commit

877d26ae Environment admin can configure the message after signup ... Browse File »

Added field sigup_welcome_text on environment
New tab on admin panel to edit the text
When the environment doesn't have a text, will use the default text
Added content_type to email

(ActionItem2497)

2012-10-29 02:07:56 -0200

27 Oct, 2012

1 commit

bba3d1e2 Allowing users to configure the page after login ... Browse File »

Added field redirection_after_login on profiles and environments
New db/schema
Added a select to choose option to redirect on admin panel and on profile
control panel

(ActionItem2369)

2012-10-27 15:25:59 -0200

24 Aug, 2012

1 commit

cb16e304 [language-selection] Making languages only save the language abbreviation Browse File »

Rodrigo Souto
2012-08-24 19:31:38 +0000

23 Aug, 2012

2 commits

a4f93f99 [language-selection] Verifing available languages Browse File »

Rodrigo Souto
2012-08-23 23:53:51 +0000
852b2fe7 [language-selection] Migration and model base Browse File »

Rodrigo Souto
2012-08-23 23:19:33 +0000

08 Aug, 2012

1 commit

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

Conflicts:
	app/models/environment.rb
	public/stylesheets/application.css
	test/factories.rb
	test/fixtures/roles.yml
	test/unit/article_test.rb
```
Daniela Feitosa
2012-08-08 16:15:14 -0300

18 Jul, 2012

1 commit

ef74a656 [licenses] Creating Linsese model and its relations ... Browse File »
```
(ActionItem2379)
```
Rodrigo Souto
2012-07-18 11:15:11 -0300

21 Jun, 2012

1 commit

03c856bb Merge commit 'refs/merge-requests/173' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/173
```
Daniela Feitosa
2012-06-21 13:33:25 -0300

19 May, 2012

1 commit

8151ee67 Fix tests and mock Solr when not necessary ... Browse File »
```
Mocking Solr disable indexing and search,
so it speeds tests that don't need solr.
Tests that need searches have to call TestSolr.enable
```
Braulio Bhavamitra
2012-05-19 14:49:13 +0000

15 May, 2012

1 commit

8b4f7289 Improving environment enable/disable plugins methods ... Browse File »
```
  * Allowing enable/disable to receive the class
```
Rodrigo Souto
2012-05-15 15:11:37 -0300

20 Feb, 2012

1 commit

8260f403 Fixes for unit tests (after merge) ... Browse File »

* A few syntax problems
* Removed tests for removed models
* Replaced 'browse' with 'search' controller
* Created EnterpriseHomepageHelperTest
* Fixes to work with Solr

2012-02-20 00:33:09 -0200

19 Feb, 2012

2 commits

8867b198 Replaced 'Test::Unit' with 'ActiveSupport' in a few unit tests Browse File »

Rafael Martins
2012-02-19 16:38:42 -0200

2a082d0b Merge remote branch 'noosfero-bsc/solr-merge' ... Browse File »

Conflicts:
	INSTALL
	app/models/environment_finder.rb
	config/environments/cucumber.rb
	debian/control
	features/step_definitions/noosfero_steps.rb
	test/unit/forum_helper_test.rb

2012-02-19 16:37:27 -0200

04 Jan, 2012

1 commit

2ae57e72 Merge branch 'master' into rails-2.3.5 ... Browse File »
```
Conflicts:
	features/step_definitions/noosfero_steps.rb
```
Antonio Terceiro
2012-01-04 19:09:45 +0000