11 Aug, 2016

1 commit

26 Jul, 2016

1 commit

22 Jul, 2016

1 commit

10 May, 2016

1 commit

04 May, 2016

2 commits

27 Apr, 2016

2 commits

  • f7f1b042   Merge branch 'master' into staging Browse File »
    Leandro Santos
     
  • 31868a1a   Move products into a plugin ... Browse File » 
    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 File » 
    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
     

18 Apr, 2016

1 commit

  • dab58951   Fixing html_safe for noosfero core ... Browse File » 
    Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Carlos Purificação
     

11 Apr, 2016

1 commit

08 Apr, 2016

1 commit

06 Apr, 2016

1 commit

08 Mar, 2016

1 commit

23 Feb, 2016

1 commit

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
     

03 Nov, 2015

2 commits

28 Oct, 2015

1 commit

02 Oct, 2015

1 commit

30 Sep, 2015

1 commit

24 Sep, 2015

1 commit

  • ef41c154   Allow user to remove article or profile image ... Browse File »
    2 
    Additional improvements include:

- Makes 'Remove Image' checkbox optional
- Very ugly css hack to hide duplicated labels in some forms. I couldn't
find another way to avoid the labels generated by labelled_form_for nor
could I skip adding labels inside the helper since it's supposed to be
generic.
    Larissa Reis
     

13 Sep, 2015

1 commit

11 Sep, 2015

2 commits

04 Sep, 2015

2 commits

02 Sep, 2015

1 commit

  • 04576c7e   Fix clone article behavior ... Browse File » 
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Omar Júnior <omarroinuj@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Vítor Barbosa <vitornga15@gmail.com>
    Vitor Barbosa de Araujo
     

24 Jul, 2015

3 commits

12 Jul, 2015

1 commit

03 Jul, 2015

1 commit

25 Jun, 2015

2 commits

17 Jun, 2015

1 commit

  • 5ee24034   Refactoring article content visualization ... Browse File » 
      - Added image label
  - Added image to article body
  - Changed some minor positioning

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    André Guedes
     

16 Jun, 2015

1 commit

15 Jun, 2015

1 commit

12 Jun, 2015

1 commit

11 Jun, 2015

1 commit