26 Jun, 2014

2 commits

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
    Victor Costa
     

30 Mar, 2014

1 commit

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
    Rodrigo Souto
     

30 Jan, 2014

1 commit

  • de0aceaa   rails3: fix assert_kind_of Array ... Browse File » 
    On rails 3.2, the return type of some queries changes from Array to ActiveRecord::Relation.
An assertion that check if these attributes has been assigned (with a value != nil) should be enought.
This avoids future problems with api changes.
    Victor Costa
     

29 Jan, 2014

1 commit

20 Jan, 2014

1 commit

06 Jan, 2014

2 commits

02 Dec, 2013

1 commit

22 Nov, 2013

1 commit

21 Nov, 2013

1 commit

23 Oct, 2013

1 commit

15 Apr, 2013

1 commit

21 Aug, 2012

1 commit

05 Jul, 2012

1 commit

  • 32ea7f36   Adding new hotspots ... Browse File » 
      1. organization_members: allows plugins to extend the list of members of
  an organization.

  2. has_permission?: allows plugins to add permission to some user to
  perform some action over a profile or environment. This hotspot only
  allows plugins to expand access, not to revoke access.

  3. new_community_hidden_fields and
  enterprise_registration_hidden_fields: allows plugins to include new
  hidden fields in the following forms.

  * Also including a monkey patch to include some features from the gem
    fake_arel that requires activesupport-2.3.14 and
    activerecord-2.3.14. This them allows OR with scopes without loading
    them.
    Rodrigo Souto
     

23 Feb, 2012

1 commit

27 Jan, 2012

1 commit

07 Dec, 2011

1 commit

22 Feb, 2011

2 commits

27 Jan, 2011

1 commit

  • b8ade540   Procedure after last admin leaves organization ... Browse File » 
    * if he is also last member, the next user to join organization will become admin
* if has other members, admin must choose some user to become admin
* Generalized enterprise add_member interface.
* Using json to manage action after join/leave/add/remove
community/friend through ajax.
* Person.members_of now returns unique profiles

(ActionItem1400)
    Daniela Feitosa
     

30 Nov, 2010

1 commit

21 Oct, 2010

1 commit

08 Jul, 2010

1 commit

31 Oct, 2009

1 commit

22 Jul, 2009

2 commits

06 Jun, 2009

1 commit

11 May, 2009

1 commit

23 Mar, 2009

1 commit

27 Jan, 2009

1 commit

21 Oct, 2008

1 commit

15 Oct, 2008

1 commit

  • b9c58d94   ActionItem780: refactoring tests ... Browse File » 
    Squashed commit of the following:

commit ff9310723bc4f768185d4c562f06a99807e00d05
Author: Moises Machado <moises@colivre.coop.br>
Date:   Sat Oct 11 18:34:24 2008 -0300

    fixed the rest of the tests

commit 8fe241dcb67b3928796254e557319da3ec7e9734
Author: Moises Machado <moises@colivre.coop.br>
Date:   Sat Oct 11 17:16:27 2008 -0300

    ActionItem780: refactoring tests and forms
    Moises Machado
     

04 Sep, 2008

1 commit

  • 2c2f7890   ActionItem438: implemented SSL requirements ... Browse File » 
    Changes:

    * Implemented require_ssl and refuse_ssl in ApplicationController
    * Changed AccountController to require SSL
      + pointing to HTTPS in login forms
    * Changed PublicController to refuse SSL, and fixed all controllers
      in app/controllers/public to inherit from it (with some
      exceptions).
    * Changed MyProfileController to require SSL

Side-effects:

    * Some controllers had been changed in an unappropriated way for the
      new SSL requirement.
    * Some tests changed to reflect the new SSL requirements.
    * Needed to tweak content_viewer controller to deal with SSL URL's:
      + Fixed detection of user coming from public view that was broke
        by the SSL thing.
    * adapted enterprise_registration tests

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2458 3f533792-8f58-4932-b0fe-aaf55b0a4547
    AntonioTerceiro
     

26 Aug, 2008

1 commit

23 Aug, 2008

1 commit

21 Jul, 2008

1 commit

19 Jul, 2008

1 commit