05 Jul, 2016

1 commit

06 May, 2016

1 commit

  • 26a6adaf   Send email to environment and profile admins ... Browse Dir » 
    - Environment admins can now choose the recipients
that will recieve an email sent throw the admin panel.
There are now 3 options: All users(exclusive with other options)
			 Environment Admins(inclusive with opt below)
			 Profile Admins(inclusive with opt above)

Signed-off-by: Artur Bersan de Faria <arturbersan@gmail.com>
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
Signed-off-by: Omar Junior <omarroinuj@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Signed-off-by: Sabryna Sousa <sabryna.sousa1323@gmail.com>
    Tallys Martins
     

27 Apr, 2016

1 commit

  • 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
     

08 Apr, 2016

1 commit

01 Apr, 2016

1 commit

31 Mar, 2016

1 commit

18 Nov, 2015

1 commit

  • 7be7e7c6   Add custom field feature to core ... Browse Dir »
    1 
    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
     

13 Sep, 2015

1 commit

24 Jul, 2015

2 commits

28 May, 2015

1 commit

08 May, 2015

1 commit

12 Feb, 2015

1 commit

03 Feb, 2015

1 commit

  • 71439c6c   Merge branch 'master' into stoa ... Browse Dir » 
    Conflicts:
	app/controllers/my_profile/profile_editor_controller.rb
	app/helpers/search_helper.rb
	app/models/invitation.rb
	app/models/person.rb
	app/views/cms/view.html.erb
	app/views/templates/index.html.erb
	plugins/community_track/views/content_viewer/_step_item.html.erb
	test/functional/home_controller_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
    Rodrigo Souto
     

26 Jan, 2015

2 commits

20 Jan, 2015

2 commits

  • 46080e93   Merge branch 'AI3287_deactive_and_active_profile' into 'master' ... Browse Dir » 
    Ai3287 deactive and active profile

Feature: https://noosfero.org/Development/ActionItem3287

This patch add the activate/deactivate feature for organizations. It also add a new administrator feature to manage organizations status in admin pannel.

See merge request !357
    Antonio Terceiro
     
  • 6984558b   Add UI to activate and deactivate profiles ... Browse Dir » 
    (ActionItem3287)
It can be done while edit a profile or in environment administration panel

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
    Fabio Teixeira
     

19 Jan, 2015

1 commit

08 Sep, 2014

1 commit

  • 79e1ad7b   Merge branch 'master' into stoa ... Browse Dir » 
    Conflicts:
	app/controllers/application_controller.rb
	app/controllers/my_profile/memberships_controller.rb
	app/controllers/public/account_controller.rb
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/helpers/token_helper.rb
	app/views/account/signup.html.erb
	app/views/layouts/_javascript.html.erb
	db/schema.rb
	test/functional/application_controller_test.rb
    Rodrigo Souto
     

27 Aug, 2014

1 commit

18 Aug, 2014

1 commit

12 Aug, 2014

1 commit

11 Aug, 2014

1 commit

21 Jul, 2014

1 commit

17 Jul, 2014

1 commit

08 Jul, 2014

1 commit

30 Jun, 2014

1 commit

15 Jun, 2014

1 commit

14 Jun, 2014

1 commit

05 Jun, 2014

2 commits

14 May, 2014

1 commit

06 May, 2014

1 commit

  • 1182476c   Merge branch 'rails235' into rails3 ... Browse Dir » 
    * rails235: (168 commits)
  L10n: support for custom locales
  enhancements: visualization of suggested usernames
  Allowing translation for url checking string
  Removed unnecessary lines on test
  Removed unit tests from functionals file
  Fixed html and test syntax
  Removed needless condition
  Fixed suggestions of usernames
  Test files should ends with "_test.rb"
  Added pagination on events_by_day on profile agenda
  Fix missing variable in funcional test
  Fix unit tests
  Change routes from embed controller
  Remove unused code
  Autocomplete fields on page load
  Blocks can returns a block of code to be evaluated
  Avoid randomness on tests
  comment-group-plugin: avoid randomness on tests
  community-track-plugin: fix tests by creating a profile with default boxes
  anti-spam-plugin-wrapper: ensure to load concrete wrappers
  ...

Conflicts:
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/contact.rb
	app/models/event.rb
	app/models/mailing.rb
	app/models/organization.rb
	app/models/organization_mailing.rb
	app/models/pending_task_notifier.rb
	app/models/person.rb
	app/models/profile.rb
	app/models/scrap.rb
	app/models/task_mailer.rb
	app/models/user.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/profile_image.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/box_organizer/_link_list_block.rhtml
	app/views/box_organizer/edit.rhtml
	app/views/features/_manage_community_fields.rhtml
	app/views/features/_manage_enterprise_fields.rhtml
	app/views/features/_manage_person_fields.rhtml
	app/views/features/index.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/users/_users_list.rhtml
	db/schema.rb
	features/forum.feature
	lib/feed_handler.rb
	lib/noosfero/plugin.rb
	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	plugins/spaminator/lib/spaminator_plugin/mailer.rb
	test/functional/content_viewer_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/profile_design_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/contact_sender_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/environment_mailing_test.rb
	test/unit/mailing_test.rb
	test/unit/organization_mailing_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
	test/unit/uploaded_file_test.rb
	vendor/plugins/action_tracker/lib/action_tracker_model.rb
    Victor Costa
     

16 Mar, 2014

2 commits

13 Mar, 2014

1 commit

12 Mar, 2014

3 commits