03 Feb, 2015

1 commit

  • 71439c6c   Merge branch 'master' into stoa ... Browse File » 
    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

1 commit

14 Jan, 2015

1 commit

22 Jul, 2014

1 commit

26 Jun, 2014

2 commits

06 May, 2014

1 commit

  • 1182476c   Merge branch 'rails235' into rails3 ... Browse File » 
    * 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
     

30 Mar, 2014

1 commit

05 Feb, 2014

1 commit

07 May, 2013

1 commit

15 Apr, 2013

1 commit

05 Mar, 2013

1 commit

21 Aug, 2012

1 commit

05 Jul, 2012

1 commit

  • 32ea7f36   Adding new hotspots ... Browse File » 
      1. organization_members: allows plugins to extend the list of members of
  an organization.

  2. has_permission?: allows plugins to add permission to some user to
  perform some action over a profile or environment. This hotspot only
  allows plugins to expand access, not to revoke access.

  3. new_community_hidden_fields and
  enterprise_registration_hidden_fields: allows plugins to include new
  hidden fields in the following forms.

  * Also including a monkey patch to include some features from the gem
    fake_arel that requires activesupport-2.3.14 and
    activerecord-2.3.14. This them allows OR with scopes without loading
    them.
    Rodrigo Souto
     

19 May, 2012

1 commit

16 Mar, 2012

2 commits

07 Mar, 2012

1 commit

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse File » 
    Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/application.rb
	app/controllers/public/account_controller.rb
	app/controllers/public/content_viewer_controller.rb
	lib/noosfero/i18n.rb
	test/functional/account_controller_test.rb
	test/functional/admin_controller_test.rb
	test/unit/contact_test.rb
	test/unit/profile_test.rb
    Antonio Terceiro
     

10 Oct, 2011

1 commit

  • 619223c6   Bsc Plugin ... Browse File » 
    * Refactoring profile management to use tokeninput
  * Also, adding support of tokeninput to the core
* Adding attributes validated and cnpj to enterprise
* Environment option to define enterprise as validated by defaul
* Making profile namedscopes consider subclasses too
* Adapting enterprise icon and identification to meet Bsc expectations
* Adapting profile info actions to meet Bsc expectations
* Adapting control panel buttons to meet Bsc expectations
* Adapting core product to meed Bsc expectations
* Adding and fixing plugin hotspots

(ActionItem2085, ActionItem2087, ActionItem2086, ActionItem2088)
    Rodrigo Souto
     

22 Feb, 2011

2 commits

30 Jul, 2010

1 commit

28 Jun, 2010

1 commit

16 Apr, 2010

1 commit

  • 542135da   Fixing the Enterprise Registering Process ... Browse File » 
    * The registration has two validation type: region and admin.
		+ Admin
			- There is no validator to choose.
			- The regions to choose are states (This might be changed
			  in the future).
			- The admins of the environment recieves the task to approve
			  the registration of this new enterprise.
			- The region field isn't displayed.
		+ Region
			- If there isn't any validator, shows a message that it's
			  not possible to register any enterprise and don't show the
			  form.
			- Show only the regions where is registered at least one
			  validator.
			- The region field is displayed.
   	* The required fields are highlithed.
	* The fields that are active or required are set through the
	  administration panel.
	* Only the fields name and identifier are always required.
   	* After registering a new enterprise, the user is set as an admin of
   	  it.
   	* The cancel button in the register form is working properly.
   	* In the "Validator" step, the radio button is choosing a default
   	  option.
   	* Cancel radio_button in the task validation has a "Rejection
   	  Explanation" field that is required.
   	* Some navigation buttons added.
   	* Changed some buttons to labelled buttons.
	* The "Register a new enterprise" button is an admin option.

(ActionItem1482)
    Rodrigo Souto
     

04 Sep, 2008

1 commit

  • 2c2f7890   ActionItem438: implemented SSL requirements ... Browse File » 
    Changes:

    * Implemented require_ssl and refuse_ssl in ApplicationController
    * Changed AccountController to require SSL
      + pointing to HTTPS in login forms
    * Changed PublicController to refuse SSL, and fixed all controllers
      in app/controllers/public to inherit from it (with some
      exceptions).
    * Changed MyProfileController to require SSL

Side-effects:

    * Some controllers had been changed in an unappropriated way for the
      new SSL requirement.
    * Some tests changed to reflect the new SSL requirements.
    * Needed to tweak content_viewer controller to deal with SSL URL's:
      + Fixed detection of user coming from public view that was broke
        by the SSL thing.
    * adapted enterprise_registration tests

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2458 3f533792-8f58-4932-b0fe-aaf55b0a4547
    AntonioTerceiro
     

10 Jul, 2008

1 commit

29 Apr, 2008

1 commit

24 Apr, 2008

2 commits

25 Oct, 2007

1 commit

17 Oct, 2007

1 commit

  • 14f976dc   ActionItem14: merging work done offline at João Pessoa. Keeping individual log m… ... Browse File » 
    …essages below to reach this commit from their respective action items.

r716@cabula:  terceiro | 2007-10-15 16:42:10 +0000
creting local branch for trunk

r717@cabula:  terceiro | 2007-10-15 20:03:03 +0000
ActionItem14: working on the user interface for enterprise registration

r724@cabula:  terceiro | 2007-10-16 21:44:04 +0000
ActionItem85: adding script for downloading plugins when using svk

r725@cabula:  terceiro | 2007-10-16 22:58:38 +0000
ActionItem14: implementing helper method

r726@cabula:  terceiro | 2007-10-16 23:34:59 +0000
ActionItem14: making test more complete

r727@cabula:  terceiro | 2007-10-17 12:36:20 +0000
ActionItem85: commenting out unexisting javascript

r728@cabula:  terceiro | 2007-10-17 15:58:58 +0000
ActionItem14: implementing enterprise registration controller. Still missing some TODO items.
 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@716 3f533792-8f58-4932-b0fe-aaf55b0a4547
    AntonioTerceiro