03 Dec, 2012
1 commit
-
…into merge-requests/248 Conflicts: app/models/person.rb app/views/catalog/index.rhtml public/stylesheets/application.css test/functional/catalog_controller_test.rb
27 Nov, 2012
1 commit
14 Nov, 2012
1 commit
13 Nov, 2012
1 commit
12 Nov, 2012
1 commit
05 Nov, 2012
1 commit
25 Oct, 2012
1 commit
-
(ActionItem2494)
23 Oct, 2012
2 commits
-
Forbidding not authorized people to access management of forms Replacing "link_to" by "button" to look like others links of Noosfero Added link to form on page for management of forms (ActionItem1739)
-
…into merge-requests/231
22 Oct, 2012
5 commits
-
…into merge-requests/229
15 Oct, 2012
1 commit
-
…into merge-requests/218 Conflicts: lib/noosfero/plugin.rb
09 Oct, 2012
1 commit
07 Oct, 2012
2 commits
-
- Added render_not_found screen when comment id doesn't exist - Displaying message when trying to edit a comment from other page - Fixed a test on ToleranceTimePlugin
-
…into merge-requests/213 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/views/content_viewer/_comment.rhtml app/views/content_viewer/view_page.rhtml lib/noosfero/plugin.rb test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
10 Sep, 2012
5 commits
06 Sep, 2012
17 commits
-
Conflicts: plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
-
Conflicts: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
-
conflict with noosfero article license
-
with solr configuration variable names
