24 Mar, 2014
3 commits
11 Mar, 2014
1 commit
20 Feb, 2014
1 commit
13 Feb, 2014
4 commits
-
This reverts commit a3fb85d903790d565983e4e0f22acf557d8292dc. Reverting substitution of hpricot for nokogiri on macros infra due to segfault problem with nokogiri 1.4.0. Conflicts: INSTALL script/install-dependencies/debian-squeeze.sh
-
This reverts commit d726e40eb2b02f88051c1695596738a42c0eb561. Reverting substitution of hpricot for nokogiri on macros infra due to segfault problem with nokogiri 1.4.0. Conflicts: app/helpers/application_helper.rb
-
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
2 commits
-
Ai2897 Environment Theme http://noosfero.org/Development/ActionItem2897 The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb.
10 Feb, 2014
4 commits
-
…into unb-gama/noosfero-AI2897-environment_theme
04 Feb, 2014
2 commits
-
Ai2922 Wall Tab By Default Display the wall tab by default on user's profile
-
AI2924 Add verb for the activities on user's wall ActionItem: http://noosfero.org/Development/ActionItem2924
31 Jan, 2014
5 commits
-
…into merge-requests/367 Conflicts: app/views/content_viewer/view_page.rhtml
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
1 commit
-
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