Software Público Brasileiro

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  

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  

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

1 commit

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

  2015-09-04 16:05:04 -0300  

01 Sep, 2015

1 commit

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

  2015-09-01 15:49:46 -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

1 commit

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

  1
  Rodrigo Souto

  2015-08-26 18:56:19 -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  

12 Aug, 2015

1 commit

• 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

7 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  
• e36907e3   Merge branch 'rss-icon' into noosfero Browse Dir »
  Braulio Bhavamitra

  2015-08-10 20:03:19 -0300  
• 5d003955   Use standard method for RSS-feed icon ... Browse Dir »

  Move icon to the icon theme structure (awesome also have an icon for
  this)

  dtygel

  2015-08-10 19:27:46 -0300  
• e32dafb8   Allow customization of URL to redirect after login ... Browse Dir »

  Besides, allow session to hold a value for after signup redirection

  Braulio Bhavamitra

  2015-08-10 19:19:20 -0300  
• b9225f6a   Merge branch 'download-icon' into noosfero Browse Dir »
  Braulio Bhavamitra

  2015-08-10 17:46:09 -0300  
• ac306a5b   Add download icon Browse Dir »
  dtygel

  2015-08-10 16:56:59 -0300  

09 Aug, 2015

2 commits

• bb71f7db   Add 'love' icon Browse Dir »
  dtygel

  2015-08-09 20:40:41 -0300  
• 2f07775b   Merge branch 'responsive' into 'master' ... Browse Dir »

  Responsive
  
  
  
  See merge request !607

  Braulio Bhavamitra

  2015-08-09 23:26:45 +0000  

31 Jul, 2015

2 commits

• df32d845   awesome: Remove asset pipeline generated files Browse Dir »
  Braulio Bhavamitra

  2015-07-31 20:07:13 -0300  
• c892b950   responsive: support glyphicons Browse Dir »
  Braulio Bhavamitra

  2015-07-31 20:06:46 -0300  

28 Jul, 2015

1 commit

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

  2015-07-28 11:38:41 -0300  

24 Jul, 2015

2 commits

• 5949b012   Merge branch 'master' into article_datetime Browse Dir »
  Leandro Santos

  2015-07-24 18:29:03 -0300  
• 08bbc6ff   change event start date and ende date to datetime Browse Dir »
  Leandro Santos

  2015-07-24 13:09:25 -0300  

23 Jul, 2015

4 commits

• 70a7683f   search: realign search box and search button ... Browse Dir »

  I know this is ridiculous, but will we have to rewrite all the HTML at some
  point anyway ...

  Antonio Terceiro

  2015-07-23 16:39:00 -0300  
• 793315ae   Merge branch 'master' of https://gitlab.com/noosfero/noosfero into responsive Browse Dir »
  Braulio Bhavamitra

  2015-07-23 16:09:41 -0300  
• 6c55ce14   Remove letfover selectordie files Browse Dir »
  Antonio Terceiro

  2015-07-23 11:05:49 -0300  
• 5063822a   Drop selectordie ... Browse Dir »

  - 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

  2015-07-23 10:22:47 -0300  

20 Jul, 2015

1 commit

• 02d5269c   Merge branch 'master' into api Browse Dir »
  Rodrigo Souto

  2015-07-20 14:48:59 -0300  

16 Jul, 2015

3 commits

• 8e515c3e   responsive: fix problems with bootstrap's border-box Browse Dir »
  Braulio Bhavamitra

  2015-07-16 11:45:29 -0300  
• 07e8414b   responsive: rename base.css to scss Browse Dir »
  Braulio Bhavamitra

  2015-07-16 11:45:29 -0300  
• 4812b285   Fix JS behaviour to show categories when noosfero is in a subdir environment ... Browse Dir »

  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Gabriela Navarro

  2015-07-16 13:24:24 +0000  

13 Jul, 2015

1 commit

• 0702669b   fix conflit with master Browse Dir »
  Leandro Santos

  2015-07-13 16:49:41 -0300