15 Apr, 2015

1 commit

17 Jul, 2014

1 commit

08 Jul, 2014

2 commits

07 Jul, 2014

1 commit

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
     

14 Mar, 2014

1 commit

13 Mar, 2014

2 commits

22 Jan, 2014

1 commit

  • ead32981   check_all_manage_fields: ... Browse Dir » 
    - When the field "check/uncheck all" is checked or unchecked, all fields below are checked or unchecked
 - Corrected onclick events on active/required/signup fields
 - Replaced javascript logic from person/community/enterprise to a single javascript file
 - Cucumber tests for check/uncheck all fields

(ActionItem2962)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gustavo Cruz <darksshades@hotmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Signed-off-by: Renan Costa <renan2727@hotmail.com>
    Fabio Teixeira
     

01 Jan, 2013

1 commit

25 Dec, 2012

2 commits

27 Oct, 2012

1 commit

22 Dec, 2011

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
     

20 May, 2009

1 commit

22 Apr, 2009

1 commit

20 Apr, 2009

1 commit

08 Apr, 2009

1 commit

17 Dec, 2008

1 commit

15 Dec, 2008

1 commit

  • 0ba97d30   ActionItem833: port unifreire-specific changes as configuration into master branch ... Browse Dir » 
      * 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
     

30 Jan, 2008

1 commit

16 Jan, 2008

1 commit

11 Oct, 2007

1 commit

22 Sep, 2007

2 commits

23 Jul, 2007

4 commits

17 Jul, 2007

1 commit

09 Jul, 2007

1 commit