09 Jan, 2014
1 commit
-
Conflicts: app/controllers/my_profile/memberships_controller.rb app/helpers/application_helper.rb app/helpers/boxes_helper.rb app/models/article.rb app/models/category.rb app/models/change_password.rb app/models/comment.rb app/models/environment.rb app/models/event.rb app/models/profile.rb app/models/recent_documents_block.rb app/models/region.rb app/models/task.rb app/models/uploaded_file.rb app/views/account/forgot_password.html.erb app/views/events/_events_by_day.html.erb app/views/profile/_person_profile.html.erb app/views/shared/_manage_enterprises.html.erb config/environment.rb config/initializers/plugins.rb config/routes.rb db/schema.rb debian/control lib/noosfero/plugin.rb test/unit/article_test.rb test/unit/category_test.rb test/unit/change_password_test.rb test/unit/cms_helper_test.rb test/unit/comment_test.rb test/unit/content_viewer_helper_test.rb test/unit/event_test.rb test/unit/folder_helper_test.rb test/unit/person_test.rb test/unit/price_detail_test.rb test/unit/profile_helper_test.rb test/unit/recent_documents_block_test.rb test/unit/scrap_test.rb test/unit/user_mailer_test.rb vendor/plugins/action_tracker_has_comments/init.rb vendor/plugins/delayed_job/lib/delayed/worker.rb vendor/plugins/noosfero_caching/init.rb
07 Jan, 2014
1 commit
-
Conflicts: db/schema.rb test/unit/person_test.rb
19 Dec, 2013
1 commit
16 Dec, 2013
1 commit
-
…into merge-requests/376 Conflicts: db/schema.rb
21 Nov, 2013
1 commit
-
Also: - removed whitespaces - added class with plugin name to style a view (ActionItem2837)
16 Nov, 2013
1 commit
-
(ActionItem2903)
24 Oct, 2013
1 commit
14 Oct, 2013
1 commit
-
ActionItem2691
24 Sep, 2013
1 commit
18 Sep, 2013
1 commit
-
Conflicts: db/schema.rb
21 Aug, 2013
1 commit
05 Aug, 2013
1 commit
16 Jul, 2013
1 commit
08 Jul, 2013
1 commit
27 Jun, 2013
1 commit
06 Jun, 2013
1 commit
-
article and article_versions fields type must be the same also removed plugins tables from schema.rb (ActionItem2685)
05 Jun, 2013
1 commit
30 May, 2013
1 commit
06 Mar, 2013
1 commit
04 Mar, 2013
1 commit
-
(ActionItem2599)
12 Jan, 2013
1 commit
04 Nov, 2012
1 commit
-
Conflicts: app/sweepers/article_sweeper.rb db/schema.rb test/unit/environment_test.rb
29 Oct, 2012
1 commit
-
Added field sigup_welcome_text on environment New tab on admin panel to edit the text When the environment doesn't have a text, will use the default text Added content_type to email (ActionItem2497)
28 Oct, 2012
1 commit
-
(ActionItem2369)
27 Oct, 2012
1 commit
-
Added field redirection_after_login on profiles and environments New db/schema Added a select to choose option to redirect on admin panel and on profile control panel (ActionItem2369)
24 Oct, 2012
1 commit
-
Conflicts: app/helpers/forms_helper.rb app/models/box.rb app/views/box_organizer/edit.rhtml db/schema.rb test/unit/box_test.rb
26 Aug, 2012
1 commit
23 Aug, 2012
1 commit
19 Aug, 2012
1 commit
-
Conflicts: db/schema.rb
18 Aug, 2012
1 commit
-
Also: - Added migration to remove action_trackers with target nil - Updated db/schema (ActionItem2400)
17 Aug, 2012
1 commit
-
Also replaced "if !" by "unless"
09 Aug, 2012
1 commit
-
* 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
-
(ActionItem2378)
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
1 commit
-
Removed whitespaces Recovered schema.rb without plugins fields Included info about solr support of multitenancy on solr.yml.dist
21 Jun, 2012
1 commit
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
3 commits