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

2 commits

28 Mar, 2014

3 commits

26 Mar, 2014

1 commit

17 Mar, 2014

1 commit

12 Mar, 2014

1 commit

13 Feb, 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
     

29 Jan, 2014

1 commit

21 Jan, 2014

1 commit

20 Jan, 2014

1 commit

13 Dec, 2013

1 commit

04 Jul, 2013

1 commit

01 Jun, 2013

1 commit

24 Apr, 2013

1 commit

04 Mar, 2013

1 commit

15 Jan, 2013

1 commit

25 Oct, 2012

1 commit

21 Oct, 2012

1 commit

25 Sep, 2012

1 commit

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse File » 
    Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/application.rb
	app/controllers/public/account_controller.rb
	app/controllers/public/content_viewer_controller.rb
	lib/noosfero/i18n.rb
	test/functional/account_controller_test.rb
	test/functional/admin_controller_test.rb
	test/unit/contact_test.rb
	test/unit/profile_test.rb
    Antonio Terceiro
     

11 May, 2011

2 commits

09 May, 2011

2 commits

02 May, 2011

1 commit

28 Apr, 2011

2 commits

22 Feb, 2011

2 commits

18 Jan, 2011

1 commit

16 Jul, 2010

1 commit

13 Jul, 2010

1 commit

09 Jul, 2010

1 commit

08 Jul, 2010

1 commit

29 Jun, 2010

1 commit

05 Feb, 2010

1 commit

  • d9eb3631   Adding new features to SlideshowBlock, and blocks in general ... Browse File » 
      * added option to shuffle images
  * added navigation buttons
  * other changes:
    * Removed "toggle visibility" button and action in BoxOrganizer
      Controller
    * Bock#visible? now receives an optional context so that blocks can
      decide where they must be shown or not
    * BoxesHelper now passes the context into the Block#visible? method
    * Added title to Uploaded files and displaying it instead of the
      description when viewing files

(ActionItem1358)
    Antonio Terceiro