17 Nov, 2015

1 commit

  • 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
     

12 Nov, 2015

1 commit


09 Nov, 2015

1 commit


07 Nov, 2015

1 commit


05 Nov, 2015

1 commit


02 Oct, 2015

1 commit


30 Sep, 2015

1 commit


28 Sep, 2015

1 commit

  • Adding a Dockerfile that builds de development environment. I pushed the
    first built machine with this Dockerfile on the following repository:
    
    https://hub.docker.com/r/noosfero/dev/
    
    I'm assuming the responsibility on maintaining this image updated with
    the lastest master branch. Whoever feels like help maintaining it send
    an email to noosfero-dev requesting access to the repository.
    Rodrigo Souto
     

26 Sep, 2015

1 commit


23 Sep, 2015

1 commit


22 Sep, 2015

1 commit


14 Sep, 2015

1 commit


13 Sep, 2015

1 commit


11 Sep, 2015

5 commits


08 Sep, 2015

2 commits


04 Sep, 2015

1 commit


01 Sep, 2015

2 commits


20 Aug, 2015

1 commit


15 Aug, 2015

1 commit


13 Aug, 2015

3 commits


11 Aug, 2015

2 commits


10 Aug, 2015

4 commits


06 Aug, 2015

1 commit


05 Aug, 2015

2 commits


29 Jul, 2015

1 commit


28 Jul, 2015

1 commit


27 Jul, 2015

1 commit