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
     

18 Mar, 2014

1 commit

24 Sep, 2013

1 commit

19 Jul, 2013

1 commit

  • b05904aa   Merge branch 'master' into rails3 ... Browse File » 
    Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control
    Antonio Terceiro
     

11 Jul, 2013

1 commit

06 Nov, 2012

1 commit

02 Sep, 2008

1 commit

  • 76a23b5f   ActionItem531: implementing change of template ... Browse File » 
    We are calling "template" the disposition of the main screen area. In other
words, a template is the disposition of columns. Currently there are three
templates:

    * default: left and right columns + main area
    * leftbar: main area + left column
    * rightbar: main area + right column

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