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
8 commits
-
ActionItem2402
-
ActionItem2420
-
Fixes an error I found in the tasks view while I was investigating another bug. Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
04 Sep, 2012
6 commits
-
…into merge-requests/220
-
…into merge-requests/206
-
…into merge-requests/217
-
…into merge-requests/224
31 Aug, 2012
1 commit
-
(close ActionItem2446)
30 Aug, 2012
8 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
-
This lets the default VCL logic do its job
-
This fixes the recognition of the IP address from which comments were made. Besides, ammend varnish setup instructions to include the installation of a required apache module to make sure IP address is correctly identified when Apache is behind a proxy. ActionItem2306