11 Jul, 2013
8 commits
-
…into merge-requests/331
-
…into merge-requests/301
-
The first one should not test the redirect since it's not its concerns. The second one wasn't test if there was a confirmation at all.
-
…into merge-requests/291
-
…into merge-requests/287 Conflicts: app/models/environment.rb
-
…into merge-requests/285
14 Jun, 2013
1 commit
10 Jun, 2013
1 commit
-
ActionItem2675
06 Jun, 2013
3 commits
-
…into merge-requests/314
-
…into merge-requests/329
05 Jun, 2013
1 commit
04 Jun, 2013
1 commit
-
(ActionItem2684)
23 May, 2013
1 commit
21 May, 2013
3 commits
17 May, 2013
1 commit
-
(ActionItem2650)
16 May, 2013
1 commit
-
…into merge-requests/309
13 May, 2013
1 commit
10 May, 2013
1 commit
-
- Syntax error on chat - Reviewed INSTALL.chat - Added function to update the list of users online on main window (ActionItem2667)
09 May, 2013
2 commits
-
…into merge-requests/298 Added html_safe that was missing on the block_helper new method Conflicts: app/views/box_organizer/_highlights_block.rhtml test/unit/application_helper_test.rb
07 May, 2013
1 commit
-
Conflicts: app/models/article.rb app/views/layouts/application-ng.rhtml lib/noosfero/plugin.rb script/noosfero-plugins
29 Apr, 2013
1 commit
-
ActionItem2451 Including: migration and test.
24 Apr, 2013
1 commit
-
…into merge-requests/259 Conflicts: app/controllers/admin/environment_design_controller.rb
20 Apr, 2013
1 commit
17 Apr, 2013
2 commits
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
16 Apr, 2013
1 commit
15 Apr, 2013
3 commits
-
ActionItem2608
-
ActionItem2608 Note: tests for users templates were made in the previous commit.
12 Apr, 2013
1 commit
-
ActionItem2608
11 Apr, 2013
1 commit
10 Apr, 2013
1 commit
-
ActionItem2632
05 Apr, 2013
2 commits
-
…into merge-requests/297
-
ActionItem2217