07 Dec, 2012
1 commit
06 Dec, 2012
1 commit
22 Oct, 2012
1 commit
-
…into merge-requests/229
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
05 Sep, 2012
3 commits
30 Aug, 2012
17 commits
-
Conflicts: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb 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