28 Jan, 2015

2 commits


10 Oct, 2014

1 commit

  • - Remove absolute URL's from stylesheets and javascripts
    - Handle prefix in LinkListBlock
    - add Noosfero.root method as a central data source
    
    The application server needs to be started with the
    RAILS_RELATIVE_URL_ROOT environment variable set to the desired prefix.
    
    In development, this can be tested with
    
      # assuming /social prefix
      $ RAILS_RELATIVE_URL_ROOT=/social thin --prefix /social start
    
    For production, see INSTALL.md
    Antonio Terceiro
     

26 Sep, 2014

1 commit


27 Aug, 2014

1 commit


20 Aug, 2014

1 commit


18 Aug, 2014

1 commit


30 Jul, 2014

1 commit

  • Base plugins are enanbed by default and cannot be disabled at the system
    level, but can be disabled per-environment at the web UI.
    
    A part of the required changes also fix the Noosfero plugin
    infrastructure, in special migrations, on Rails 3.
    Antonio Terceiro
     

17 Jul, 2014

2 commits


08 Jul, 2014

2 commits


07 Jul, 2014

1 commit


04 Jul, 2014

1 commit


15 Jun, 2014

1 commit


14 Jun, 2014

1 commit


05 Jun, 2014

3 commits


29 May, 2014

1 commit


13 May, 2014

1 commit

  • Conflicts:
    	app/helpers/application_helper.rb
    	app/helpers/layout_helper.rb
    	app/models/community.rb
    	app/models/enterprise.rb
    	app/models/product_category.rb
    	app/views/account/change_password.html.erb
    	config/boot.rb
    	config/environment.rb
    	config/routes.rb
    	lib/noosfero/plugin.rb
    	test/unit/enterprise_activation_test.rb
    	test/unit/person_notifier_test.rb
    Rodrigo Souto
     

12 May, 2014

1 commit


06 May, 2014

1 commit

  • * rails235: (168 commits)
      L10n: support for custom locales
      enhancements: visualization of suggested usernames
      Allowing translation for url checking string
      Removed unnecessary lines on test
      Removed unit tests from functionals file
      Fixed html and test syntax
      Removed needless condition
      Fixed suggestions of usernames
      Test files should ends with "_test.rb"
      Added pagination on events_by_day on profile agenda
      Fix missing variable in funcional test
      Fix unit tests
      Change routes from embed controller
      Remove unused code
      Autocomplete fields on page load
      Blocks can returns a block of code to be evaluated
      Avoid randomness on tests
      comment-group-plugin: avoid randomness on tests
      community-track-plugin: fix tests by creating a profile with default boxes
      anti-spam-plugin-wrapper: ensure to load concrete wrappers
      ...
    
    Conflicts:
    	app/helpers/application_helper.rb
    	app/models/comment.rb
    	app/models/contact.rb
    	app/models/event.rb
    	app/models/mailing.rb
    	app/models/organization.rb
    	app/models/organization_mailing.rb
    	app/models/pending_task_notifier.rb
    	app/models/person.rb
    	app/models/profile.rb
    	app/models/scrap.rb
    	app/models/task_mailer.rb
    	app/models/user.rb
    	app/views/account/_signup_form.rhtml
    	app/views/blocks/profile_image.rhtml
    	app/views/blocks/profile_info.rhtml
    	app/views/box_organizer/_link_list_block.rhtml
    	app/views/box_organizer/edit.rhtml
    	app/views/features/_manage_community_fields.rhtml
    	app/views/features/_manage_enterprise_fields.rhtml
    	app/views/features/_manage_person_fields.rhtml
    	app/views/features/index.rhtml
    	app/views/layouts/application-ng.rhtml
    	app/views/users/_users_list.rhtml
    	db/schema.rb
    	features/forum.feature
    	lib/feed_handler.rb
    	lib/noosfero/plugin.rb
    	plugins/community_track/test/functional/community_track_plugin_content_viewer_controller_test.rb
    	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
    	plugins/spaminator/lib/spaminator_plugin/mailer.rb
    	test/functional/content_viewer_controller_test.rb
    	test/functional/profile_controller_test.rb
    	test/functional/profile_design_controller_test.rb
    	test/functional/search_controller_test.rb
    	test/unit/contact_sender_test.rb
    	test/unit/content_viewer_helper_test.rb
    	test/unit/environment_mailing_test.rb
    	test/unit/mailing_test.rb
    	test/unit/organization_mailing_test.rb
    	test/unit/person_test.rb
    	test/unit/profile_test.rb
    	test/unit/uploaded_file_test.rb
    	vendor/plugins/action_tracker/lib/action_tracker_model.rb
    Victor Costa
     

23 Apr, 2014

1 commit


08 Apr, 2014

1 commit


04 Apr, 2014

1 commit


20 Mar, 2014

1 commit


19 Mar, 2014

1 commit


16 Mar, 2014

2 commits


14 Mar, 2014

2 commits


13 Mar, 2014

1 commit


07 Mar, 2014

3 commits


03 Mar, 2014

2 commits


24 Feb, 2014

1 commit


11 Feb, 2014

1 commit

  • Conflicts:
    	app/views/profile_themes/add_css.rhtml
    	app/views/profile_themes/add_image.rhtml
    	app/views/profile_themes/css_editor.rhtml
    	app/views/profile_themes/edit.rhtml
    	app/views/profile_themes/new.rhtml
    	app/views/themes/add_css.html.erb
    	app/views/themes/add_css.rhtml
    	app/views/themes/add_image.html.erb
    	app/views/themes/add_image.rhtml
    	app/views/themes/css_editor.html.erb
    	app/views/themes/css_editor.rhtml
    	app/views/themes/edit.html.erb
    	app/views/themes/edit.rhtml
    	app/views/themes/index.html.erb
    	app/views/themes/new.html.erb
    	app/views/themes/new.rhtml
    	test/factories.rb
    	test/functional/profile_themes_controller_test.rb
    Rodrigo Souto