28 Oct, 2015

1 commit

05 Sep, 2015

2 commits

  • c7e9ad9e   members page: total numbers of members on tabs title ... Browse Dir » 
    Also:
- Removed needless hidden_field_tag
- Moved repeated code to partial
    Daniela Feitosa
     
  • 8f571a5e   Split members page in admins and non-admins ... Browse Dir » 
      - Order members by name
  - Removed white spaces
  - Changed strings to be translated
  - Renamed div id and test
  - Adjust ul tag members
  - Fixed plugin dependency

Signed-off-by: Omar Junior <omarroinuj@gmail.com>
Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Omar Junior
     

11 Aug, 2015

3 commits

12 Jun, 2015

1 commit

08 Jun, 2015

1 commit

22 Apr, 2015

1 commit

21 Apr, 2015

2 commits

22 Feb, 2015

2 commits

11 Feb, 2015

1 commit

03 Feb, 2015

2 commits

20 Nov, 2014

1 commit

13 Nov, 2014

1 commit

03 Nov, 2014

1 commit

09 Oct, 2014

1 commit

  • 9be859d4   profile: refactor profile fields display process ... Browse Dir » 
    Also displays every field that is not defined in any category in the
last category called "General". Fields are now easily moved between
categories and categories a easily created.

Fields html generation centered in only one method and the field name
and value are customizable through methods.

Fix #14
    Rodrigo Souto
     

18 Aug, 2014

1 commit

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse Dir » 
    Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb
    Antonio Terceiro
     

06 Aug, 2014

1 commit

31 Jul, 2014

1 commit

28 Jul, 2014

1 commit

07 Jul, 2014

1 commit

30 Jun, 2014

1 commit

05 Jun, 2014

1 commit

04 Jun, 2014

1 commit

19 May, 2014

1 commit

13 May, 2014

3 commits

02 May, 2014

1 commit

13 Feb, 2014

1 commit

11 Feb, 2014

1 commit

  • e9fea38f   Merge branch 'master' into rails3-merge ... Browse Dir » 
    Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
    Rodrigo Souto
     

04 Feb, 2014

2 commits

31 Jan, 2014

2 commits