04 Aug, 2016

1 commit

18 Jul, 2016

1 commit

16 Jul, 2016

1 commit

24 May, 2016

1 commit

23 May, 2016

1 commit

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
     

22 Apr, 2016

2 commits

19 Apr, 2016

2 commits

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

01 Apr, 2016

1 commit

08 Mar, 2016

1 commit

22 Feb, 2016

1 commit

18 Jan, 2016

1 commit

  • 062c5cea   Merge branch 'staging' into captcha_serpro_plugin ... Browse File » 
    * staging: (359 commits)
  Makes travis run all the tests via ./script/ci
  api: paginate members endpoint
  adds - TASK=rake test:all:db
  Added specific things for noosferogov
  api: return profile members
  Wont stop travis if Gemfile.lock does not exist
  api: expose profile type
  api: expose entities related to activity
  api: add activities endpoint
  api: fix login from cookie
  api: add endpoint for profiles
  api: create boxes enpoint
  api: login from noosfero cookie
  api: expose article type
  fix script production in app restart
  api: search profile by identifier
  api: expose boxes and blocks for profiles
  - rm Gemfile.lock
  Removing Gemfile.lock
  Setting will paginate to the version at debian stable
  ...

Conflicts:
	.gitmodules
	app/models/environment.rb
	lib/noosfero/api/v1/articles.rb
	test/unit/api/helpers_test.rb
	test/unit/api/test_helper.rb
    Evandro Junior
     

23 Nov, 2015

1 commit

  • 95fdfbab   Add custom field feature to core ... Browse File » 
    Custom fields can be added to any profile through the admin panel
in the 'Fields' section. They have the same behaviour as the current
Noosfero's fields (active, signup, required and privacy).

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     

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
     

01 Oct, 2015

1 commit

22 Sep, 2015

1 commit

15 Sep, 2015

1 commit

14 Sep, 2015

1 commit

  • 3d111ca7   Add option to block appearence edit ... Browse File » 
    - Add before_filter for check permission for open edit header and footer page
- Change environment feature name of disable_appearance to enable_appearance
- Update cucumber test change_appearance.feature

Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Omar Junior <omarroinuj@gmail.com>
Signed-off-by: vitorbaraujo <vitornga15@gmail.com>
Signed-off-by: Victor Matias Navarro <victor.matias.navarro@gmail.com>
    Luciano Prestes
     

28 Aug, 2015

3 commits

26 Aug, 2015

1 commit

13 Aug, 2015

2 commits

10 Aug, 2015

4 commits

09 Aug, 2015

3 commits

24 Jul, 2015

2 commits