12 Nov, 2015

1 commit


10 Nov, 2015

1 commit


13 Oct, 2015

1 commit

  • Signed-off-by: Victor Costa <vfcosta@gmail.com>
    Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
    
    Conflicts:
    	app/controllers/my_profile/profile_design_controller.rb
    	app/helpers/boxes_helper.rb
    	app/helpers/layout_helper.rb
    	app/views/layouts/_javascript.html.erb
    	public/stylesheets/application.css
    	test/functional/environment_design_controller_test.rb
    	test/functional/profile_design_controller_test.rb
    Victor Costa
     

02 Oct, 2015

1 commit


01 Oct, 2015

1 commit


29 Sep, 2015

3 commits


26 Sep, 2015

1 commit


15 Sep, 2015

3 commits


11 Sep, 2015

3 commits


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


01 Sep, 2015

1 commit


28 Aug, 2015

1 commit


27 Aug, 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
     

13 Aug, 2015

1 commit


10 Aug, 2015

3 commits


28 Jul, 2015

1 commit


24 Jul, 2015

1 commit


23 Jul, 2015

1 commit

  • - 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
     

20 Jul, 2015

1 commit


16 Jul, 2015

1 commit


25 Jun, 2015

1 commit


20 Jun, 2015

1 commit


17 Jun, 2015

2 commits


16 Jun, 2015

1 commit


15 Jun, 2015

2 commits


14 Jun, 2015

2 commits