Software Público Brasileiro

18 Aug, 2014

9 commits

• 696acea8   Merge branches 'rails3_AI3033-serpro_integration' and 'rails3_stable' into rails3_stable Browse Code »
  Leandro Santos

  2014-08-18 11:13:53 -0300  
• 77c50404   prevent null pointer exception in smile block Browse Code »
  Leandro Santos

  2014-08-18 11:13:33 -0300  
• 526b2e14   Merge branches 'rails3_AI3033-serpro_integration' and 'rails3_stable' into rails3_stable Browse Code »
  Leandro Santos

  2014-08-18 11:12:32 -0300  
• 468d2b2e   prevent null pointer exception in smile block Browse Code »
  Leandro Santos

  2014-08-18 11:12:12 -0300  
• b4a65fda   Merge branches 'rails3_AI3033-serpro_integration' and 'rails3_stable' into rails3_stable Browse Code »
  Leandro Santos

  2014-08-18 10:38:04 -0300  
• c79b3692   should not broke community criation if there is no serpro integration plugin configuration Browse Code »
  Leandro Santos

  2014-08-18 10:14:38 -0300  
• fcbc8630   Adding admin configuration to choose which templates could be used for integration Browse Code »
  Leandro Santos

  2014-08-18 10:06:50 -0300  
• 1a56f70b   Merge branches 'master' and 'rails3_AI3033-serpro_integration' into rails3_stable Browse Code »
  Leandro Santos

  2014-08-18 08:27:17 -0300  
• a4bff7fa   Merge branches 'master' and 'rails3_AI3033-serpro_integration' into rails3_AI3033-serpro_integration Browse Code »
  Leandro Santos

  2014-08-18 08:26:25 -0300  

15 Aug, 2014

18 commits

• c38320e4   Merge branch 'rails3_chat' into rails3_stable ... Browse Code »

  Conflicts:
  	public/javascripts/chat.js

  Victor Costa

  2014-08-15 18:42:12 -0300  
• d6464512   Fix group chat Browse Code »
  Victor Costa

  2014-08-15 18:41:36 -0300  
• 4165dcf1   Merge branch 'rails3_chat' into rails3_stable Browse Code »
  Victor Costa

  2014-08-15 17:53:23 -0300  
• 7842d643   Fix group chat Browse Code »
  Victor Costa

  2014-08-15 17:50:58 -0300  
• 0ab68b68   Small fixes in chat ui Browse Code »
  Victor Costa

  2014-08-15 14:59:08 -0300  
• 874cac29   Merge branch 'rails3_chat' into rails3_stable Browse Code »
  Victor Costa

  2014-08-15 14:51:31 -0300  
• 2542ec64   Small fixes in chat ui Browse Code »
  Victor Costa

  2014-08-15 14:51:20 -0300  
• ab1bc670   Merge branch 'rails3_chat' into rails3_stable ... Browse Code »

  Conflicts:
  	public/stylesheets/chat.css

  Victor Costa

  2014-08-15 14:46:38 -0300  
• 22e67b37   Small fixes in chat ui Browse Code »
  Victor Costa

  2014-08-15 14:45:38 -0300  
• 48c6e8f3   Merge branch 'rails3_chat' into rails3_stable Browse Code »
  Victor Costa

  2014-08-15 14:44:59 -0300  
• 9d016a77   Small fixes in chat ui Browse Code »
  Victor Costa

  2014-08-15 14:19:36 -0300  
• 097fe2a7   Merge branch 'rails3_chat' into rails3_stable Browse Code »
  Victor Costa

  2014-08-15 12:13:49 -0300  
• cec25930   Merge branch 'rails3' into rails3_stable ... Browse Code »

  Conflicts:
  	db/schema.rb
  	public/javascripts/application.js

  Victor Costa

  2014-08-15 12:10:31 -0300  
• a2d483ba   Small fixes in chat ui Browse Code »
  Victor Costa

  2014-08-15 11:55:46 -0300  
• 35bf1408   Upgrade strophe.js to 1.1.3 Browse Code »
  Victor Costa

  2014-08-15 09:32:54 -0300  
• 1ead5508   Fix bosh service url Browse Code »
  Victor Costa

  2014-08-15 09:15:48 -0300  
• e6855182   Merge branch 'AI3240-fix_join_and_leave' into 'master' ... Browse Code »

  Ai3240 fix join and leave
  
  See merge request !272

  Antonio Terceiro

  2014-08-15 12:09:57 +0000  
• 6ce76a6e   Merge branch 'AI3218_article_block_bug' into 'master' ... Browse Code »

  Ai3218 article block bug
  
  Fixing ArticleBlock blog's pagination bug: http://noosfero.org/Development/ActionItem3218
  
  See merge request !301

  Antonio Terceiro

  2014-08-15 12:08:31 +0000  

14 Aug, 2014

6 commits

• a626564b   Small fixes on chat layout Browse Code »
  Victor Costa

  2014-08-14 19:48:38 -0300  
• 1a5e1b36   Add style to links in chat history Browse Code »
  Victor Costa

  2014-08-14 18:25:28 -0300  
• 733f701e   Remove userdata polling when chat is enabled Browse Code »
  Victor Costa

  2014-08-14 18:02:18 -0300  
• 08b9e2b9   Small fixes for chat Browse Code »
  Victor Costa

  2014-08-14 17:06:11 -0300  
• 3b3e0243   Remove paginate from ArticleBlock blog's presentation ... Browse Code »

  (ActionItem3218)
  
  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>

  Arthur Esposte

  2014-08-14 16:46:37 -0300  
• 01c3bad8   Use xmpp_chat to render new chat layout Browse Code »
  Victor Costa

  2014-08-14 09:47:36 -0300  

13 Aug, 2014

7 commits

• e4d17fb9   Fix friends counter in chat Browse Code »
  Victor Costa

  2014-08-13 19:34:39 -0300  
• ebb85ad4   Remove unused chat files and fix chat button Browse Code »
  Victor Costa

  2014-08-13 19:18:27 -0300  
• 3fab4790   New chat layout Browse Code »
  Victor Costa

  2014-08-13 19:04:52 -0300  
• 05d99f0e   Gemfile: de-duplicate rake ... Browse Code »

  newer versions of bundler will bitch about that.

  Antonio Terceiro

  2014-08-13 18:11:37 -0300  
• ac6fc84e   debian/control: simplify Ruby dependency Browse Code »
  Antonio Terceiro

  2014-08-13 18:04:19 -0300  
• 7ee6ad9a   debian/control: new depndency Browse Code »
  Antonio Terceiro

  2014-08-13 18:03:17 -0300  
• d623f651   quick-start debian: always run apt-get update Browse Code »
  Antonio Terceiro

  2014-08-13 18:01:08 -0300