08 Apr, 2016

1 commit

06 Apr, 2016

1 commit

05 Apr, 2016

1 commit

  • 11a81060   fixes community track plugin ... Browse Dir » 
    Signed-off-by: Evandro Magalhaes Leite Junior <evandro.leite@serpro.gov.br>
Signed-off-by: Gustavo Jaruga <darkshades@gmail.com>
Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Marcos Pereira
     

12 Nov, 2015

1 commit

13 Oct, 2015

1 commit

  • 66c7b785   Block store: improve usability of adding/moving blocks ... Browse Dir » 
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>

Conflicts:
	app/controllers/my_profile/profile_design_controller.rb
	app/helpers/boxes_helper.rb
	app/helpers/layout_helper.rb
	app/views/layouts/_javascript.html.erb
	public/stylesheets/application.css
	test/functional/environment_design_controller_test.rb
	test/functional/profile_design_controller_test.rb
    Victor Costa
     

28 Aug, 2015

1 commit

13 Aug, 2015

1 commit

24 Jul, 2015

2 commits

21 Jul, 2015

1 commit

23 Feb, 2015

1 commit

12 Aug, 2014

2 commits

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
     

13 Mar, 2014

1 commit

25 Feb, 2014

1 commit

17 Dec, 2013

7 commits

29 Nov, 2013

1 commit

28 Nov, 2013

1 commit

27 Nov, 2013

5 commits

23 Nov, 2013

1 commit

21 Nov, 2013

2 commits

08 Nov, 2013

2 commits

05 Nov, 2013

1 commit

30 Oct, 2013

1 commit

24 Oct, 2013

3 commits