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
     

16 Mar, 2014

2 commits

25 Dec, 2012

1 commit

09 Feb, 2012

1 commit

30 Jul, 2010

1 commit

05 Feb, 2010

1 commit

20 Jan, 2010

1 commit

  • 1f9140cd   Allowing private users/organizations to be viewed ... Browse File » 
      * Added migration to add visible to profiles
  * Some improvements on profile screen
  * A private profile displays a different profile screen
    * added profile image, name, description and message
    * added link to join if profile is a community
    * added link to "add friend" if profile is a person
  * Added description in profile
  * Added field description to organization and person form
  * Removed link and added button on not_found page
  * Added css for not access_denied message
  * Changed css for flash messages
  * Recent articles doens't list private profile's articles
  * Private profiles are listed on blocks and searches
  * Invisible profiles are never listed
  * Join community popup will be displayed if profile is private
  * Join community popup will not be displayed if profile is invisible
  * If an organization is private, it is also closed
    Daniela Feitosa
     

27 May, 2009

1 commit

18 Sep, 2008

1 commit

05 Sep, 2008

2 commits

28 Aug, 2008

1 commit

23 Aug, 2008

1 commit

14 Aug, 2008

1 commit

21 Jul, 2008

2 commits

09 Jul, 2008

1 commit

29 Apr, 2008

1 commit

14 Apr, 2008

1 commit

15 Feb, 2008

1 commit

09 Feb, 2008

1 commit

28 Jan, 2008

2 commits