13 Oct, 2015

1 commit

  • Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
    
    Conflicts:
    	app/controllers/my_profile/profile_design_controller.rb
    	app/helpers/boxes_helper.rb
    	app/helpers/layout_helper.rb
    	app/views/layouts/_javascript.html.erb
    	public/stylesheets/application.css
    	test/functional/environment_design_controller_test.rb
    	test/functional/profile_design_controller_test.rb
    Victor Costa
     

01 Sep, 2015

1 commit


27 Aug, 2015

1 commit


19 Aug, 2015

1 commit

  • Conflicts:
    	Gemfile
    	app/models/profile.rb
    	plugins/shopping_cart/lib/shopping_cart_plugin.rb
    	plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
    	plugins/shopping_cart/po/de/shopping_cart.po
    	plugins/shopping_cart/po/es/shopping_cart.po
    	plugins/shopping_cart/po/fr/shopping_cart.po
    	plugins/shopping_cart/po/hy/shopping_cart.po
    	plugins/shopping_cart/po/pt/shopping_cart.po
    	plugins/shopping_cart/po/ru/shopping_cart.po
    	plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
    	plugins/shopping_cart/views/cart.html.erb
    	plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
    	plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
    Rodrigo Souto
     

23 Jul, 2015

1 commit

  • - first it breaks selenium tests because it hides the original select
      and replaces it with its own thing.
    
    - second, IMO is is too much overhead to add a style that (again IMO) is
      not even that better than the default select widget in Firefox.
    Antonio Terceiro
     

20 Jun, 2015

1 commit


17 Jun, 2015

1 commit


15 Jun, 2015

1 commit


14 Jun, 2015

3 commits


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
     

19 May, 2015

2 commits


12 May, 2015

1 commit


23 Apr, 2015

1 commit


10 Apr, 2015

1 commit


19 Mar, 2015

1 commit


16 Mar, 2015

1 commit


22 Feb, 2015

1 commit


13 Feb, 2015

1 commit


11 Feb, 2015

1 commit


06 Feb, 2015

2 commits


05 Feb, 2015

2 commits


03 Feb, 2015

2 commits


30 Jan, 2015

1 commit


28 Jan, 2015

1 commit


27 Jan, 2015

1 commit


21 Jan, 2015

1 commit


17 Jan, 2015

1 commit


16 Jan, 2015

1 commit


13 Jan, 2015

1 commit


09 Jan, 2015

1 commit


08 Jan, 2015

1 commit


19 Dec, 2014

1 commit


04 Dec, 2014

1 commit


20 Nov, 2014

1 commit