18 Apr, 2012
2 commits
-
…into merge-requests/135
17 Apr, 2012
2 commits
-
…into merge-requests/155 (ActionItem2213)
12 Apr, 2012
1 commit
-
…into merge-requests/152
09 Apr, 2012
1 commit
-
(ActionItem2213)
05 Apr, 2012
2 commits
-
…into merge-requests/142 Conflicts: test/functional/invite_controller_test.rb (ActionItem2313)
04 Apr, 2012
1 commit
-
…into merge-requests/145
03 Apr, 2012
1 commit
14 Mar, 2012
1 commit
-
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
13 Mar, 2012
1 commit
-
(ActionItem2307)
09 Mar, 2012
3 commits
-
(ActionItem2316)
-
(ActionItem2313)
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
2 commits
-
* Also making activity removal be available for users who has permissions to edit the profile instead of the owner of the activity. (ActionItem2055) -
When explicity _accepting_ a new member in a community, but still no role is selected, makes the default role be 'member'. (ActionItem2281)
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
3 commits
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb