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
     

10 Nov, 2015

1 commit


22 Sep, 2015

1 commit


11 Sep, 2015

1 commit


15 Apr, 2015

1 commit


10 Apr, 2015

1 commit


29 Sep, 2014

1 commit


29 Apr, 2014

1 commit

  • Some specific points:
    
    - ./script/quick-start not works from start to end on a clean Debian
      wheezy system
    - Gemfile: remove checking for programs since the Gemfile is not really
      the right place to do this
    - Gemfile.lock: lock gem versions against Debian wheezy.  This assumes
      package versions in Debian wheezy + some backported packages available
      at http://people.debian.org/~terceiro/noosfero-wheezy-backports/
    - db:data:minimal: add an explicit contact email to the new environment.
      This fixes a long standing issue: when installing Noosfero on a brand
      new system, exim MTA will choke on a malformed sender address, and
      abort the entire installation.
    - added a simple Vagrantfile for development purposes
    
    Pending:
    
    - provide proper backports for packages and drop the temporary
      http://people.debian.org/~terceiro/noosfero-wheezy-backports/
    Antonio Terceiro
     

22 Nov, 2013

1 commit


21 May, 2013

1 commit


08 May, 2013

1 commit


15 Mar, 2013

1 commit


27 Dec, 2012

1 commit


06 Dec, 2012

1 commit


25 Oct, 2012

1 commit


22 Jul, 2012

1 commit


18 Jul, 2012

1 commit


09 Apr, 2012

1 commit


16 Mar, 2012

1 commit

  • Conflicts:
    	INSTALL
    	app/helpers/application_helper.rb
    	app/views/account/signup.rhtml
    	app/views/layouts/application-ng.rhtml
    	app/views/search/_product.rhtml
    	debian/control
    	debian/noosfero.install
    	debian/noosfero.links
    	features/step_definitions/noosfero_steps.rb
    	script/production
    Daniela Feitosa
     

29 Feb, 2012

1 commit


19 Feb, 2012

1 commit


10 Jan, 2012

2 commits


22 Dec, 2011

1 commit


17 Aug, 2011

1 commit


16 Aug, 2011

2 commits


11 Aug, 2011

1 commit


02 Jun, 2011

1 commit


31 Jan, 2011

1 commit


27 Jan, 2011

1 commit


19 Dec, 2010

3 commits