26 Feb, 2014

1 commit


11 Feb, 2014

1 commit


06 Feb, 2014

1 commit


29 Jan, 2014

1 commit


27 Jan, 2014

1 commit


23 Jan, 2014

1 commit


22 Jan, 2014

1 commit


20 Jan, 2014

3 commits


17 Jan, 2014

4 commits


15 Jan, 2014

2 commits


14 Jan, 2014

2 commits


10 Jan, 2014

2 commits


09 Jan, 2014

1 commit

  • Conflicts:
    	app/controllers/my_profile/memberships_controller.rb
    	app/helpers/application_helper.rb
    	app/helpers/boxes_helper.rb
    	app/models/article.rb
    	app/models/category.rb
    	app/models/change_password.rb
    	app/models/comment.rb
    	app/models/environment.rb
    	app/models/event.rb
    	app/models/profile.rb
    	app/models/recent_documents_block.rb
    	app/models/region.rb
    	app/models/task.rb
    	app/models/uploaded_file.rb
    	app/views/account/forgot_password.html.erb
    	app/views/events/_events_by_day.html.erb
    	app/views/profile/_person_profile.html.erb
    	app/views/shared/_manage_enterprises.html.erb
    	config/environment.rb
    	config/initializers/plugins.rb
    	config/routes.rb
    	db/schema.rb
    	debian/control
    	lib/noosfero/plugin.rb
    	test/unit/article_test.rb
    	test/unit/category_test.rb
    	test/unit/change_password_test.rb
    	test/unit/cms_helper_test.rb
    	test/unit/comment_test.rb
    	test/unit/content_viewer_helper_test.rb
    	test/unit/event_test.rb
    	test/unit/folder_helper_test.rb
    	test/unit/person_test.rb
    	test/unit/price_detail_test.rb
    	test/unit/profile_helper_test.rb
    	test/unit/recent_documents_block_test.rb
    	test/unit/scrap_test.rb
    	test/unit/user_mailer_test.rb
    	vendor/plugins/action_tracker_has_comments/init.rb
    	vendor/plugins/delayed_job/lib/delayed/worker.rb
    	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

07 Jan, 2014

3 commits


06 Jan, 2014

1 commit


03 Jan, 2014

2 commits


18 Dec, 2013

3 commits


13 Dec, 2013

1 commit


10 Dec, 2013

1 commit


02 Dec, 2013

2 commits


28 Nov, 2013

2 commits

  • Also:
    - Removed unused code
    - Fixed identation
    
    (ActionItem2587)
    Daniela Feitosa
     
  • Show events by month
    Event list now only show 10 events when listing events for month
    (events for a day still listing all events)
    Add information on indefined place
    Enhance layout
    
    (ActionItem2587)
    
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
    Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
    Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
    Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
    Signed-off-by: Tales Martins <tales.martins@gmail.com>
    Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Signed-off-by; Gabriela Navarro <navarro1703@gmail.com>
    Paulo Meireles
     

27 Nov, 2013

2 commits


26 Nov, 2013

1 commit


22 Nov, 2013

1 commit