24 Sep, 2015

1 commit

  • This patch adds 3 new consumption plugins:
      * orders_cycle
      * suppliers
      * volunteers
    
    These plugins are not properly tested yet but they are necessary for the
    orders and delivery plugins (that are properly tested) to work corretctly.
    Rodrigo Souto
     

11 Sep, 2015

1 commit


08 Sep, 2015

1 commit


05 Sep, 2015

1 commit

  •   - Order members by name
      - Removed white spaces
      - Changed strings to be translated
      - Renamed div id and test
      - Adjust ul tag members
      - Fixed plugin dependency
    
    Signed-off-by: Omar Junior <omarroinuj@gmail.com>
    Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
    Signed-off-by: Vitor Barbosa <vitormga15@gmail.com>
    Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
    Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
    Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
    Omar Junior
     

04 Sep, 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
     

10 Aug, 2015

2 commits


09 Aug, 2015

1 commit


28 Jul, 2015

1 commit


23 Jul, 2015

4 commits


16 Jul, 2015

1 commit


25 Jun, 2015

1 commit


17 Jun, 2015

3 commits


15 Jun, 2015

1 commit


14 Jun, 2015

2 commits


12 Jun, 2015

1 commit


11 Jun, 2015

2 commits


02 Jun, 2015

2 commits


01 Jun, 2015

1 commit


30 May, 2015

1 commit


28 May, 2015

3 commits

  • * 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
     
  • Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
    Gabriela Navarro
     
  • Michel Felipe
     

20 May, 2015

1 commit


19 May, 2015

1 commit


12 May, 2015

2 commits


08 May, 2015

1 commit


16 Apr, 2015

1 commit


14 Apr, 2015

1 commit


10 Apr, 2015

1 commit