AvaliaSPB / Noosfero

03 Feb, 2015

1 commit

71439c6c Merge branch 'master' into stoa ... Browse Dir »

Conflicts:
	app/controllers/my_profile/profile_editor_controller.rb
	app/helpers/search_helper.rb
	app/models/invitation.rb
	app/models/person.rb
	app/views/cms/view.html.erb
	app/views/templates/index.html.erb
	plugins/community_track/views/content_viewer/_step_item.html.erb
	test/functional/home_controller_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb

2015-02-03 18:06:21 -0300

16 Jan, 2015

1 commit

b853d6c3 [profile-suggestions] Fixes people_block test and adds a couple more ... Browse Dir »

  `instance_eval` in FriendsBlockTest chokes on `user` so we avoid this
  `people_block` test from crashing by checking if suggestions exist
  first. Therefore this unit test is only testing for a view all link,
  so I wrote a couple more tests to test the added suggestion feature
  inside the block.

  I wasn't sure where to put a test to actually test that the
  suggestions are being rendered so I created a ProfileControllerTest,
  but I'm open to suggestions on where it would be best :)

2015-01-16 23:13:23 -0300

15 Jan, 2015

1 commit

d4587481 Deduplicate strings from plugins ... Browse Dir »

I have deduplicated every message in plugin code that was already in the
core. Going forward, plugins should use c_() is they want to reuse the
message from the core. If they want to force their own translation, they
should probably use _('plugin_name|The message') to avoid overriding
translations from the core.