13 May, 2014

2 commits

12 May, 2014

10 commits

10 May, 2014

1 commit

09 May, 2014

1 commit

08 May, 2014

2 commits

07 May, 2014

2 commits

06 May, 2014

4 commits

  • 1182476c   Merge branch 'rails235' into rails3 ... Browse Code » 
    * 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
     
  • b1a79e13   rails3: disable controller caching Browse Code »
    Victor Costa
     
  • 5710cda8   rails3: fix render of private profile Browse Code »
    Victor Costa
     
  • 64b33a5d   rails3: fix cucumber tests Browse Code »
    Victor Costa
     

05 May, 2014

11 commits

29 Apr, 2014

2 commits

  • da1ac64a   rails3: write cached assets to a cache/ subdirectory ... Browse Code » 
    This fixes a problem with the packaged production environment where
Rails 3 expects write access to the entire directory instead of to just
the file it actually needs to write
    Antonio Terceiro
     
  • d4faecd1   rails3: development + packaging updates ... Browse Code » 
    Some specific points:

- ./script/quick-start not works from start to end on a clean Debian
  wheezy system
- Gemfile: remove checking for programs since the Gemfile is not really
  the right place to do this
- Gemfile.lock: lock gem versions against Debian wheezy.  This assumes
  package versions in Debian wheezy + some backported packages available
  at http://people.debian.org/~terceiro/noosfero-wheezy-backports/
- db:data:minimal: add an explicit contact email to the new environment.
  This fixes a long standing issue: when installing Noosfero on a brand
  new system, exim MTA will choke on a malformed sender address, and
  abort the entire installation.
- added a simple Vagrantfile for development purposes

Pending:

- provide proper backports for packages and drop the temporary
  http://people.debian.org/~terceiro/noosfero-wheezy-backports/
    Antonio Terceiro
     

28 Apr, 2014

1 commit

25 Apr, 2014

1 commit

24 Apr, 2014

2 commits

23 Apr, 2014

1 commit