11 Aug, 2015

1 commit

10 Aug, 2015

2 commits

31 Jul, 2015

1 commit

09 Apr, 2015

1 commit

26 Jan, 2015

1 commit

28 Oct, 2014

1 commit

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
     

18 Mar, 2014

1 commit

21 Feb, 2014

1 commit

03 Feb, 2014

1 commit

20 Jan, 2014

1 commit

09 Oct, 2013

1 commit

05 Sep, 2013

1 commit

05 Sep, 2012

2 commits

07 Aug, 2012

1 commit

17 May, 2012

4 commits

22 Feb, 2011

1 commit

27 Jan, 2011

1 commit

  • b8ade540   Procedure after last admin leaves organization ... Browse File » 
    * 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
     

25 Nov, 2010

1 commit

26 Oct, 2010

1 commit

04 Oct, 2010

1 commit

21 Sep, 2010

1 commit

  • e3ee6d37   Implmenting some improvement on profile activity: ... Browse File » 
      * The users member of a community shoudl be notified with the information of where that noficication is.
  * The friendship relationship should be notified to the both users
  * If the article is created automaticaly according its template this article should not be notified
  * The article approval should not notify the article with the user who aproved it as the user that made the article

(ActionItem1303)
    Leandro Santos
     

11 Sep, 2010

1 commit

17 Jul, 2010

1 commit

02 Jul, 2010

1 commit

12 May, 2010

1 commit

  • 688faaee   Fields verification filters malformed html correctly ... Browse File » 
    * The field verification now occurs before de validation.
	* Fields that uses the full filter escape residual '<' and '>' after
	  filtering wellformed tags.
	* Fields that uses white_list filter only escape the '<' and '>'
	  symbols if the tag is not wellformed.
	* This patch only fixes the fields that were before being
	  filtered. A full field verification is need to check the way each
	  field must be filtered.

(ActionItem1491)
    Rodrigo Souto
     

01 Feb, 2010

1 commit

31 Oct, 2009

1 commit

11 May, 2009

1 commit

15 Dec, 2008

1 commit

  • 0ba97d30   ActionItem833: port unifreire-specific changes as configuration into master branch ... Browse File » 
      * making fields appear on signup form
  * environment has a list of Category subclasses that must be available for users; if there is only one category type available, no need of asking for category type
  * environment has a setting categories_menu which enables/disables the category menu. If it is disabled, then no need to ask for a color in the menu
  * add a configuration to the environment called disable_gender_icon. When it is false, don't display gender icons.

  * adding css for profile_data
  * adding required on label for schooling fixing javascript
  * adding fields on signup and option to admin manage
  * adding required message on required fields
  * adding partials for person/enterprise/community fields
  * adding methods for person/community/enterprise custom_fields
  * adding option to admin manage person fields
    Daniela Feitosa
     

25 Aug, 2008

1 commit

23 Aug, 2008

1 commit

21 Jul, 2008

1 commit

28 May, 2008

1 commit

16 May, 2008

1 commit