08 Apr, 2016
1 commit
24 Jul, 2015
3 commits
-
:conditions will replace previous scopes in rails4
15 Dec, 2014
1 commit
27 Nov, 2014
1 commit
10 Mar, 2014
1 commit
26 Feb, 2014
2 commits
25 Feb, 2014
2 commits
24 Feb, 2014
1 commit
20 Feb, 2014
1 commit
13 Feb, 2014
3 commits
-
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
-
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
-
Status and Labels for comments http://noosfero.org/Development/CommentClassificationPlugin
10 Feb, 2014
2 commits
06 Feb, 2014
1 commit
29 Jan, 2014
1 commit
-
Not sure if compute_public_path should be replaced by a simple File.join. Consider the use of asset_path if the current solution isn't safe.
28 Jan, 2014
3 commits
-
…pa/noosfero-AI2786-like
27 Jan, 2014
1 commit
23 Jan, 2014
1 commit
-
…sub_organizations_improvements
22 Jan, 2014
1 commit
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
20 Jan, 2014
2 commits
17 Jan, 2014
4 commits
-
Conflicts: test/unit/comment_test.rb
-
The following improvements have been made: - Created action that displays sub-organization and super organizations of a given organization. - Created a block that display related organizations. - List mother organizations to person's membership if he/she is member of a sub-organization. (ActionItem2499) (ActionItem2825) Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br> Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
-
closes ActionItem2830
15 Jan, 2014
2 commits
14 Jan, 2014
2 commits