16 Mar, 2015

1 commit


13 Jan, 2015

1 commit


28 Jul, 2014

1 commit


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
     

23 Jan, 2014

1 commit


09 Jan, 2014

1 commit

  • - Added a field on article new/edit to specify which users can access the article
    - Added a relationship has_and_belongs_to_many between Article and Person
    - Created a new table article_privacy_exceptions for has_and_belongs_to_many
    - Added cucumber tests
    - Added a new cucumber step to add a user to the exception users list
    
    (ActionItem2852)
    
    Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
    Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
    Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
    Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
    Signed-off-by: Tales Martins <tales.martins@gmail.com>
    Arthur Del Esposte
     

07 Oct, 2013

1 commit


09 Aug, 2013

1 commit


09 May, 2013

1 commit


21 Aug, 2012

1 commit


25 Feb, 2012

1 commit


09 Feb, 2012

1 commit


27 Nov, 2011

1 commit


07 Jan, 2011

1 commit


10 Dec, 2010

1 commit


17 Sep, 2010

1 commit


27 Apr, 2009

1 commit


22 Apr, 2009

1 commit


19 Feb, 2009

1 commit


11 Dec, 2008

1 commit

  •   - display comment form opened
      - links to subscribe rss feed
      - show 'Edit blog' on view blog
      - display button to remove article when view
      - use select box instead of text fields to blog configuration
      - decreasing size of the field description
      - use 'New post' instead of 'New article'
    Joenio Costa
     

29 Nov, 2008

1 commit

  •     block to list amount of posts by month
        offer BlogArchivesBlock only if profile has blog
        pagination
        save feed options after create blog
        the settings of feeds must be editable trhough it's parent blog
        not offer to create sub-folder to blog
        the title of the post and the comments count are links to the specific article
        display count of blog-post comments
        users cant create more then one blog
    Joenio Costa
     

19 Jun, 2008

1 commit


25 Mar, 2008

1 commit


13 Mar, 2008

1 commit


31 Dec, 2007

1 commit


28 Dec, 2007

2 commits


27 Dec, 2007

1 commit


01 Dec, 2007

1 commit


30 Nov, 2007

1 commit


29 Nov, 2007

1 commit


27 Nov, 2007

1 commit


24 Nov, 2007

1 commit


09 Nov, 2007

1 commit