09 Sep, 2014

1 commit

13 May, 2014

1 commit

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

29 Apr, 2014

1 commit

  • d4faecd1   rails3: development + packaging updates ... Browse File » 
    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
     

07 Apr, 2014

1 commit

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
     

24 Sep, 2013

1 commit

17 Jul, 2013

1 commit

16 May, 2012

1 commit

29 Feb, 2012

1 commit

28 Feb, 2012

1 commit

09 Dec, 2011

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
     

22 Oct, 2011

1 commit

22 Aug, 2011

2 commits

16 Aug, 2011

1 commit

23 Feb, 2011

1 commit

22 Feb, 2011

1 commit

31 Jan, 2011

1 commit

07 Dec, 2010

1 commit

  • 5483669c   Added new themes ... Browse File » 
      * Added profile-base as base of profile's themes
  * Added profile-base on gettext.rake to be translated
  * Fixed scarletred and skyblue themes to import profile-base
  * New themes based on Tango pallete: http://tango.freedesktop.org/Tango_Icon_Theme_Guidelines
    * aluminium
    * butter
    * chameleon
    * chocolate
    * orange
    * plum

(ActionItem1675)
    Daniela Feitosa
     

26 Oct, 2010

2 commits

12 Sep, 2010

1 commit

11 Sep, 2010

1 commit

06 Aug, 2010

1 commit

20 Apr, 2010

1 commit

14 Apr, 2010

1 commit

08 Apr, 2010

1 commit

05 Feb, 2010

1 commit

04 Dec, 2009

1 commit

29 Sep, 2009

1 commit

03 Aug, 2009

1 commit

21 Jul, 2008

2 commits

27 Jun, 2008

1 commit

26 Jun, 2008

1 commit

15 Sep, 2007

1 commit

30 Aug, 2007

1 commit

25 Jul, 2007

1 commit

23 Jul, 2007

1 commit