30 Aug, 2012
12 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
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
16 commits
-
…into merge-requests/212
-
Also replaced "if !" by "unless"
-
…into merge-requests/211
-
…into merge-requests/210
-
…into merge-requests/209
-
(ActionItem2366)
-
…into merge-requests/185
-
…into merge-requests/203
-
…into merge-requests/201
-
…into merge-requests/208
-
…into merge-requests/207
-
…into merge-requests/205
16 Aug, 2012
1 commit
-
No plugin should have any code outside of its own directory; the way this was, in practive everyone had to have savon installed to do *anything* in Noosfero. Plugins cannot force their dependencies on installations were they are not enabled.
15 Aug, 2012
2 commits
-
Also cleanup and refactor code