Software Publico / Noosfero

11 Aug, 2014

1 commit

1c92a457 Fix "My networks" block Browse Dir »

Antonio Terceiro
2014-08-11 18:37:01 -0300

08 Aug, 2014

1 commit

6c86b2a8 Fix naming of profile_info_action partials Browse Dir »

Antonio Terceiro
2014-08-08 13:14:38 -0300

07 Aug, 2014

1 commit

34f8f4d7 Merge remote-tracking branch 'origin/stable' ... Browse Dir »

Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb

2014-08-07 14:20:39 -0300

05 Jun, 2014

1 commit

c51f902b Lots of cosmetic changes and fixing mass-assignment bug ... Browse Dir »
```
(ActionItem2859)
```
Joenio Costa
2014-06-05 23:46:22 -0300

04 Jun, 2014

1 commit

7e6f215a my-network-block: pass class to render_profile_actions Browse Dir »

Rodrigo Souto
2014-06-04 14:09:55 -0300

29 May, 2014

1 commit

1d891d19 user-menu: loading user menu on the server-side instead of on the client-side ... Browse Dir »

There is no reason for the user menu to load on the client-side. The
only reason, that would be plausible is if it varnish was providing
cached pages for logged users. Since this is not happening, there is no
need to load it on the client-side.

2014-05-29 22:38:35 +0000

06 May, 2014

1 commit

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

* 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

05 May, 2014

1 commit

6969fc0f Support plugins' profiles on view_for_profile_actions ... Browse Dir »
```
(ActionItem3123)
```
Braulio Bhavamitra
2014-05-05 15:12:47 -0300

20 Mar, 2014

1 commit

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

16 Mar, 2014

1 commit

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

07 Mar, 2014

2 commits

423aba17 Merge branch 'master' into rails3 ... Browse Dir »
```
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 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

21 Feb, 2014

1 commit

6b9f92b5 Don't show p if empty Browse Dir »

Braulio Bhavamitra
2014-02-21 13:21:04 -0300

20 Feb, 2014

2 commits

693f2001 rails3: fix profile_controller Browse Dir »

Victor Costa
2014-02-20 17:21:29 -0300
42b56ea9 Fix creation of admin url on profile_image and profile_info blocks ... Browse Dir »
```
(ActionItem3015)
```
Victor Costa
2014-02-20 15:45:40 -0300

13 Feb, 2014

1 commit

e201637a rails3: rename files from rhtml to html.erb Browse Dir »

Victor Costa
2014-02-13 17:17:52 -0300

11 Feb, 2014

2 commits

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

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

e066c0a5 Merge branch 'ai2961' into 'stable' ... Browse Dir »
```
Remove extra div close tag on location block

http://noosfero.org/Development/ActionItem2961
```
Rodrigo Souto
2014-02-11 01:45:54 +0000

31 Jan, 2014

1 commit

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

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Rodrigo Souto
2014-01-31 16:37:47 -0300

21 Jan, 2014

1 commit

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

…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

20 Jan, 2014

1 commit

9967acdc Remove extra div close tag Browse Dir »

Braulio Bhavamitra
2014-01-20 20:04:22 -0300

16 Jan, 2014

2 commits

0a577775 join_button: added class to style join button ... Browse Dir »
```
(ActionItem2844)
```
Daniela Feitosa
2014-01-16 17:25:24 +0000
496d5a24 join_button: removing footer content from model ... Browse Dir »
```
- leaving code to be displayed on views (MVC)

(ActionItem2844)
```
Daniela Feitosa
2014-01-16 16:50:52 +0000

09 Jan, 2014

1 commit

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

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

08 Jan, 2014

1 commit

2c251ae8 join_button: Join/Leave/Login Button ... Browse Dir »

- Added buttons at members block.
- Added checkbox to show or not the buttons on the community members.
- Removed the render button "enter/leave" when the checkbox that enables the button is unchecked
- Adjusted style CSS and display button
- Added cucumber and unit tests.
- Removed some spaces.
- There are two cucumber tests that wasn't done by the our team that fail if you don't use selenium. The files are publish_article.feature line 20 and search_enterprises.feature line 33 and we didn't modify them.

(ActionItem2844)

Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>

2014-01-08 14:38:27 +0000

07 Oct, 2013

1 commit

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

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

04 Sep, 2013

1 commit

067a2a2d articles, profiles: stop using ajax for some logged-in stuff Browse Dir »

Lucas Melo
2013-09-04 14:28:34 -0300

09 Aug, 2013

1 commit

4ee3fe12 Use https for google maps api Browse Dir »

Braulio Bhavamitra
2013-08-09 10:56:41 -0300

26 Jun, 2013

1 commit

22eb134c List root product categories if no sub-categories ... Browse Dir »
```
ProductCategoriesBlock will be never empty
ActionItem896
```
Aurélio A. Heckert
2013-06-26 16:37:18 -0300

14 Jun, 2013

1 commit

082a5c33 Enable side blocks on product catalog ... Browse Dir »
```
Also adds the ProductCategoriesBlock to list the catalog anywhere.

ActionItem896
```
Aurélio A. Heckert
2013-06-14 19:02:13 -0300

01 Jun, 2013

1 commit

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

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

25 Dec, 2012

2 commits

86ecb14f Finish removal of the deprecated terminology thing Browse Dir »

Antonio Terceiro
2012-12-25 21:33:53 -0300
645651de Rename *.rhtml -> *.html.erb ... Browse Dir »
```
*.rhtml is deprecated in Rails 3
```
Antonio Terceiro
2012-12-25 15:13:43 -0300

29 Oct, 2012

1 commit

b18cb4fe Making clear that emails sent to community goes to admins Browse Dir »

Daniela Feitosa
2012-10-29 00:53:43 -0200

15 Aug, 2012

1 commit

7bd5c3f5 Fix use of google static map api v3 ... Browse Dir »
```
Also move view to template
```
Braulio Bhavamitra
2012-08-15 00:45:04 -0300

20 Mar, 2012

1 commit

e7944593 Using 'truncate()' method to get first 50 chars of product description ... Browse Dir »
```
(ActionItem2322)
```
Joenio Costa
2012-03-20 22:00:51 -0300

06 Dec, 2011

1 commit

c71bcb05 Changed text of profile info block ... Browse Dir »
```
(ActionItem2136)
```
Daniela Feitosa
2011-12-06 23:49:35 -0200

11 Oct, 2011

1 commit

3c89860d Report abuse ... Browse Dir »
```
Libs added
* jquery-validation
* colorbox
* recaptcha

(ActionItem2074)
```
Rodrigo Souto
2011-10-11 06:59:51 -0300

16 Sep, 2011

1 commit

0f7ed650 Passing profile identifier as param to compose control panel link ... Browse Dir »
```
(ActionItem2076)
```
Joenio Costa
2011-09-16 21:49:33 -0300

04 May, 2011

1 commit

2f6997ed Fixing some problems with domain for profiles. ... Browse Dir »

I've made a selenium test suite for all the problems I've noticed so far, that are the following:

* Profile control panel links in profile image block and profile information block
* Link to user profile in user bar
* Link to user control panel in user bar
* 'Go to the home page' button on not found page, that should link to profile home page or
to environment home page

So I've made the tests, ran them, fixed the problems, and ran the tests again.

(ActionItem1465)

2011-05-04 14:14:30 -0300