NoosferoGov / noosfero

18 Jun, 2014

1 commit

1d8274ca Bumping version 0.99.0~rc20140618202455 Browse Dir »

Rodrigo Souto
2014-06-18 20:25:06 +0000

16 May, 2014

1 commit

bc0846d9 Revert "Bumping version 0.47.2~rc20140515215435" ... Browse Dir »
```
This reverts commit 43562836cd08189cd2a88838db6c6cc8f559ab16.
```
Rodrigo Souto
2014-05-16 14:36:00 +0000

15 May, 2014

1 commit

43562836 Bumping version 0.47.2~rc20140515215435 Browse Dir »

Rodrigo Souto
2014-05-15 21:54:42 +0000

14 May, 2014

1 commit

70b82310 rails3: fix noosfero-console script Browse Dir »

Antonio Terceiro
2014-05-14 10:41:48 -0300

13 May, 2014

1 commit

23914711 Merge branch 'master' into rails3 ... Browse Dir »

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

2014-05-13 10:43:37 -0300

06 May, 2014

1 commit

1182476c Merge branch 'rails235' into rails3 ... Browse Dir »

* 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

2014-05-06 18:00:26 -0300

05 May, 2014

1 commit

beb05f86 Bumping version 0.47.1 Browse Dir »

Rodrigo Souto
2014-05-05 19:10:54 +0000

29 Apr, 2014

2 commits

da1ac64a rails3: write cached assets to a cache/ subdirectory ... Browse Dir »

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

2014-04-29 11:11:38 -0300

d4faecd1 rails3: development + packaging updates ... Browse Dir »

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/

2014-04-29 10:28:36 -0300

23 Apr, 2014

1 commit

d08608af Merge remote-tracking branch 'origin' into stable ... Browse Dir »

Conflicts:
	app/views/content_viewer/view_page.rhtml
	app/views/profile_editor/index.rhtml
	debian/changelog
	lib/noosfero.rb
	plugins/comment_group/test/functional/comment_group_plugin_profile_controller_test.rb

2014-04-23 10:52:54 -0300

22 Apr, 2014

1 commit

6b55fd42 Bumping version 0.47.0 Browse Dir »

Rodrigo Souto
2014-04-22 20:13:35 +0000

17 Apr, 2014

1 commit

d54c474e Bumping version 0.46.3 Browse Dir »

Rodrigo Souto
2014-04-17 14:31:28 +0000

09 Apr, 2014

1 commit

5addb278 Bumping version 0.47.0~rc3 Browse Dir »

Rodrigo Souto
2014-04-09 19:01:38 +0000

20 Mar, 2014

1 commit

aa963d7a Bumping version 0.47.0~rc1 Browse Dir »

Rodrigo Souto
2014-03-20 20:26:56 +0000

19 Mar, 2014

1 commit

ca78d2e2 Bumping version 0.46.2 Browse Dir »

Rodrigo Souto
2014-03-19 23:41:10 +0000

07 Mar, 2014

2 commits

423aba17 Merge branch 'master' into rails3 ... Browse Dir »
```
Conflicts:
	config/initializers/dependencies.rb
	debian/control
	lib/noosfero/core_ext.rb
	lib/noosfero/plugin/routes.rb
```
Daniela Feitosa
2014-03-07 14:35:37 +0000
49e6135e Bumping version 0.46.1 Browse Dir »

Daniela Feitosa
2014-03-07 13:04:39 +0000

20 Feb, 2014

1 commit

2e49a4f6 Bumping version 0.46.0 Browse Dir »

Rodrigo Souto
2014-02-20 17:56:20 -0300

13 Feb, 2014

1 commit

b096aa74 Revert "add the nokogiri gem as dependency" ... Browse Dir »

This reverts commit a3fb85d903790d565983e4e0f22acf557d8292dc.

Reverting substitution of hpricot for nokogiri on macros infra due to
segfault problem with nokogiri 1.4.0.

Conflicts:

	INSTALL
	script/install-dependencies/debian-squeeze.sh

2014-02-13 20:34:19 -0300

11 Feb, 2014

2 commits

1f0194be Merge branch 'master' into rails3-merge ... Browse Dir »

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

2014-02-11 18:00:35 -0300

e9fea38f Merge branch 'master' into rails3-merge ... Browse Dir »

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

2014-02-11 17:35:19 -0300

10 Feb, 2014

1 commit

1d8eeefb Merge branch 'noosfero_0.46.0' Browse Dir »

Rodrigo Souto
2014-02-10 22:13:58 -0300

28 Jan, 2014

1 commit

6cb08f2f Merge commit 'refs/merge-requests/366' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/366

Conflicts:
	INSTALL
	script/install-dependencies/debian-squeeze.sh
```
Rodrigo Souto
2014-01-28 16:45:47 -0300

20 Jan, 2014

1 commit

407ec1dc Bumping version 0.46.0~rc20140120171635 Browse Dir »

Rodrigo Souto
2014-01-20 17:17:04 +0000

17 Jan, 2014

1 commit

4ad91064 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	test/unit/comment_test.rb
```
Rodrigo Souto
2014-01-17 18:08:25 +0000

14 Jan, 2014

1 commit

75ebbf5b Bumping version 0.45.2 Browse Dir »

Rodrigo Souto
2014-01-14 13:25:21 +0000

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse Dir »

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

2014-01-09 15:17:55 +0000

07 Jan, 2014

2 commits

c9eccb09 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +0000
5ee6d4bb Bumping version 0.45.1 Browse Dir »

Rodrigo Souto
2014-01-07 14:13:00 +0000

10 Dec, 2013

2 commits

15717094 Merge branch 'master' into next Browse Dir »

Rodrigo Souto
2013-12-10 17:09:05 -0300
f59157a6 Bumping version 0.45.0 Browse Dir »

Rodrigo Souto
2013-12-10 16:04:37 -0300

02 Dec, 2013

2 commits

bd4954d3 Merge branch 'master' into next-origin ... Browse Dir »

Conflicts:
	app/models/category.rb
	app/models/uploaded_file.rb
	test/functional/memberships_controller_test.rb
	test/functional/profile_controller_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2013-12-02 20:33:51 -0300

7173d291 Bumping version 0.45.0~rc20131202153818 Browse Dir »

Rodrigo Souto
2013-12-02 15:38:35 -0300

28 Nov, 2013

1 commit

bc719cf6 Drop unecessary dependencies ... Browse Dir »

- openjdk-6-jre: nothing in the core depends on Java anymore

- libmysql-ruby: nobody actually tests Noosfero against mysql, so there
  is no point in depending on it.

2013-11-28 20:50:27 -0300