23 May, 2016

1 commit

19 May, 2016

1 commit

26 Apr, 2016

1 commit

19 Apr, 2016

1 commit

13 Apr, 2016

1 commit

  • d755b3b7   New feature archive articles ... Browse File » 
    - Avoid create comments, associate children articles and perform votes on archived articles
- Update db/schema

-Signed-off-by: Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
-Signed-off-by: Gustavo Jaruga Cruz <darksshades@gmail.com>
-Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>

(cherry picked from commit 144d608f15e2864e8053d384e871699d314a9283)
    Michel Felipe
     

10 Mar, 2016

1 commit

  • c25edc80   Fix CMSHelper unit test ... Browse File » 
    After creating the ArticleBlock view test at
ff15413b2a8dca45d9f64e57270f294e351a0098 this test got broken.

The root cause was the inclusion of ApplicationHelper for the
article_block_test which led to `custom_options_article` for CMSHelper
tests to fail as the BlogHelper (included by ApplicationHelper) was
overriding the method.

This has been fized by remove the include to ApplicationHelper and
extract the necessary methods to separate helpers which led to two new
methods for ArticleHelper and one new helper the ButtonsHelper.
    Rafael Reggiani Manzo
     

22 Feb, 2016

1 commit

  • 45c0df82   Add feature: Article Followers ... Browse File »
    1 
    - 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
     

15 Dec, 2015

2 commits

07 Oct, 2015

1 commit

  • 66eb5163   New topics now accepts reply by default ... Browse File » 
    Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: Jessica Cristina <jessica.cris1127@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Simiao Carvalho
     

01 Sep, 2015

1 commit

20 May, 2015

1 commit

11 Feb, 2015

1 commit

21 Jan, 2015

1 commit

  • b3068b11   Add option to all community and users followers view a private article ... Browse File » 
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Gabriela Navarro
     

20 Oct, 2014

1 commit

26 Aug, 2014

1 commit

08 Aug, 2014

1 commit

06 May, 2014

1 commit

  • 1182476c   Merge branch 'rails235' into rails3 ... Browse File » 
    * rails235: (168 commits)
  L10n: support for custom locales
  enhancements: visualization of suggested usernames
  Allowing translation for url checking string
  Removed unnecessary lines on test
  Removed unit tests from functionals file
  Fixed html and test syntax
  Removed needless condition
  Fixed suggestions of usernames
  Test files should ends with "_test.rb"
  Added pagination on events_by_day on profile agenda
  Fix missing variable in funcional test
  Fix unit tests
  Change routes from embed controller
  Remove unused code
  Autocomplete fields on page load
  Blocks can returns a block of code to be evaluated
  Avoid randomness on tests
  comment-group-plugin: avoid randomness on tests
  community-track-plugin: fix tests by creating a profile with default boxes
  anti-spam-plugin-wrapper: ensure to load concrete wrappers
  ...

Conflicts:
	app/helpers/application_helper.rb
	app/models/comment.rb
	app/models/contact.rb
	app/models/event.rb
	app/models/mailing.rb
	app/models/organization.rb
	app/models/organization_mailing.rb
	app/models/pending_task_notifier.rb
	app/models/person.rb
	app/models/profile.rb
	app/models/scrap.rb
	app/models/task_mailer.rb
	app/models/user.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/profile_image.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/box_organizer/_link_list_block.rhtml
	app/views/box_organizer/edit.rhtml
	app/views/features/_manage_community_fields.rhtml
	app/views/features/_manage_enterprise_fields.rhtml
	app/views/features/_manage_person_fields.rhtml
	app/views/features/index.rhtml
	app/views/layouts/application-ng.rhtml
	app/views/users/_users_list.rhtml
	db/schema.rb
	features/forum.feature
	lib/feed_handler.rb
	lib/noosfero/plugin.rb
	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	plugins/spaminator/lib/spaminator_plugin/mailer.rb
	test/functional/content_viewer_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/profile_design_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/contact_sender_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/environment_mailing_test.rb
	test/unit/mailing_test.rb
	test/unit/organization_mailing_test.rb
	test/unit/person_test.rb
	test/unit/profile_test.rb
	test/unit/uploaded_file_test.rb
	vendor/plugins/action_tracker/lib/action_tracker_model.rb
    Victor Costa
     

18 Mar, 2014

1 commit

07 Mar, 2014

2 commits

11 Feb, 2014

1 commit

  • e9fea38f   Merge branch 'master' into rails3-merge ... Browse File » 
    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
     

21 Jan, 2014

1 commit

19 Jan, 2014

1 commit

18 Jan, 2014

1 commit

15 Jan, 2014

1 commit

09 Jan, 2014

1 commit

  • 9f616e0b   access_level: Custom permission for community users to access an article ... Browse File » 
    - Added a field on article new/edit to specify which users can access the article
- Added a relationship has_and_belongs_to_many between Article and Person
- Created a new table article_privacy_exceptions for has_and_belongs_to_many
- Added cucumber tests
- Added a new cucumber step to add a user to the exception users list

(ActionItem2852)

Signed-off-by: Alex de Souza <campelo.al1@gmail.com>
Signed-off-by: Athos Ribeiro <athoscribeiro@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
    Arthur Del Esposte
     

20 Feb, 2013

1 commit

25 Oct, 2012

1 commit

01 Oct, 2012

1 commit

16 May, 2012

1 commit

16 Dec, 2010

1 commit

23 Jan, 2009

1 commit

12 Dec, 2008

2 commits

11 Dec, 2008

1 commit

  • 974f333d   ActionItem806: some enhancements in blog ... Browse File » 
      - display comment form opened
  - links to subscribe rss feed
  - show 'Edit blog' on view blog
  - display button to remove article when view
  - use select box instead of text fields to blog configuration
  - decreasing size of the field description
  - use 'New post' instead of 'New article'
    Joenio Costa
     

29 Nov, 2008

1 commit

  • 4d602b80   ActionItem806: Squashed commit of the following: ... Browse File » 
        block to list amount of posts by month
    offer BlogArchivesBlock only if profile has blog
    pagination
    save feed options after create blog
    the settings of feeds must be editable trhough it's parent blog
    not offer to create sub-folder to blog
    the title of the post and the comments count are links to the specific article
    display count of blog-post comments
    users cant create more then one blog
    Joenio Costa