11 Feb, 2014

1 commit

  • 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
     

16 Jan, 2014

1 commit


08 Jan, 2014

1 commit

  • - Added buttons at members block.
    - Added checkbox to show or not the buttons on the community members.
    - Removed the render button "enter/leave" when the checkbox that enables the button is unchecked
    - Adjusted style CSS and display button
    - Added cucumber and unit tests.
    - Removed some spaces.
    - There are two cucumber tests that wasn't done by the our team that fail if you don't use selenium. The files are publish_article.feature line 20 and search_enterprises.feature line 33 and we didn't modify them.
    
    (ActionItem2844)
    
    Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
    Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
    Signed-off-by: Tales Martins <tales.martins@gmail.com>
    Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
    Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Carlos Andre de Souza
     

26 Jul, 2013

1 commit


10 Sep, 2010

1 commit

  •   * Rewrite ProfileListBlock logic to become simpler and faster
      * Rewrite membership logic to use named scopes instead of loading the
        entire list and doing filters with Ruby code.
      * Moved Noosfero-specific membership logic from access control plugin to
        Noosfero models.
      * Removed useless tests
      * Fixed tests that assumed the slow implementation
    Antonio Terceiro
     

05 Feb, 2010

1 commit


20 Jan, 2010

1 commit

  •   * Added migration to add visible to profiles
      * Some improvements on profile screen
      * A private profile displays a different profile screen
        * added profile image, name, description and message
        * added link to join if profile is a community
        * added link to "add friend" if profile is a person
      * Added description in profile
      * Added field description to organization and person form
      * Removed link and added button on not_found page
      * Added css for not access_denied message
      * Changed css for flash messages
      * Recent articles doens't list private profile's articles
      * Private profiles are listed on blocks and searches
      * Invisible profiles are never listed
      * Join community popup will be displayed if profile is private
      * Join community popup will not be displayed if profile is invisible
      * If an organization is private, it is also closed
    Daniela Feitosa
     

28 Sep, 2009

1 commit


25 May, 2009

1 commit


05 Sep, 2008

1 commit

  •     * Added more options to move blocks: a button for "move this block
          to the oposite side".
        * Added help button for each block.
          + Wrote help for all blocks, plus enhancing the existing help in
          some blocks.
        * Adapted tests to the new bahaviour and added some tests.
    
    git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2463 3f533792-8f58-4932-b0fe-aaf55b0a4547
    AntonioTerceiro
     

09 Jul, 2008

1 commit


24 Apr, 2008

1 commit


15 Feb, 2008

2 commits


13 Feb, 2008

1 commit


09 Feb, 2008

1 commit