15 Apr, 2012
1 commit
-
Conflicts: app/models/enterprise.rb
05 Apr, 2012
2 commits
-
Conflicts: debian/changelog lib/noosfero.rb
03 Apr, 2012
1 commit
16 Mar, 2012
1 commit
-
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
14 Mar, 2012
2 commits
-
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
-
(i.e. for the case in which public/ is not writable) (ActionItem2314) Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
13 Mar, 2012
1 commit
07 Mar, 2012
5 commits
-
Conflicts: debian/control lib/noosfero.rb
-
Conflicts: app/views/shared/block.rhtml debian/changelog debian/control script/production
03 Mar, 2012
3 commits
-
Conflicts: lib/noosfero.rb
02 Mar, 2012
1 commit
01 Mar, 2012
6 commits
29 Feb, 2012
3 commits
28 Feb, 2012
1 commit
27 Feb, 2012
2 commits
-
Tried to not break upgrades from Lenny. Need to test yet.
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
19 Feb, 2012
1 commit
-
Conflicts: INSTALL app/models/environment_finder.rb config/environments/cucumber.rb debian/control features/step_definitions/noosfero_steps.rb test/unit/forum_helper_test.rb
15 Feb, 2012
1 commit
27 Jan, 2012
2 commits
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
26 Jan, 2012
1 commit
10 Jan, 2012
1 commit
22 Dec, 2011
1 commit
-
This reverts commit 4e223943ab159d8fa7faf4b042ec3121d74ed32e. Conflicts: app/controllers/my_profile/profile_members_controller.rb config/solr.yml.dist features/step_definitions/noosfero_steps.rb lib/tasks/test.rake test/functional/profile_members_controller_test.rb test/unit/category_finder_test.rb
09 Dec, 2011
1 commit
-
Conflicts: debian/changelog test/unit/dates_helper_test.rb
07 Dec, 2011
1 commit
27 Nov, 2011
1 commit
-
Also, removed explicit :previous_label and :next_label from calls to the pagination_links helper that used the same string as the default ones already provided by the helper. This needs will_paginate from Debian Squeeze at least.