27 Aug, 2012
1 commit
09 Mar, 2012
2 commits
-
(ActionItem2310)
-
(ActionItem2316)
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
2 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
15 Feb, 2012
1 commit
-
…into merge-requests/132 Removed whitespace
09 Feb, 2012
5 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)
-
* Needed to rewrite the signature of all the method 'content' of all blocks. Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br> (ActionItem1549)
08 Feb, 2012
1 commit
-
…into merge-requests/121
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
31 Jan, 2012
2 commits
27 Jan, 2012
4 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
3 commits
-
(ActionItem2125)
-
…nto merge-requests/60 Conflicts: test/unit/application_helper_test.rb (ActionItem2125)
24 Jan, 2012
1 commit
-
(ActionItem2070)
23 Jan, 2012
2 commits
-
…into merge-requests/116
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.
11 Jan, 2012
1 commit
-
Adds gravatar_support.feature (selenium tests) and new path for cucumber
10 Jan, 2012
1 commit
-
When the year is empty, it ends up as 1 in the date object.