03 Oct, 2016

1 commit

14 Sep, 2016

1 commit

11 Aug, 2016

1 commit

12 Jul, 2016

1 commit

11 Jul, 2016

1 commit

27 Apr, 2016

2 commits

  • f7f1b042   Merge branch 'master' into staging Browse Dir »
    Leandro Santos
     
  • 31868a1a   Move products into a plugin ... Browse Dir » 
    This will many further improvements to the products, such as:
- Interaction with other plugins such as suppliers, stock and
currencies. The inteface can change in such a way that if done
usings hotspots would hurt usability and coherence.
- More autonomy to develop and integrate other features
(in the next months we will integrate batch edition and stock,
currencies might come next)
- More declouping from core and other components
    Braulio Bhavamitra
     

25 Apr, 2016

1 commit

  • 13e6bd4a   Merge branch 'master' into staging ... Browse Dir » 
    Conflicts:
	.travis.yml
	app/controllers/my_profile/tasks_controller.rb
	app/helpers/application_helper.rb
	app/views/profile_editor/_pending_tasks.html.erb
	app/views/tasks/processed.html.erb
	test/functional/tasks_controller_test.rb
    Victor Costa
     

20 Apr, 2016

1 commit

11 Apr, 2016

1 commit

08 Apr, 2016

1 commit

07 Apr, 2016

1 commit

24 Mar, 2016

1 commit

16 Mar, 2016

1 commit

15 Mar, 2016

1 commit

08 Mar, 2016

1 commit

29 Feb, 2016

1 commit

23 Feb, 2016

1 commit

22 Feb, 2016

1 commit

28 Jan, 2016

2 commits

26 Jan, 2016

1 commit

22 Jan, 2016

2 commits

19 Jan, 2016

1 commit

08 Jan, 2016

1 commit

05 Jan, 2016

1 commit

30 Dec, 2015

2 commits

14 Dec, 2015

4 commits

10 Dec, 2015

2 commits

09 Dec, 2015

1 commit

23 Nov, 2015

1 commit

17 Nov, 2015

1 commit

  • 92fbfd94   Merge branch 'master_rails4' into staging ... Browse Dir » 
    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

11 Nov, 2015

1 commit