20 May, 2012
1 commit
-
Conflicts: app/views/layouts/_javascript.rhtml features/step_definitions/noosfero_steps.rb features/support/paths.rb
14 May, 2012
1 commit
-
…into merge-requests/166
10 May, 2012
4 commits
-
(ActionItem2320)
-
…into merge-requests/148
-
…into merge-requests/147 (ActionItem2322)
-
(ActionItem2357)
05 May, 2012
1 commit
17 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)
15 Apr, 2012
2 commits
-
Conflicts: app/models/enterprise.rb
13 Apr, 2012
1 commit
-
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)
09 Apr, 2012
1 commit
-
(ActionItem2336)
20 Mar, 2012
2 commits
-
(ActionItem2320)
-
(ActionItem2322)
16 Mar, 2012
2 commits
-
Conflicts: INSTALL app/helpers/application_helper.rb app/views/account/signup.rhtml app/views/layouts/application-ng.rhtml app/views/search/_product.rhtml debian/control debian/noosfero.install debian/noosfero.links features/step_definitions/noosfero_steps.rb script/production
09 Mar, 2012
1 commit
24 Feb, 2012
1 commit
23 Feb, 2012
1 commit
22 Feb, 2012
3 commits
21 Feb, 2012
4 commits
-
* General, products and enterprise
20 Feb, 2012
1 commit
19 Feb, 2012
1 commit
-
Conflicts: INSTALL app/models/environment_finder.rb config/environments/cucumber.rb debian/control features/step_definitions/noosfero_steps.rb test/unit/forum_helper_test.rb
07 Feb, 2012
1 commit
31 Jan, 2012
2 commits
27 Jan, 2012
2 commits
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
26 Jan, 2012
3 commits
-
…nto merge-requests/60 Conflicts: test/unit/application_helper_test.rb (ActionItem2125)
24 Jan, 2012
1 commit
-
(ActionItem2070)
19 Jan, 2012
1 commit
16 Jan, 2012
1 commit
-
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.