13 Feb, 2014

1 commit

11 Feb, 2014

1 commit

  • e9fea38f   Merge branch 'master' into rails3-merge ... Browse File » 
    Conflicts:
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/article_helper.rb
	app/helpers/catalog_helper.rb
	app/helpers/comment_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/members_block.rb
	app/models/person.rb
	app/models/profile.rb
	app/views/blocks/profile_info.html.erb
	app/views/blocks/profile_info_actions/community.html.erb
	config/initializers/dependencies.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	lib/tasks/plugins.rake
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	script/sample-products
	test/functional/catalog_controller_test.rb
	test/functional/manage_products_controller_test.rb
	test/functional/map_balloon_controller_test.rb
	test/functional/profile_controller_test.rb
	test/functional/search_controller_test.rb
	test/unit/box_test.rb
	test/unit/cms_helper_test.rb
	test/unit/enterprise_test.rb
	test/unit/environment_test.rb
	test/unit/featured_products_block_test.rb
	test/unit/person_test.rb
	test/unit/product_category_test.rb
	test/unit/product_test.rb
	test/unit/profile_test.rb
	test/unit/user_test.rb
	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
    Rodrigo Souto
     

22 Jan, 2014

1 commit

21 Jan, 2014

2 commits

09 Jan, 2014

1 commit

  • 6adc8bc2   Merge branch 'master' into rails3 ... Browse File » 
    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
     

21 Nov, 2013

1 commit

20 Nov, 2013

1 commit

18 Sep, 2013

1 commit

04 Jul, 2013

1 commit

23 Aug, 2012

1 commit

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse File » 
    Conflicts:
	app/controllers/admin_controller.rb
	app/controllers/application.rb
	app/controllers/public/account_controller.rb
	app/controllers/public/content_viewer_controller.rb
	lib/noosfero/i18n.rb
	test/functional/account_controller_test.rb
	test/functional/admin_controller_test.rb
	test/unit/contact_test.rb
	test/unit/profile_test.rb
    Antonio Terceiro
     

02 May, 2011

1 commit

04 Apr, 2011

1 commit

22 Feb, 2011

1 commit

02 Dec, 2010

1 commit

  • f92f835b   Added language for blocks ... Browse File » 
    Blocks will be displayed according to the browser locale:
  * "all": displayed in all languages
  * some language: displayed only in the selected language

(ActionItem1774)

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
    Daniela Feitosa
     

06 Aug, 2010

1 commit

17 Jul, 2010

1 commit

02 Jul, 2010

1 commit

18 May, 2010

1 commit

05 Feb, 2010

1 commit

  • d9eb3631   Adding new features to SlideshowBlock, and blocks in general ... Browse File » 
      * added option to shuffle images
  * added navigation buttons
  * other changes:
    * Removed "toggle visibility" button and action in BoxOrganizer
      Controller
    * Bock#visible? now receives an optional context so that blocks can
      decide where they must be shown or not
    * BoxesHelper now passes the context into the Block#visible? method
    * Added title to Uploaded files and displaying it instead of the
      description when viewing files

(ActionItem1358)
    Antonio Terceiro
     

27 Oct, 2009

1 commit

  • cd41bd67   Rewriting feed updater code ... Browse File » 
      * transformed script/feed-updater into a controller script. It starts
    and stops together with the production system (script/production)
  * moved the update (daemon) logic into FeedUpdater class. It knows which
    feeds must be updated and when, and when it should stop running.
  * concentrated the fetch (download) logic into FeedHandler class. It
    knows how to update a specific feed.
  * implemented the concept of "enabled" and "expired" in both
    ExternalFeed and FeedReaderBlock. The feed updater looks for feeds
    that are both enabled *and* expired to update.
  * Disabled feed reader blocks get re-enabled when their address is
    changed.
  * fixed a bug that made some feeds crash when using PostgreSQL
    (CGI::unescapeHTML transforms Numeric Character References into
    iso-8859-1 data and PostgreSQL won't accept that into a UTF-8
    database)
  * Removed sleep(1) calls from script/production, they don't seem to be
    useful
  * Added an index for the type column in `blocks` table.

(ActionItem1243)
    Antonio Terceiro
     

25 May, 2009

1 commit

23 Mar, 2009

1 commit

17 Feb, 2009

1 commit

09 Jul, 2008

1 commit

04 Jul, 2008

1 commit

09 Feb, 2008

2 commits

08 Feb, 2008

1 commit

30 Jan, 2008

1 commit

24 Jan, 2008

1 commit

23 Jan, 2008

1 commit

18 Jan, 2008

2 commits

01 Aug, 2007

2 commits

22 Jul, 2007

1 commit

17 Jul, 2007

1 commit

16 Jul, 2007

1 commit