28 Jan, 2016
1 commit
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 ""'"
03 Feb, 2015
1 commit
-
When vote plugin is not enabled in a noosfero instance, the constant VotePlugin is not defined, which was causing a crash in relevant content plugin. So I check if the plugin is enabled using a string and not a constant.
25 Mar, 2014
1 commit
24 Mar, 2014
1 commit
11 Mar, 2014
1 commit
07 Mar, 2014
6 commits
-
Conflicts: lib/noosfero/plugin/routes.rb plugins/container_block/test/unit/block_test.rb plugins/container_block/test/unit/environment_test.rb plugins/container_block/test/unit/profile_test.rb plugins/container_block/views/blocks/container.html.erb
-
Conflicts: config/initializers/dependencies.rb debian/control lib/noosfero/core_ext.rb lib/noosfero/plugin/routes.rb
-
Conflicts: app/controllers/my_profile/profile_themes_controller.rb test/unit/comment_test.rb vendor/plugins/action_tracker_has_comments/init.rb
-
It's not used anymore since: ca5ebf95375cd5dbb80a047dc79f4c31e36df899
05 Mar, 2014
1 commit
-
Ai2943 Container Block Fixes Fix broken edition for container block with the new css for sideboxes view.
02 Mar, 2014
1 commit
-
…unb-gama/noosfero into AI2925-add_tittle_field_on_link_list_block Conflicts: app/views/box_organizer/_link_list_block.rhtml
01 Mar, 2014
2 commits
-
(ActionItem2909)
28 Feb, 2014
1 commit
-
…gama/noosfero into ActionItem2909-SortUsersAlphabetically
25 Feb, 2014
1 commit
21 Feb, 2014
3 commits
20 Feb, 2014
1 commit
19 Feb, 2014
1 commit
13 Feb, 2014
7 commits
-
…onment and by the user
-
This reverts commit 25018e09d903cb9a6cb064ea447888fe2e1c1d39. Reverting substitution of hpricot for nokogiri on macros infra due to segfault problem with nokogiri 1.4.0.
11 Feb, 2014
4 commits
-
(ActionItem2995)
-
Also adding a new assert helper to test the order of a collection without assuming all elements inside it. (ActionItem2996)
-
Conflicts: app/views/profile_themes/add_css.rhtml app/views/profile_themes/add_image.rhtml app/views/profile_themes/css_editor.rhtml app/views/profile_themes/edit.rhtml app/views/profile_themes/new.rhtml app/views/themes/add_css.html.erb app/views/themes/add_css.rhtml app/views/themes/add_image.html.erb app/views/themes/add_image.rhtml app/views/themes/css_editor.html.erb app/views/themes/css_editor.rhtml app/views/themes/edit.html.erb app/views/themes/edit.rhtml app/views/themes/index.html.erb app/views/themes/new.html.erb app/views/themes/new.rhtml test/factories.rb test/functional/profile_themes_controller_test.rb
-
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
10 Feb, 2014
3 commits
-
…into unb-gama/noosfero-AI2897-environment_theme
08 Feb, 2014
1 commit
-
(ActionItem2987)
06 Feb, 2014
1 commit