28 May, 2015

4 commits

  •   A plugin to help enterprises find consumers and suppliers for their
      products
    Larissa Reis
     
  • * removing one level of includes in apache conf
    * be verbose about apache config update
    * chat_message should not be created without "from" or "to"
    * the database table indexes is "from_id / to_id" not "from / to"
    Joenio Costa
     
  • * 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
     
  • …he template it is changed on all users that follow that template.
    
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
    Gabriela Navarro
     

20 May, 2015

1 commit


13 May, 2015

3 commits


12 May, 2015

2 commits


08 May, 2015

2 commits


16 Apr, 2015

1 commit


08 Apr, 2015

1 commit


26 Mar, 2015

1 commit


16 Mar, 2015

1 commit


27 Feb, 2015

1 commit


26 Feb, 2015

1 commit

  • - created 'secret' attribute for profiles
    - redefined scope for secret communities
    
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
    Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Filipe Ribeiro de Morais
     

22 Feb, 2015

2 commits


13 Feb, 2015

1 commit


11 Feb, 2015

1 commit


10 Feb, 2015

2 commits


06 Feb, 2015

1 commit


03 Feb, 2015

2 commits


02 Feb, 2015

1 commit


30 Jan, 2015

2 commits


27 Jan, 2015

1 commit


22 Jan, 2015

1 commit


21 Jan, 2015

1 commit

  • Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Gabriela Navarro
     

14 Jan, 2015

1 commit


12 Jan, 2015

1 commit


20 Nov, 2014

1 commit


18 Nov, 2014

1 commit


05 Nov, 2014

1 commit


22 Oct, 2014

1 commit

  • Conflicts:
    	app/helpers/profile_helper.rb
    	app/views/content_viewer/_article_toolbar.rhtml
    	app/views/profile/_common.rhtml
    	app/views/profile/_organization_profile.rhtml
    	app/views/profile/_person_profile.rhtml
    	db/schema.rb
    	public/stylesheets/application.css
    Daniela Feitosa
     

17 Oct, 2014

1 commit