21 May, 2015

1 commit


13 May, 2015

1 commit

  • Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
    Gabriela Navarro
     

12 May, 2015

2 commits


08 May, 2015

6 commits


07 May, 2015

1 commit


27 Apr, 2015

2 commits


24 Apr, 2015

2 commits


13 Apr, 2015

1 commit


06 Apr, 2015

1 commit


24 Mar, 2015

1 commit


23 Mar, 2015

1 commit


11 Mar, 2015

2 commits

  • Conflicts:
    	app/controllers/box_organizer_controller.rb
    	app/controllers/my_profile/profile_design_controller.rb
    	app/helpers/box_organizer_helper.rb
    	app/helpers/boxes_helper.rb
    	app/helpers/layout_helper.rb
    	app/models/block.rb
    	app/models/communities_block.rb
    	app/models/theme.rb
    	app/views/box_organizer/index.html.erb
    	app/views/box_organizer/show_block_type_info.html.erb
    	test/functional/environment_design_controller_test.rb
    	test/functional/profile_design_controller_test.rb
    Victor Costa
     
  • Victor Costa
     

10 Mar, 2015

1 commit


06 Mar, 2015

1 commit


27 Feb, 2015

1 commit


25 Feb, 2015

1 commit


20 Feb, 2015

1 commit


04 Feb, 2015

1 commit


03 Feb, 2015

1 commit

  • Conflicts:
    	app/controllers/my_profile/profile_editor_controller.rb
    	app/helpers/search_helper.rb
    	app/models/invitation.rb
    	app/models/person.rb
    	app/views/cms/view.html.erb
    	app/views/templates/index.html.erb
    	plugins/community_track/views/content_viewer/_step_item.html.erb
    	test/functional/home_controller_test.rb
    	test/unit/person_test.rb
    	test/unit/profile_test.rb
    Rodrigo Souto
     

02 Feb, 2015

2 commits


30 Jan, 2015

1 commit


29 Jan, 2015

3 commits


28 Jan, 2015

3 commits


27 Jan, 2015

1 commit

  •   Now all tests pass.
    
      A couple aditional changes:
        - Replacing flash notice for session notice;
        - Cancel a task if it fails. A task can fail for many reasons,
        including for validation, so I thought it would make sense to cancel
        a task to publish an article if it fails. For example if the title
        is too big validation will fail, the task will fail and the user
        will get a message saying publish request couldn't be sent, so
        naturally the user will try to publish again, hopefully this time
        succeding.
    Larissa Reis
     

22 Jan, 2015

2 commits