04 Sep, 2015

1 commit



19 Aug, 2015

2 commits


10 Aug, 2015

3 commits


09 Aug, 2015

1 commit


06 Aug, 2015

1 commit


12 Jul, 2015

1 commit


29 Jun, 2015

1 commit


27 Jun, 2015

1 commit


25 Jun, 2015

1 commit


17 Jun, 2015

1 commit


02 Jun, 2015

5 commits


24 Apr, 2015

1 commit


16 Mar, 2015

1 commit


23 Feb, 2015

1 commit


22 Feb, 2015

2 commits


10 Feb, 2015

1 commit


09 Feb, 2015

1 commit


12 Jan, 2015

1 commit


19 Dec, 2014

1 commit


11 Dec, 2014

2 commits


08 Dec, 2014

2 commits


02 Dec, 2014

1 commit


18 Sep, 2014

1 commit


09 Sep, 2014

1 commit


08 Sep, 2014

1 commit

  • Conflicts:
    	app/controllers/application_controller.rb
    	app/controllers/my_profile/memberships_controller.rb
    	app/controllers/public/account_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/layout_helper.rb
    	app/helpers/token_helper.rb
    	app/views/account/signup.html.erb
    	app/views/layouts/_javascript.html.erb
    	db/schema.rb
    	test/functional/application_controller_test.rb
    Rodrigo Souto
     

20 Aug, 2014

2 commits

  • Modified conditional to be more logical on User model.
    Renamed moderation task to a more intuitive name.
    Added unit test for moderate_user_registration task.
    
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    André Guedes
     
  • Solved code duplication that creates the Task for moderation.
    Fixed the signup page to show the correct messages in case of any combination of the features "Admin Must Approve New Users" and "Skip Email Activation"
    
    Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Tallys Martins