22 Aug, 2011
6 commits
-
…nto merge-requests/39 (ActionItem1970)
17 Aug, 2011
12 commits
-
…nto merge-requests/35 Conflicts: script/sample-profiles
-
(ActionItem2054)
-
…nto merge-requests/24
-
(ActionItem2053)
-
(ActionItem2053)
-
…nto merge-requests/37
-
…nto merge-requests/23
-
(ActionItem2051)
-
(ActionItem1958)
-
(ActionItem2056)
-
Also fixed missing 'end' cms_controller_test
-
Conflicts: debian/changelog lib/noosfero.rb lib/noosfero/plugin.rb
16 Aug, 2011
22 commits
-
This reverts commit ba869eb36522034b60d819fb4d83bd0b0a751033. Conflicts: config/solr.yml.dist lib/tasks/cucumber.rake There are some problems with solr (ActionItem1958)
-
This reverts commit 3ff810f83cd374943972a0630c30389f783fa077. There are some problems with solr (ActionItem1958)
-
This reverts commit 6409d6cc8e989f473f17b882d05367c4b9153528, reversing changes made to 313f8a54d53a4fdfa651f02197813026e1660e3b. Conflicts: features/step_definitions/noosfero_steps.rb test/unit/category_finder_test.rb There are some problems with solr (ActionItem1958)
-
This reverts commit 2220fe167d588fa1ca900dcef497a875c22b989c. There are some problems with solr (ActionItem1958)
-
This reverts commit e4b948f46430ec011cd26bf6effa8020b6833d77. There are some problems with solr (ActionItem1958)
-
This reverts commit 4e61bfb7a04ef3a7171343867aca05c4ce401197. There are some problems with solr (ActionItem1958)
-
This reverts commit 630b8afabf809e6d7b7f271d7b25fe08fac76854. There are some problems with solr (ActionItem1958)
-
Conflicts:
-
* The history.go used to revert the url don't work properly on chromium. We're commenting it for now to avoid problems. * Also fixing the show/hide feature. -
* Also fixing the translation.
-
(ActionItem1970)
