09 Feb, 2012
5 commits
-
…into merge-requests/124
-
…into merge-requests/127
-
(ActionItem2132)
-
…into merge-requests/121
08 Feb, 2012
3 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
1 commit
-
* Also removing the folder colorbox from stylesheets. (ActionItem2132)
06 Feb, 2012
6 commits
-
(ActionItem2261)
-
(ActionItem2273)
-
(ActionItem2272)
01 Feb, 2012
1 commit
-
Prevents themes page to crash when approved_themes() finds a non theme entity inside themes dir. Closes ActionItem2269
27 Jan, 2012
9 commits
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
-
Those were obtained from the `rails-2.3` branch of https://github.com/svenfuchs/rails-i18n
26 Jan, 2012
15 commits
-
…into merge-requests/105
-
…into merge-requests/100
-
This reverts commit 866d64b6ca3bf756f34f9d9e034dab22cf588658. This commit broke features/environment_name.feature :(
-
…nto merge-requests/63
-
(ActionItem2125)
-
…nto merge-requests/60 Conflicts: test/unit/application_helper_test.rb (ActionItem2125)