28 Aug, 2012
5 commits
23 Aug, 2012
1 commit
22 Aug, 2012
3 commits
-
Conflicts: plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
21 Aug, 2012
8 commits
-
conflict with noosfero article license
-
with solr configuration variable names
19 Aug, 2012
1 commit
-
Conflicts: db/schema.rb
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.
14 Aug, 2012
1 commit
09 Aug, 2012
2 commits
-
…into merge-requests/199
-
…into merge-requests/197 Conflicts: plugins/stoa/test/unit/person_test.rb
06 Aug, 2012
3 commits
02 Aug, 2012
15 commits
-
Conflicts: plugins/mezuro/lib/kalibro/client/port.rb