12 May, 2015

3 commits


06 Apr, 2015

1 commit


24 Mar, 2015

1 commit


03 Feb, 2015

4 commits


28 Jan, 2015

1 commit


15 Jan, 2015

3 commits


19 Dec, 2014

1 commit


08 Dec, 2014

1 commit


20 Nov, 2014

2 commits


31 Oct, 2014

1 commit


14 Oct, 2014

1 commit


08 Sep, 2014

1 commit

  • Conflicts:
    	app/controllers/application_controller.rb
    	app/controllers/my_profile/memberships_controller.rb
    	app/controllers/public/account_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/layout_helper.rb
    	app/helpers/token_helper.rb
    	app/views/account/signup.html.erb
    	app/views/layouts/_javascript.html.erb
    	db/schema.rb
    	test/functional/application_controller_test.rb
    Rodrigo Souto
     

18 Aug, 2014

2 commits


28 Jul, 2014

1 commit


22 Jul, 2014

1 commit


04 Jul, 2014

2 commits


03 Jun, 2014

1 commit


13 May, 2014

1 commit

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

06 May, 2014

2 commits

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

11 Apr, 2014

1 commit


14 Mar, 2014

1 commit


20 Feb, 2014

1 commit


18 Feb, 2014

1 commit


13 Feb, 2014

1 commit


11 Feb, 2014

2 commits


24 Jan, 2014

1 commit


23 Jan, 2014

2 commits