17 Apr, 2012
4 commits
-
Also: - Added edit button when showing a role - Added button layout to link - Listing permissions by name instead of key - Added cucumber test (ActionItem 2287)
-
…into merge-requests/154 (ActionItem2336)
-
…into merge-requests/155 (ActionItem2213)
13 Apr, 2012
2 commits
-
Also: - Added edit button when showing a role - Added button layout to link - Listing permissions by name instead of key - Added cucumber test (ActionItem 2287)
12 Apr, 2012
1 commit
-
…into merge-requests/152
09 Apr, 2012
3 commits
-
(ActionItem2213)
-
(ActionItem2336)
05 Apr, 2012
1 commit
-
The method labelled_check_box already adds a hidden field (ActionItem2329)
03 Apr, 2012
1 commit
27 Mar, 2012
1 commit
14 Mar, 2012
1 commit
-
(i.e. for the case in which public/ is not writable) (ActionItem2314) Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
12 Mar, 2012
2 commits
08 Mar, 2012
2 commits
-
I had to change a lot of plugin hotspot tests that depended on heavy/evil mocking and stubbing to pass. (ActionItem2315)
-
(ActionItem2314)
07 Mar, 2012
2 commits
-
(ActionItem2305)
-
Conflicts: app/views/shared/block.rhtml debian/changelog debian/control script/production
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)
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
3 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)
27 Jan, 2012
1 commit
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
26 Jan, 2012
4 commits
-
This reverts commit 866d64b6ca3bf756f34f9d9e034dab22cf588658. This commit broke features/environment_name.feature :(
-
…nto merge-requests/60 Conflicts: test/unit/application_helper_test.rb (ActionItem2125)
24 Jan, 2012
2 commits
-
(ActionItem2070)
-
(ActionItem2070)
19 Jan, 2012
2 commits
-
…into merge-requests/109
-
(ActionItem2208)
16 Jan, 2012
2 commits
-
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.
10 Jan, 2012
1 commit