04 Dec, 2014

1 commit


13 Oct, 2014

1 commit


10 Oct, 2014

1 commit

  • - Remove absolute URL's from stylesheets and javascripts
    - Handle prefix in LinkListBlock
    - add Noosfero.root method as a central data source
    
    The application server needs to be started with the
    RAILS_RELATIVE_URL_ROOT environment variable set to the desired prefix.
    
    In development, this can be tested with
    
      # assuming /social prefix
      $ RAILS_RELATIVE_URL_ROOT=/social thin --prefix /social start
    
    For production, see INSTALL.md
    Antonio Terceiro
     

07 Oct, 2014

1 commit


07 Aug, 2014

1 commit

  • 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
     

09 Jul, 2014

1 commit


08 Jul, 2014

1 commit


01 Jul, 2014

1 commit


27 Jun, 2014

1 commit


05 Jun, 2014

1 commit


29 May, 2014

1 commit


23 May, 2014

1 commit


22 May, 2014

1 commit


19 May, 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
     

06 Feb, 2014

1 commit


15 Jan, 2014

1 commit

  • (ActionItem2513)
    
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Tales Martins <tales.martins@gmail.com>
    Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Arthur Del Esposte
     

07 Jan, 2014

1 commit


16 Dec, 2013

1 commit


24 Nov, 2013

1 commit


27 Sep, 2013

1 commit


19 Sep, 2013

1 commit


08 Jul, 2013

1 commit


01 Jul, 2013

1 commit


28 Jun, 2013

3 commits


27 Jun, 2013

1 commit


17 Apr, 2013

1 commit


15 Apr, 2013

1 commit


11 Apr, 2013

1 commit


10 Apr, 2013

1 commit


22 Mar, 2013

1 commit


20 Mar, 2013

1 commit

  • This commit, with the participation of Lucas Melo, does:
    
    * Make action list from ShoppingCartPluginController Fault-tolerant.
    * Create a basic logging system and replace debug alerts.
    * Limit the cart size to protect against cookie limit.
    * Add more loading style possibilities.
    * Add a little fault-tolerance to the process of loading the carts items.
    * Force colorbox to "Shopping checkout" button.
    * Add L10n to Cart JS interaction.
    Aurélio A. Heckert
     

12 Mar, 2013

1 commit


22 Feb, 2013

1 commit


20 Feb, 2013

1 commit


25 Dec, 2012

1 commit


12 Dec, 2012

1 commit


06 Nov, 2012

1 commit