21 Aug, 2012
3 commits
-
Conflicts: app/helpers/application_helper.rb app/views/content_viewer/_article_toolbar.rhtml test/functional/content_viewer_controller_test.rb
19 Aug, 2012
1 commit
-
Conflicts: db/schema.rb
15 Aug, 2012
1 commit
09 Aug, 2012
2 commits
-
…into merge-requests/193
-
* Licenses only can be removed with method 'post' * Fixing truncate calls to stop displaying deprecation warnings * Added buttons to add a new license and to go back to admin panel * Added new db/schema (ActionItem2379)
08 Aug, 2012
1 commit
-
…into merge-requests/187 Conflicts: app/models/environment.rb public/stylesheets/application.css test/factories.rb test/fixtures/roles.yml test/unit/article_test.rb
07 Aug, 2012
2 commits
-
(ActionItem2378)
24 Jul, 2012
1 commit
-
(ActionItem2375)
22 Jul, 2012
2 commits
-
…into merge-requests/191
20 Jul, 2012
3 commits
-
(solr brings everything with an empty query string)
-
Conflicts: app/controllers/my_profile/cms_controller.rb
19 Jul, 2012
1 commit
-
Conflicts: app/models/article.rb app/models/profile.rb app/models/uploaded_file.rb public/javascripts/application.js public/stylesheets/application.css test/unit/article_test.rb test/unit/category_finder_test.rb test/unit/enterprise_test.rb
18 Jul, 2012
2 commits
-
(ActionItem2379)
-
Removed whitespaces Recovered schema.rb without plugins fields Included info about solr support of multitenancy on solr.yml.dist
22 Jun, 2012
1 commit
-
Conflicts: test/unit/article_test.rb
21 Jun, 2012
1 commit
-
…into merge-requests/173
15 Jun, 2012
1 commit
26 May, 2012
1 commit
-
Conflicts: INSTALL test/unit/article_test.rb
24 May, 2012
1 commit
-
Conflicts: test/functional/account_controller_test.rb
22 May, 2012
2 commits
21 May, 2012
3 commits
20 May, 2012
2 commits
-
Also, add a facet to filter enabled/not enabled enterprises
-
Conflicts: app/views/layouts/_javascript.rhtml features/step_definitions/noosfero_steps.rb features/support/paths.rb
19 May, 2012
1 commit
-
Mocking Solr disable indexing and search, so it speeds tests that don't need solr. Tests that need searches have to call TestSolr.enable
17 May, 2012
6 commits
-
Fixing activities comments submit
-
app/controllers/public/profile_controller.rb
-
…an be removed; Added an method to get the activity related to the article; Alter the counter cache of the activity when a comment is added or removed to the article
16 May, 2012
2 commits
-
This is specially useful in development/test setups where you don't have a working MTA.
-
(ActionItem2345)