13 May, 2014

1 commit

  • 23914711   Merge branch 'master' into rails3 ... Browse Dir » 
    Conflicts:
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/models/community.rb
	app/models/enterprise.rb
	app/models/product_category.rb
	app/views/account/change_password.html.erb
	config/boot.rb
	config/environment.rb
	config/routes.rb
	lib/noosfero/plugin.rb
	test/unit/enterprise_activation_test.rb
	test/unit/person_notifier_test.rb
    Rodrigo Souto
     

12 May, 2014

6 commits

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
     

05 May, 2014

1 commit

29 Apr, 2014

1 commit

13 Apr, 2014

4 commits

11 Apr, 2014

1 commit

09 Apr, 2014

1 commit

08 Apr, 2014

1 commit

07 Apr, 2014

2 commits

02 Apr, 2014

3 commits

31 Mar, 2014

3 commits

30 Mar, 2014

2 commits

29 Mar, 2014

1 commit

28 Mar, 2014

4 commits

27 Mar, 2014

1 commit

  • 05702e4a   Suggest available username ... Browse Dir » 
    (ActionItem3009)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Arhur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    alcampelo
     

26 Mar, 2014

3 commits

20 Mar, 2014

1 commit

18 Mar, 2014

3 commits

  • edc5d4c5   Translate layout template strings Browse Dir »
    Braulio Bhavamitra
     
  • b28af681   Don't show the strong of password if the field is blank ... Browse Dir » 
    -Edited the javascript adding a var blankPass
-Code Review. Daniela: "When I filled in the username and used "tab"
to go to password field, it already displayed the "short"
message. You should test if there's at least one character
before checking the password strength :)"

(ActionItem3008)

Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>

Color of password rate message moved to style.css

-Edited the style css adding the id of password rate messages
with yours respective colors
-Code Review. Daniela: "The style of an element should not be
included directly on the element, but on a CSS file :)
Adding the style on a separated file will make the code cleaner
and will be better to style it on themes that don't like the
default colors, for example."

(ActionItem3008)

Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Luciano Prestes
     
  • 20d798fd   Password rate implemented ... Browse Dir » 
    -Added javascript for password-rate
-Added span fields for password rate display

The password is automatically considered short if length is fewer than four
and considered bad if its the same as the username. It'll be considered
good or strong depending on the score, which is calculated based on
characters, numbers, and special characters presented in the password.

(ActionItem3008)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
    Gust