28 Aug, 2015

1 commit

10 Aug, 2015

1 commit

09 Aug, 2015

1 commit

08 Jun, 2015

1 commit

28 May, 2015

1 commit

  • 1c125da7   chat fixes and new features ... Browse Dir »
    1 
    * try to reconnect if connection fails
* fix ordering
* reconnect if connection is lost but user status is not offline
* remove some anchors
* keep track of buddies order on the client
* tweak notification to work on chromium
* respect async request order
* focus on window when notification clicked
* deal with window visibility
* add chat-buttons
* fix recent_conversations
* fix sorting and join room on opening
* remove obsolete code
* adjusting indentation (sorry but I needed too...)
* fix load_conversation
* return identifier as key on avatars action
* fix typo
* add timeout to notification
* deal properly with offline messages
* fix notification sound
* clear unread after loading conversation on background
* ignore message from room
* add unread messages counter on chat-label
* as for notification permission as soon as the chat connects
* add profile_info_action to open chat
* using jid to save message instead of identifier
* add profile_info_action to open chat
* as for notification permission as soon as the chat connects
* add unread messages counter on chat-label

Squashed and Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Rodrigo Souto
     

12 May, 2015

1 commit

24 Feb, 2015

1 commit

08 Aug, 2014

1 commit

07 Aug, 2014

1 commit

  • 34f8f4d7   Merge remote-tracking branch 'origin/stable' ... Browse Dir » 
    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
     

05 May, 2014

1 commit

13 Feb, 2014

1 commit

11 Feb, 2014

1 commit

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

16 Jan, 2014

2 commits

08 Jan, 2014

1 commit

  • 2c251ae8   join_button: Join/Leave/Login Button ... Browse Dir » 
    - Added buttons at members block.
- Added checkbox to show or not the buttons on the community members.
- Removed the render button "enter/leave" when the checkbox that enables the button is unchecked
- Adjusted style CSS and display button
- Added cucumber and unit tests.
- Removed some spaces.
- There are two cucumber tests that wasn't done by the our team that fail if you don't use selenium. The files are publish_article.feature line 20 and search_enterprises.feature line 33 and we didn't modify them.

(ActionItem2844)

Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: Andre Bedran <bedran.fleck@gmail.com>
Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Carlos Andre de Souza
     

25 Dec, 2012

2 commits

29 Oct, 2012

1 commit

06 Dec, 2011

1 commit

11 Oct, 2011

1 commit

04 Oct, 2010

1 commit

20 Sep, 2010

1 commit

11 Sep, 2010

1 commit

02 Sep, 2010

1 commit

27 Aug, 2010

1 commit

01 Feb, 2010

1 commit

20 Nov, 2009

1 commit

22 Jul, 2009

1 commit

27 Jan, 2009

2 commits

26 Jan, 2009

1 commit

23 Jan, 2009

1 commit

02 Jan, 2009

1 commit

18 Dec, 2008

1 commit

09 Dec, 2008

1 commit

29 Nov, 2008

1 commit

02 Oct, 2008

1 commit

29 Aug, 2008

1 commit

19 Aug, 2008

1 commit

21 Jul, 2008

1 commit