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
15 Feb, 2012
5 commits
-
(ActionItem2271)
-
…into merge-requests/130
-
…into merge-requests/132 Removed whitespace
-
(ActionItem2259)
14 Feb, 2012
1 commit
-
…into merge-requests/131
10 Feb, 2012
1 commit
09 Feb, 2012
11 commits
-
…into merge-requests/113
-
* Included alert confirmation to delete link on content viewer and cms. * Removed the destroy page, since it was useless. Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br> (ActionItem1524) -
(ActionItem2259)
-
(ActionItem2271)
-
…into merge-requests/124
-
…into merge-requests/127
-
(ActionItem2132)
-
…into merge-requests/121
08 Feb, 2012
4 commits
-
(ActionItem2269)
-
…into merge-requests/121
-
* In app/controller/admin/users_controller.rb uses a User.find() method call that uses a :include argument to load the needed Persons with a single sql instead of one sql consult per user. * Only call User.find() if the format is csv or xml, to avoid making the huge sql consult every time the user loads the page. * With this change, the downloading time of a users list on csv format decreased 63%, while on xml format decreased 30%. * I've got no guarantee it's enough time to avoid timeout in production server, though. * Not tested on debian. (ActionItem2241)
07 Feb, 2012
7 commits
-
to run Mezuro unit tests properly according to Rails 2.3.5
-
* Also removing the folder colorbox from stylesheets. (ActionItem2132)
06 Feb, 2012
10 commits
-
(ActionItem2261)
-
(ActionItem2273)
-
(ActionItem2272)
