16 Mar, 2016

1 commit


22 Feb, 2016

1 commit


04 Dec, 2015

1 commit

  • - Adds hostspot in Organization Rating task details
    - Improvements on task and organization ratings layout
    - Added one hotspot for task contents and another for ratings container content
    - Rejected rating comments are only displayed to env admins and comment owners
    - All task messages now refers to "a Report" instead of Comment:
      i.g. "Report waiting for approval" instead of "Comment waiting for approval"
    - Also added css style to auto expand task div
    
    Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>
    Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
    Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
    
    See merge request !737
    Gabriel Silva
     

18 Nov, 2015

1 commit

  • Custom fields can be added to any profile through the admin panel
    in the 'Fields' section. They have the same behaviour as the current
    Noosfero's fields (active, signup, required and privacy).
    
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
    Signed-off-by: Joenio Costa <joenio@colivre.coop.br>
    Signed-off-by: Macartur de Sousa <macartur.sc@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Marcos Pereira
     

14 Nov, 2015

2 commits


13 Oct, 2015

2 commits


05 Oct, 2015

1 commit


02 Oct, 2015

1 commit


01 Oct, 2015

1 commit

  • Also %s/will_paginate/pagination_links to use the default on forum, blog
    and cms
    
    Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>
    Signed-off-by: Melissa Wen <melissa@colivre.coop.br>
    Daniela Feitosa
     

29 Sep, 2015

1 commit


26 Sep, 2015

3 commits


24 Sep, 2015

1 commit

  • Additional improvements include:
    
    - Makes 'Remove Image' checkbox optional
    - Very ugly css hack to hide duplicated labels in some forms. I couldn't
    find another way to avoid the labels generated by labelled_form_for nor
    could I skip adding labels inside the helper since it's supposed to be
    generic.
    Larissa Reis
     

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