16 Dec, 2014

1 commit


11 Dec, 2014

2 commits


08 Dec, 2014

2 commits


03 Dec, 2014

1 commit


02 Dec, 2014

1 commit


10 Nov, 2014

1 commit


28 Oct, 2014

2 commits


27 Oct, 2014

1 commit


22 Oct, 2014

1 commit

  • Conflicts:
    	app/helpers/profile_helper.rb
    	app/views/content_viewer/_article_toolbar.rhtml
    	app/views/profile/_common.rhtml
    	app/views/profile/_organization_profile.rhtml
    	app/views/profile/_person_profile.rhtml
    	db/schema.rb
    	public/stylesheets/application.css
    Daniela Feitosa
     

20 Oct, 2014

1 commit


10 Oct, 2014

3 commits


30 Sep, 2014

2 commits


26 Sep, 2014

2 commits


16 Sep, 2014

1 commit


11 Sep, 2014

1 commit


09 Sep, 2014

3 commits


01 Sep, 2014

5 commits


27 Aug, 2014

1 commit


25 Aug, 2014

3 commits


22 Aug, 2014

1 commit


20 Aug, 2014

5 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
     
  • Added support for using User Moderation and Skip user email activation features together
    
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Tallys Martins
     
  • from task.
    
    (AI3036)
    
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
    André Guedes
     
  • (AI3036)
    
    Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
    Signed-off-by: Renan Costa <renan2727@hotmail.com>
    Signed-off-by: Rodrigo Medeiros <rodrigo.mss01@gmail.com>
    Signed-off-by: Iolane Andrade <andrade.icaa@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    André Guedes