Software Público Brasileiro

30 Sep, 2015

1 commit

• d66aa24c   merging with master Browse Dir »
  Leandro Santos

  2015-09-30 20:12:05 -0300  

29 Sep, 2015

2 commits

• 014031e1   api: ensure relative root is prefixed to the api path Browse Dir »

  1
  Rodrigo Souto

  2015-09-29 18:28:48 -0300  
• d1e74285   tiny-mce: add translations Browse Dir »

  1
  Rodrigo Souto

  2015-09-29 14:52:33 -0300  

24 Sep, 2015

1 commit

• c99dd6da   Add new consumption plugins ... Browse Dir »

  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

  2015-09-24 19:19:08 -0300  

22 Sep, 2015

1 commit

• 06bf7862   merging with master Browse Dir »
  Leandro Santos

  2015-09-22 16:12:48 -0300  

15 Sep, 2015

2 commits

• cc269c09   Merge branch 'master' into redemoinho-improvements Browse Dir »
  Rodrigo Souto

  2015-09-15 17:22:19 -0300  
• e0b52790   tinymce: upgrade and use non-minified version ... Browse Dir »

  For some reason, tinymce is not working on production environment. After
  some investigation, we discovered that it wasn't working on production
  due to the compression of tinymce.min.js. After using the non-minified
  version, the problem was solved.
  
  We also upgraded to 4.2.5.

  Rodrigo Souto

  2015-09-15 10:49:30 -0300  

11 Sep, 2015

2 commits

• e22434f3   Merge branch 'master' into redemoinho-improvements Browse Dir »
  Rodrigo Souto

  2015-09-11 15:36:49 -0300  
• 7ec5240f   Fix elements inside main-content were out of place ... Browse Dir »

  1

  Elements with position absolute inside main-content were being shown in
  wrong place, like text-editor-sidebar

  Daniela Feitosa

  2015-09-11 15:19:09 -0300  

10 Sep, 2015

1 commit

• 0134fa44   remove cube responsive theme as option to choose in themes Browse Dir »
  Leandro Santos

  2015-09-10 12:37:31 -0300  

08 Sep, 2015

1 commit

• 57b5f5bf   Merge branch 'master' into api Browse Dir »
  Antonio Terceiro

  2015-09-08 11:43:55 -0300  

05 Sep, 2015

1 commit

• 8f571a5e   Split members page in admins and non-admins ... Browse Dir »

    - 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

  2015-09-05 12:28:06 +0000  

04 Sep, 2015

2 commits

• db0d70fc   Merge branch 'master' into api Browse Dir »
  Antonio Terceiro

  2015-09-04 16:05:04 -0300  
• 6d33583a   Update proposal app Browse Dir »
  Victor Costa

  2015-09-04 16:04:28 -0300  

01 Sep, 2015

1 commit

• ad6f7988   Merge branch 'master' into redemoinho-improvements Browse Dir »
  Rodrigo Souto

  2015-09-01 15:49:46 -0300  

28 Aug, 2015

1 commit

• 1ed260f3   Merge branch 'master' into staging Browse Dir »
  Leandro Santos

  2015-08-28 18:11:21 -0300  

27 Aug, 2015

1 commit

• c9149e85   Fixed js that fills in the slug field of blog Browse Dir »

  1
  Daniela Feitosa

  2015-08-27 02:41:53 +0000  

26 Aug, 2015

5 commits

• c9cbe34e   remove prev_icons.yml due to conflict with asset-pipeline Browse Dir »

  1
  Rodrigo Souto

  2015-08-26 18:56:19 -0300  
• d981787d   removing participa-theme from submodule Browse Dir »
  Leandro Santos

  2015-08-26 13:06:26 -0300  
• d73af182   removing participa-web Browse Dir »
  Leandro Santos

  2015-08-26 13:03:37 -0300  
• 3b01c4e2   removing serpro-theme Browse Dir »
  Leandro Santos

  2015-08-26 09:27:15 -0300  
• 236bab2b   removing dialoga theme Browse Dir »
  Leandro Santos

  2015-08-26 09:22:39 -0300  

24 Aug, 2015

2 commits

• c772499e   removing confjuvapp submodule from public folder Browse Dir »
  Leandro Santos

  2015-08-24 19:39:32 -0300  
• aea2c4b3   updating dialoga plugin Browse Dir »
  Leandro Santos

  2015-08-24 18:24:09 -0300  

21 Aug, 2015

1 commit

• c6f3f356   Update dialoga theme Browse Dir »
  Victor Costa

  2015-08-21 11:57:53 -0300  

20 Aug, 2015

2 commits

• 4b59d9a4   Update proposal app Browse Dir »
  Victor Costa

  2015-08-20 11:07:42 -0300  
• 7bde6b33   Update proposal app Browse Dir »
  Victor Costa

  2015-08-20 10:46:30 -0300  

19 Aug, 2015

2 commits

• 121912b3   Merge branch 'shopping-cart-with-orders-and-delivery-plugins' ... Browse Dir »

  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

  2015-08-19 13:05:49 -0300  
• 1cc6c422   Merge branch 'fix_lefttopright_template' into 'master' ... Browse Dir »

  Make lefttopright only use CSS
  
  Add a solution that uses only CSS
  
  See merge request !651

  Daniela Feitosa

  2015-08-19 14:06:58 +0000  

17 Aug, 2015

1 commit

• c40e5211   plugin: updating proposal app Browse Dir »
  Leandro Santos

  2015-08-17 16:22:15 -0300  

14 Aug, 2015

1 commit

• 80ef20ed   adding serpro theme Browse Dir »
  Leandro Santos

  2015-08-14 11:38:10 -0300  

13 Aug, 2015

4 commits

• 395d2001   updating plugin Browse Dir »
  Leandro Santos

  2015-08-13 20:18:09 -0300  
• eb070c85   fixing conflit with master Browse Dir »
  Leandro Santos

  2015-08-13 17:44:13 -0300  
• 9bc97c5f   Merge branch 'master' into serpro-context Browse Dir »
  Leandro Santos

  2015-08-13 15:07:16 -0300  
• 791be590   update submodule : proposal-app Browse Dir »
  Francisco Júnior

  2015-08-13 13:03:17 -0300  

12 Aug, 2015

2 commits

• 3b69b25a   updating submodule Browse Dir »
  Leandro Santos

  2015-08-12 21:16:03 -0300  
• d168d5b8   Merge branch 'master' into article_datetime Browse Dir »
  Leandro Santos

  2015-08-12 09:05:20 -0300  

11 Aug, 2015

1 commit

• f74749e0   Make lefttopright only use CSS ... Browse Dir »

  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>

  Fabio Teixeira

  2015-08-11 10:15:31 -0300  

10 Aug, 2015

2 commits

• 90db0fd7   Merge branch 'confirm-leave' into noosfero Browse Dir »
  Braulio Bhavamitra

  2015-08-10 21:10:15 -0300  
• f9b414da   community: confirm leave Browse Dir »
  Braulio Bhavamitra

  2015-08-10 20:41:16 -0300