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

1 commit


08 May, 2015

4 commits


07 May, 2015

2 commits

  • Conflicts:
    	test/unit/boxes_helper_test.rb
    Rodrigo Souto
     
  • Add alternative redirect's behavior when user is '~'
    
    This is a new feature to create generic URL's related to usernames in Noosfero. It is useful for internal links on articles and for general links on themes.
    
    Examples:
     - If you're logged in as "test" and you go to /~/blog it will redirect you to /test/blog
     - If you're logged in as "test" and you go to /myprofile/~ it will redirect you to /myprofile/test
     - If you're not logged in and you go to /profile/~ or any other link using "~" it will give you a not found page(404).
    
    See merge request !518
    Rodrigo Souto
     

27 Apr, 2015

3 commits


24 Apr, 2015

3 commits


17 Apr, 2015

2 commits


16 Apr, 2015

2 commits


14 Apr, 2015

1 commit


09 Apr, 2015

1 commit


08 Apr, 2015

4 commits


07 Apr, 2015

1 commit


31 Mar, 2015

1 commit


26 Mar, 2015

2 commits


23 Mar, 2015

1 commit


17 Mar, 2015

1 commit


12 Mar, 2015

2 commits


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

3 commits


05 Mar, 2015

1 commit