26 Feb, 2014
1 commit
25 Feb, 2014
8 commits
24 Feb, 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
28 Jan, 2014
2 commits
-
…pa/noosfero-AI2786-like
27 Jan, 2014
3 commits
-
Conflicts: plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb po/pt/noosfero.po
-
(ActionItem2969)
24 Jan, 2014
2 commits
-
(ActionItem2866)
-
(ActionItem2866)
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
8 commits
-
(ActionItem2786)
-
(ActionItem2786)
-
Add mode that displays more information about related organizations on the relationship page. (ActionItem 2866) Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Leandro Alves <leandrosustenido@gmail.com> Signed-off-by: Luiz Matos <luizff.matos@gmail.com> Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
-
I had to put the validation for the length of alternatives in the Field model because, since we are using Single Table Inheritance, we are creating Field objects with the type as a param instead of creating SelectField objects. This way, subclass' validation are skipped. I kept the validation in the SelectField model as well, because we also edit existing SelectField objects. (ActionItem2960)
19 Jan, 2014
6 commits
18 Jan, 2014
1 commit
17 Jan, 2014
3 commits
-
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>
16 Jan, 2014
1 commit
-
Conflicts: HACKING
15 Jan, 2014
1 commit
-
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb