23 May, 2013
1 commit
22 May, 2013
1 commit
-
Moving solr specifics to the plugin
21 May, 2013
1 commit
17 May, 2013
2 commits
-
(ActionItem2668)
-
(ActionItem2650)
16 May, 2013
3 commits
-
…into merge-requests/309
10 May, 2013
1 commit
09 May, 2013
3 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
08 May, 2013
1 commit
07 May, 2013
2 commits
-
Conflicts: app/models/article.rb app/views/layouts/application-ng.rhtml lib/noosfero/plugin.rb script/noosfero-plugins
02 May, 2013
1 commit
29 Apr, 2013
1 commit
-
ActionItem2451 Including: migration and test.
25 Apr, 2013
1 commit
-
(ActionItem2658)
24 Apr, 2013
2 commits
-
…into merge-requests/259 Conflicts: app/controllers/admin/environment_design_controller.rb
-
The problem only happens on production environment... (ActionItem2658)
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
15 Apr, 2013
5 commits
-
…into merge-requests/303
-
…into merge-requests/302
-
ActionItem2638
12 Apr, 2013
1 commit
-
ActionItem2608
11 Apr, 2013
1 commit
-
…into merge-requests/299
10 Apr, 2013
3 commits
-
(ActionItem2630)
-
ActionItem2632
05 Apr, 2013
5 commits
-
…into merge-requests/297
-
ActionItem2217
-
…into merge-requests/289
03 Apr, 2013
2 commits
-
…into merge-requests/275 Conflicts: test/unit/application_helper_test.rb