11 Sep, 2015

1 commit

05 Sep, 2015

1 commit

  • 8f571a5e   Split members page in admins and non-admins ... Browse Dir » 
      - Order members by name
  - Removed white spaces
  - Changed strings to be translated
  - Renamed div id and test
  - Adjust ul tag members
  - Fixed plugin dependency

Signed-off-by: Omar Junior <omarroinuj@gmail.com>
Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Omar Junior
     

13 Aug, 2015

1 commit

31 Jul, 2015

1 commit

24 Jul, 2015

2 commits

13 Jul, 2015

1 commit

03 Mar, 2015

1 commit

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 :)
    Larissa Reis
     

12 Nov, 2014

1 commit

24 Jul, 2014

1 commit

06 Jun, 2014

1 commit

02 Jun, 2014

3 commits

28 May, 2014

2 commits

23 May, 2014

1 commit

20 May, 2014

1 commit

19 May, 2014

2 commits

16 May, 2014

1 commit

14 May, 2014

2 commits

13 May, 2014

6 commits

12 May, 2014

1 commit

09 May, 2014

1 commit

08 May, 2014

1 commit

06 May, 2014

1 commit

  • 1182476c   Merge branch 'rails235' into rails3 ... Browse Dir » 
    * 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
     

05 May, 2014

3 commits

29 Apr, 2014

1 commit

23 Apr, 2014

1 commit

22 Apr, 2014

1 commit