02 Mar, 2012
2 commits
-
…into merge-requests/137 (ActionItem2295)
-
…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)
15 Feb, 2012
2 commits
-
…into merge-requests/132 Removed whitespace
-
(ActionItem2259)
14 Feb, 2012
1 commit
-
…into merge-requests/131
10 Feb, 2012
1 commit
09 Feb, 2012
4 commits
-
* 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)
-
* Needed to rewrite the signature of all the method 'content' of all blocks. Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br> (ActionItem1549)
-
…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
1 commit
-
(ActionItem2273)
01 Feb, 2012
1 commit
-
Prevents themes page to crash when approved_themes() finds a non theme entity inside themes dir. Closes ActionItem2269
26 Jan, 2012
5 commits
-
This reverts commit 866d64b6ca3bf756f34f9d9e034dab22cf588658. This commit broke features/environment_name.feature :(
-
(ActionItem2125)
-
…nto merge-requests/60 Conflicts: test/unit/application_helper_test.rb (ActionItem2125)
24 Jan, 2012
2 commits
-
(ActionItem2070)
-
(ActionItem2070)
23 Jan, 2012
2 commits
-
…into merge-requests/116
19 Jan, 2012
4 commits
-
…into merge-requests/109
-
(ActionItem2208)
18 Jan, 2012
1 commit
-
(ActionItem2244)
17 Jan, 2012
1 commit
-
. Also fixing some typos (ActionItem1565)
16 Jan, 2012
2 commits
-
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.
10 Jan, 2012
6 commits
-
…nto merge-requests/91
-
(ActionItem2223)
-
(ActionItem2220)
-
(ActionItem2121)
-
Conflicts: features/step_definitions/noosfero_steps.rb