15 Apr, 2012
1 commit
-
Conflicts: app/models/enterprise.rb
12 Apr, 2012
1 commit
-
…into merge-requests/152
05 Apr, 2012
2 commits
-
…into merge-requests/142 Conflicts: test/functional/invite_controller_test.rb (ActionItem2313)
04 Apr, 2012
1 commit
-
…into merge-requests/145
03 Apr, 2012
3 commits
16 Mar, 2012
3 commits
-
Conflicts: INSTALL app/helpers/application_helper.rb app/views/account/signup.rhtml app/views/layouts/application-ng.rhtml app/views/search/_product.rhtml debian/control debian/noosfero.install debian/noosfero.links features/step_definitions/noosfero_steps.rb script/production
-
Also use delayed_job for indexing categories
15 Mar, 2012
1 commit
14 Mar, 2012
1 commit
-
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
13 Mar, 2012
1 commit
-
(ActionItem2307)
09 Mar, 2012
3 commits
-
(ActionItem2316)
-
(ActionItem2313)
08 Mar, 2012
3 commits
-
I had to change a lot of plugin hotspot tests that depended on heavy/evil mocking and stubbing to pass. (ActionItem2315)
-
I am also already adding a "spam" flag to the table, which we will use next. (ActionItem2309)
07 Mar, 2012
3 commits
-
(ActionItem2305)
-
Conflicts: app/views/shared/block.rhtml debian/changelog debian/control script/production
02 Mar, 2012
3 commits
-
…into merge-requests/137 (ActionItem2295)
-
(ActionItem1549)
-
…into merge-requests/129 (ActionItem1549)
29 Feb, 2012
1 commit
-
* Also making activity removal be available for users who has permissions to edit the profile instead of the owner of the activity. (ActionItem2055)
25 Feb, 2012
1 commit
-
Conflicts: app/controllers/application.rb debian/changelog plugins/bsc/lib/bsc_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb
24 Feb, 2012
12 commits
-
* Use correct 'domain' from environment * Use find to get article
-
* Changed 'find_in' for the corresponding search action * Updated google maps urls