31 Jan, 2014
2 commits
29 Jan, 2014
4 commits
-
This method was removed by ca5ebf95375cd5dbb80a047dc79f4c31e36df899 and was mistakenly included on this merge 4ad91064632c8c1f5483a559d158d96b93e1a3c6 due to this fix 70c90e476a2a263639d13654564b8ea9db30a911. Also its tests weren't removed.
28 Jan, 2014
13 commits
-
…into merge-requests/366 Conflicts: INSTALL script/install-dependencies/debian-squeeze.sh
-
Also removing trailing whitespaces
-
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> Signed-off-by: Ana Losnak <analosnak@gmail.com> ActionItem1011
-
ActionItem1011
-
Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com> ActionItem1011
-
…into merge-requests/358
-
…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
3 commits
-
…into merge-requests/339 Conflicts: app/models/block.rb public/designs/icons/tango/style.css test/unit/block_test.rb