16 Mar, 2016

1 commit


10 Mar, 2016

17 commits


08 Mar, 2016

1 commit


09 Dec, 2015

1 commit


06 Oct, 2015

1 commit


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

  • * 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


05 Feb, 2015

1 commit


18 Sep, 2014

1 commit


18 Aug, 2014

1 commit


13 Aug, 2014

1 commit


12 Aug, 2014

1 commit


11 Aug, 2014

1 commit


08 Aug, 2014

1 commit


07 Aug, 2014

1 commit

  • 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
     

04 Aug, 2014

1 commit


05 Jun, 2014

1 commit


04 Jun, 2014

1 commit


29 May, 2014

1 commit