28 Jan, 2014
4 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
9 commits
-
…sub_organizations_improvements
-
Conflicts: public/stylesheets/application.css
-
(ActionItem896)
22 Jan, 2014
4 commits
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
21 Jan, 2014
4 commits
-
…into merge-requests/339 Conflicts: app/models/block.rb public/designs/icons/tango/style.css test/unit/block_test.rb
-
…into merge-requests/337 Conflicts: app/controllers/public/catalog_controller.rb app/helpers/application_helper.rb app/helpers/catalog_helper.rb app/views/catalog/index.rhtml public/stylesheets/application.css
20 Jan, 2014
9 commits
-
(ActionItem2786)
-
(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
5 commits
-
- Added pagination to versions - Treating access denied and not found (ActionItem2822)