13 Aug, 2014

2 commits

04 Aug, 2014

4 commits

30 Jul, 2014

1 commit

28 Jul, 2014

1 commit

27 Jul, 2014

3 commits

22 Jul, 2014

2 commits

14 May, 2014

1 commit

30 Jan, 2014

1 commit

09 Jan, 2014

1 commit

  • 6adc8bc2   Merge branch 'master' into rails3 ... Browse Dir » 
    Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

06 Jan, 2014

1 commit

16 Dec, 2013

1 commit

21 Nov, 2013

2 commits

23 Oct, 2013

1 commit

01 Jan, 2013

1 commit

25 Dec, 2012

2 commits

21 Aug, 2012

1 commit

07 Aug, 2012

1 commit

05 Jul, 2012

2 commits

  • 4e225ec6   Moving memberships view to a partial Browse Dir »
    Rodrigo Souto
     
  • 32ea7f36   Adding new hotspots ... Browse Dir » 
      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
     

27 Jan, 2012

1 commit

08 Dec, 2011

1 commit

07 Dec, 2011

1 commit

10 Oct, 2011

1 commit

  • 619223c6   Bsc Plugin ... Browse Dir » 
    * 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
     

27 Jan, 2011

1 commit

  • b8ade540   Procedure after last admin leaves organization ... Browse Dir » 
    * if he is also last member, the next user to join organization will become admin
* if has other members, admin must choose some user to become admin
* Generalized enterprise add_member interface.
* Using json to manage action after join/leave/add/remove
community/friend through ajax.
* Person.members_of now returns unique profiles

(ActionItem1400)
    Daniela Feitosa
     

30 Nov, 2010

1 commit

21 Oct, 2010

1 commit

01 Jul, 2010

1 commit

  • 6aa4927c   Custom fields fixed ... Browse Dir » 
     * Fixed fields that weren't in the custom fields options.
 * Included "Display on creation|registration" feature for
   organization fields.
 * Included fields dependencies:
     [field]   -> [dependencies]
     required  -> active, signup
     signup    -> active
 * Javascripts to grant the dependencies on the radioboxes.
 * Changing the validation of fields presence message.
 * Also removing some unwanted endline spaces.

(ActionItem1509)
    Rodrigo Souto
     

16 Apr, 2010

2 commits

  • 6a7965a4   Remove inverted logic in environment features ... Browse Dir » 
    (ActionItem1482)
    Antonio Terceiro
     
  • 542135da   Fixing the Enterprise Registering Process ... Browse Dir » 
    * 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
     

15 Mar, 2010

1 commit

31 Oct, 2009

1 commit