17 Nov, 2015

1 commit

  • 92fbfd94   Merge branch 'master_rails4' into staging ... Browse File » 
    Conflicts:
	Gemfile
	Rakefile
	app/controllers/box_organizer_controller.rb
	app/controllers/my_profile/tasks_controller.rb
	app/controllers/public/profile_controller.rb
	app/mailers/user_mailer.rb
	app/models/article.rb
	app/models/person.rb
	app/models/product_category.rb
	app/models/task.rb
	config/application.rb
	config/routes.rb
	lib/acts_as_having_settings.rb
	lib/noosfero/api/entities.rb
	lib/noosfero/api/helpers.rb
	lib/noosfero/api/session.rb
	lib/noosfero/api/v1/articles.rb
	lib/noosfero/api/v1/contacts.rb
	lib/noosfero/api/v1/search.rb
	lib/noosfero/api/v1/users.rb
	test/functional/tasks_controller_test.rb
	test/unit/api/articles_test.rb
	test/unit/api/helpers_test.rb
	test/unit/api/people_test.rb
	test/unit/api/search_test.rb
	test/unit/api/session_test.rb
	test/unit/api/users_test.rb
	test/unit/person_notifier_test.rb
	test/unit/task_test.rb
	vendor/plugins/access_control/lib/acts_as_accessible.rb
    Victor Costa
     

13 Sep, 2015

1 commit

13 Aug, 2015

2 commits

31 Jul, 2015

1 commit

25 Jul, 2015

3 commits

24 Jul, 2015

2 commits

03 Jul, 2015

1 commit

01 Jul, 2015

1 commit

05 Jun, 2015

2 commits

03 Jun, 2015

2 commits

30 May, 2015

1 commit

26 May, 2015

2 commits

28 Jan, 2015

1 commit

  • d9a3fdb3   Merge branch 'master' into stable ... Browse File » 
    Conflicts:
	app/helpers/article_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/block.rb
	app/views/content_viewer/view_page.html.erb
	db/schema.rb
	plugins/community_track/views/blocks/_track_list_more.html.erb
	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
	public/javascripts/article.js
	test/unit/block_test.rb
	test/unit/person_notifier_helper_test.rb
    Victor Costa
     

26 Jan, 2015

1 commit

10 Nov, 2014

1 commit

22 Jan, 2014

1 commit

20 Jan, 2014

1 commit

09 Jan, 2014

1 commit

  • 6adc8bc2   Merge branch 'master' into rails3 ... Browse File » 
    Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

14 Oct, 2013

1 commit

09 Oct, 2013

1 commit

05 Sep, 2013

1 commit

21 Aug, 2013

1 commit

20 Aug, 2013

1 commit

30 Nov, 2012

1 commit

10 Sep, 2012

1 commit

29 Jun, 2012

1 commit

  • e6b525e9   Checks whether there is target email before sending notification ... Browse File » 
      If ActionMailer tries to send a mail without recipient, the smtp will
  throw an syntax error. This checks whether there is a target and that
  given target has an email for notification before calling the
  TaskMailer to deliver the message.

  Also fixes the tests that crashed because of this new restriction and
  creates a test to this restriction.

(ActionItem2370)
    Larissa Reis
     

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse File » 
    Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/application.rb
	app/controllers/public/account_controller.rb
	app/controllers/public/content_viewer_controller.rb
	lib/noosfero/i18n.rb
	test/functional/account_controller_test.rb
	test/functional/admin_controller_test.rb
	test/unit/contact_test.rb
	test/unit/profile_test.rb
    Antonio Terceiro
     

11 Oct, 2011

1 commit

22 Feb, 2011

1 commit

01 Feb, 2011

1 commit

26 Jan, 2011

1 commit

  • e7464a3d   Multitask ... Browse File » 
    + Multi-processing tasks.
  + Graciously show/hide functions with the smooth slide of
  + Jquery. ^^
  + Using Unobtrusive Javascript.
  + Customized messages for each task type.
  + Button "Set all to approve/reject/skip".
  + Icons related to the task action.

  * Missing
    - Need to make selenium tests.

(ActionItem1527)
    Rodrigo Souto
     

16 Dec, 2010

1 commit

17 Jul, 2010

1 commit