25 Feb, 2016

1 commit

  • Fix article comments ordering
    
    Fix article's comments ordering bug (had wrong logic before correction) and pagination missing bug (js was overwriting pagination after ajax request).
    
    References:
    
    https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/630
    https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/issues/632
    
    See merge request !792
    Rodrigo Souto
     

22 Feb, 2016

2 commits

  • Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Eduardo Vital
     
  • - Every article can be followed so the user can receive notifications without
      having to comment on it
    
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Carlos Purificacao <carloseugenio@gmail.com>
    Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Signed-off-by: Caio SBA <caio@colivre.coop.br>
    Signed-off-by: Leandro Nunes dos Santos <leandro.santos@serpro.gov.br>
    Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
    Signed-off-by: Evandro Jr <evandrojr@gmail.com>
    Marcos Ramos
     

24 Jul, 2015

1 commit


25 Feb, 2015

1 commit


24 Feb, 2015

1 commit


22 Feb, 2015

1 commit


13 Aug, 2014

1 commit


31 Jul, 2014

1 commit


30 Jul, 2014

1 commit


10 Jul, 2014

1 commit


03 Jul, 2014

1 commit


14 May, 2014

1 commit


13 May, 2014

1 commit


13 Feb, 2014

1 commit


11 Feb, 2014

2 commits

  • Conflicts:
    	app/views/profile_themes/add_css.rhtml
    	app/views/profile_themes/add_image.rhtml
    	app/views/profile_themes/css_editor.rhtml
    	app/views/profile_themes/edit.rhtml
    	app/views/profile_themes/new.rhtml
    	app/views/themes/add_css.html.erb
    	app/views/themes/add_css.rhtml
    	app/views/themes/add_image.html.erb
    	app/views/themes/add_image.rhtml
    	app/views/themes/css_editor.html.erb
    	app/views/themes/css_editor.rhtml
    	app/views/themes/edit.html.erb
    	app/views/themes/edit.rhtml
    	app/views/themes/index.html.erb
    	app/views/themes/new.html.erb
    	app/views/themes/new.rhtml
    	test/factories.rb
    	test/functional/profile_themes_controller_test.rb
    Rodrigo Souto
     
  • Conflicts:
    	app/controllers/my_profile/cms_controller.rb
    	app/controllers/public/content_viewer_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/article_helper.rb
    	app/helpers/catalog_helper.rb
    	app/helpers/comment_helper.rb
    	app/models/article.rb
    	app/models/enterprise.rb
    	app/models/members_block.rb
    	app/models/person.rb
    	app/models/profile.rb
    	app/views/blocks/profile_info.html.erb
    	app/views/blocks/profile_info_actions/community.html.erb
    	config/initializers/dependencies.rb
    	config/routes.rb
    	db/schema.rb
    	debian/control
    	lib/noosfero/plugin.rb
    	lib/tasks/plugins.rake
    	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
    	script/sample-products
    	test/functional/catalog_controller_test.rb
    	test/functional/manage_products_controller_test.rb
    	test/functional/map_balloon_controller_test.rb
    	test/functional/profile_controller_test.rb
    	test/functional/search_controller_test.rb
    	test/unit/box_test.rb
    	test/unit/cms_helper_test.rb
    	test/unit/enterprise_test.rb
    	test/unit/environment_test.rb
    	test/unit/featured_products_block_test.rb
    	test/unit/person_test.rb
    	test/unit/product_category_test.rb
    	test/unit/product_test.rb
    	test/unit/profile_test.rb
    	test/unit/user_test.rb
    	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
    Rodrigo Souto
     

10 Feb, 2014

1 commit


31 Jan, 2014

1 commit


29 Jan, 2014

1 commit


28 Jan, 2014

1 commit


22 Jan, 2014

1 commit


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
    Rodrigo Souto
     

06 Jan, 2014

1 commit


05 Dec, 2013

1 commit


06 Sep, 2013

1 commit


19 Jul, 2013

1 commit

  • Conflicts:
    	app/helpers/boxes_helper.rb
    	app/models/comment.rb
    	app/views/comment/_comment.rhtml
    	app/views/comment/_comment_form.rhtml
    	app/views/content_viewer/_comment.html.erb
    	app/views/content_viewer/_comment.rhtml
    	app/views/content_viewer/_comment_form.html.erb
    	app/views/content_viewer/_comment_form.rhtml
    	app/views/profile/send_mail.html.erb
    	config/routes.rb
    	debian/control
    Antonio Terceiro
     

13 Jul, 2013

2 commits


12 Jul, 2013

1 commit


08 Jul, 2013

5 commits


01 Jul, 2013

1 commit


28 Jun, 2013

2 commits


13 May, 2013

1 commit


11 Apr, 2013

1 commit