26 Apr, 2016

1 commit

08 Apr, 2016

1 commit

23 Mar, 2016

2 commits

  • d53e71f1   Remove PeopleBlock#footer ... Browse Dir » 
    This method was producing view code from within the model which is a
violation of MVC.

Part of the code was extracted into the new helper and most of it became
a view. This follow the standard for using
BoxesHelper#render_block_footer.
    Rafael Reggiani Manzo
     
  • 7024df4e   Remove PeopleBlock#content ... Browse Dir » 
    This method was producing view code from within the model which is a
violation of MVC.

Part of the code was extracted into the new helper and most of it became
a view. This follow the standard for using
BoxesHelper#render_block_content.
    Rafael Reggiani Manzo
     

22 Feb, 2016

1 commit

17 Feb, 2016

1 commit

11 Sep, 2015

2 commits

24 Jul, 2015

1 commit

13 Jul, 2015

1 commit

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
    Rodrigo Souto
     

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.
    Antonio Terceiro
     

20 Nov, 2014

1 commit

30 Sep, 2014

1 commit

13 Aug, 2014

1 commit

04 Aug, 2014

1 commit

27 Jun, 2014

2 commits

14 Jun, 2014

1 commit

05 Jun, 2014

5 commits

23 May, 2014

2 commits

16 May, 2014

1 commit

15 May, 2014

3 commits

14 May, 2014

2 commits

13 May, 2014

2 commits

12 May, 2014

2 commits

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

1 commit