13 Oct, 2015

1 commit

26 Sep, 2015

1 commit

22 Sep, 2015

1 commit

07 Sep, 2015

1 commit

  • c9e090d9   Fixed post view hits for same visitor ... Browse File » 
    - Refreshing page no longer counts visits
- Unlogged in users counts only once
- Added test to page hits
- Refactor already_visited? method

Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Pedro de Lyra Pereira
     

16 Jun, 2015

1 commit

12 Jun, 2015

1 commit

11 Jun, 2015

1 commit

21 May, 2015

1 commit

13 May, 2015

1 commit

  • a710bcc7   Change logic for showing public articles in private communities ... Browse File »
    1 
    Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Gabriela Navarro
     

24 Apr, 2015

1 commit

23 Apr, 2015

1 commit

09 Apr, 2015

1 commit

08 Apr, 2015

1 commit

14 Mar, 2015

1 commit

10 Mar, 2015

1 commit

29 Jan, 2015

1 commit

31 Oct, 2014

2 commits

30 Oct, 2014

2 commits

22 Oct, 2014

2 commits

25 Sep, 2014

1 commit

24 Sep, 2014

1 commit

22 Sep, 2014

1 commit

11 Sep, 2014

1 commit

  • 6bc2c9c5   Merge branch 'stable' into stable-merge ... Browse File » 
    Conflicts:
	AUTHORS
	app/controllers/public/content_viewer_controller.rb
	debian/changelog
	lib/noosfero.rb
	po/de/noosfero.po
	po/eo/noosfero.po
	po/es/noosfero.po
	po/fr/noosfero.po
	po/hy/noosfero.po
	po/it/noosfero.po
	po/noosfero.pot
	po/pt/noosfero.po
	po/ru/noosfero.po
    Antonio Terceiro
     

15 Aug, 2014

1 commit

13 Aug, 2014

1 commit

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse File » 
    Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb
    Antonio Terceiro
     

25 Jul, 2014

1 commit

24 Jul, 2014

2 commits

23 Jul, 2014

1 commit

22 Jul, 2014

2 commits

09 Jul, 2014

1 commit

03 Jul, 2014

1 commit

30 Jun, 2014

1 commit

26 Jun, 2014

1 commit

06 Jun, 2014

1 commit