06 Sep, 2012
10 commits
-
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
5 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
3 commits
-
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
29 Aug, 2012
2 commits
-
ActionItem2450
-
Removes from activities the ActionTracker::Records which are redundants to certain profiles. (ActionItem2402)
28 Aug, 2012
3 commits
-
(ActionItem2453)
-
(ActionItem2452)
23 Aug, 2012
1 commit
22 Aug, 2012
1 commit
21 Aug, 2012
1 commit
-
…into merge-requests/181 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/models/person.rb app/views/enterprise_registration/basic_information.rhtml lib/noosfero/plugin.rb public/stylesheets/application.css test/unit/person_test.rb test/unit/profile_test.rb
19 Aug, 2012
1 commit
-
Conflicts: db/schema.rb
18 Aug, 2012
2 commits
-
Also: - Added migration to remove action_trackers with target nil - Updated db/schema (ActionItem2400)
17 Aug, 2012
4 commits
-
…into merge-requests/212
-
Also replaced "if !" by "unless"
-
…into merge-requests/211