17 Jul, 2016
1 commit
12 Dec, 2015
1 commit
02 Oct, 2015
1 commit
01 Oct, 2015
1 commit
19 Aug, 2015
1 commit
-
Conflicts: Gemfile app/models/profile.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb plugins/shopping_cart/po/de/shopping_cart.po plugins/shopping_cart/po/es/shopping_cart.po plugins/shopping_cart/po/fr/shopping_cart.po plugins/shopping_cart/po/hy/shopping_cart.po plugins/shopping_cart/po/pt/shopping_cart.po plugins/shopping_cart/po/ru/shopping_cart.po plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb plugins/shopping_cart/views/cart.html.erb plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
13 Aug, 2015
1 commit
01 Aug, 2015
1 commit
31 Jul, 2015
1 commit
-
ruby-minitest offers "refuse" as a syntatic sugar to "assert not"
24 Jul, 2015
2 commits
-
Use these two commands inside vim: :!ag -l '..\/..\/..\/..\/test' | xargs perl -pi -E "s/require.*test_helper.*/require 'test_helper'/g" :!ag -l "require File.*'/" | xargs perl -pi -E "s/require File.*'\//require_relative '/g":e ""'"
14 Jun, 2015
1 commit
22 Nov, 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
13 May, 2014
1 commit
24 Apr, 2014
1 commit
-
Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
22 Jan, 2014
1 commit
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
26 Nov, 2013
1 commit
-
(ActionItem2893)
22 Nov, 2013
1 commit
-
(ActionItem2808)
15 Jul, 2013
1 commit
17 Jan, 2013
1 commit
-
Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
02 Jan, 2013
1 commit
28 Dec, 2012
5 commits
-
Fixing the functional tests was easier than I though it would. :)
-
There are a couple of FIXME's there, plus the whole thing has to be refactored: * the shopping cart controller must be moved out of the profile namespace, because we can't know to which profile we should make the AJAX request to load the cart * there are too many unecessary AJAX requests. * most of the cart functionality must probably be encapsulate into * proper objects.
22 Oct, 2012
1 commit
16 Jul, 2012
1 commit
-
(ActionItem2362)
22 Jun, 2012
1 commit
-
Changes what's stored in PurchaseOrder so the product name is also stored, that way if the product is removed its name isn't lost. Uses a class named LineItem to encapsulate the information about an ordered product for clarification. Also fixes the views so it shows the product name but not the product url if the product was removed. (ActionItem2362)
18 Dec, 2011
3 commits
22 Sep, 2011
3 commits
-
Co-authored-by: Aurélio A. Heckert <aurelio@colivre.coop.br> (ActionItem2062)
-
Co-authored-by: Aurélio A. Heckert <aurelio@colivre.coop.br> (ActionItem2062)
17 Aug, 2011
2 commits
-
Also fixed missing 'end' cms_controller_test
-
Conflicts: debian/changelog lib/noosfero.rb lib/noosfero/plugin.rb
16 Aug, 2011
3 commits
-
This reverts commit 6409d6cc8e989f473f17b882d05367c4b9153528, reversing changes made to 313f8a54d53a4fdfa651f02197813026e1660e3b. Conflicts: features/step_definitions/noosfero_steps.rb test/unit/category_finder_test.rb There are some problems with solr (ActionItem1958)
-
This reverts commit 2220fe167d588fa1ca900dcef497a875c22b989c. There are some problems with solr (ActionItem1958)