AvaliaSPB / Noosfero

28 Jan, 2015

1 commit

c0954f1b Always sanitize HTML in header and footer ... Browse File »
```
(cherry picked from commit 7441ba6c92304870c6110814fd588718d6e7bde3)
```
Antonio Terceiro
2015-01-28 16:28:44 -0200

07 Aug, 2014

1 commit

34f8f4d7 Merge remote-tracking branch 'origin/stable' ... Browse File »

Hopefully this is the very last time we do this.

Conflicts:
	Rakefile
	app/controllers/my_profile/cms_controller.rb
	app/controllers/public/content_viewer_controller.rb
	app/helpers/application_helper.rb
	app/helpers/content_viewer_helper.rb
	app/models/article.rb
	app/models/enterprise.rb
	app/models/product_categories_block.rb
	app/models/products_block.rb
	app/views/account/_signup_form.rhtml
	app/views/blocks/my_network.rhtml
	app/views/blocks/profile_info.rhtml
	app/views/blocks/profile_info_actions/_community.html.erb
	app/views/blocks/profile_info_actions/_enterprise.html.erb
	app/views/blocks/profile_info_actions/_person.html.erb
	app/views/content_viewer/view_page.rhtml
	app/views/profile/index.rhtml
	app/views/shared/_disabled_enterprise.html.erb
	app/views/shared/articles_list.html.erb
	db/schema.rb
	debian/changelog
	lib/file_presenter.rb
	lib/noosfero.rb
	plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
	plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin/work_assignment_test.rb
	plugins/work_assignment/test/unit/work_assingment_plugin_test.rb
	public/javascripts/application.js
	script/sample-articles
	script/sample-enterprises
	script/sample-products
	script/sample-profiles
	test/functional/cms_controller_test.rb
	test/functional/comment_controller_test.rb
	test/functional/content_viewer_controller_test.rb
	test/unit/application_helper_test.rb
	test/unit/article_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/folder_helper_test.rb
	test/unit/forum_helper_test.rb

2014-08-07 14:20:39 -0300

05 Jun, 2014

1 commit

58219747 profile-test: avoid randomness (again...) Browse File »

Rodrigo Souto
2014-06-05 15:41:25 -0300

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

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

12 May, 2014

1 commit

af190be9 Merge branch 'rails235' ... Browse File »
```
Conflicts:
	features/categories_block.feature
	public/stylesheets/application.css
```
Daniela Feitosa
2014-05-12 15:58:32 +0000

06 May, 2014

1 commit

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

* 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

08 Apr, 2014

1 commit

1ef72f36 Merge branch 'stable' into rails235 ... Browse File »

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/categories_block.feature
	test/functional/search_controller_test.rb

2014-04-08 21:23:45 +0000

02 Apr, 2014

1 commit

f2e97688 Avoid randomness on tests Browse File »

Rodrigo Souto
2014-04-02 21:42:36 +0000

30 Mar, 2014

1 commit

54cb54e7 Find available plugins looking in the plugins directory ... Browse File »
```
(ActionItem3070)
```
Joenio Costa
2014-03-30 18:26:28 -0300

20 Mar, 2014

1 commit

6e10728c Merge branch 'stable' ... Browse File »

Conflicts:
	app/views/themes/index.rhtml
	db/schema.rb
	plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb
	test/unit/person_test.rb

2014-03-20 10:58:42 -0300

18 Mar, 2014

1 commit

40da5e3b profile-tests: reload models to get updated counts ... Browse File »
```
(ActionItem3039)
```
Rodrigo Souto
2014-03-18 20:29:08 +0000

07 Mar, 2014

2 commits

423aba17 Merge branch 'master' into rails3 ... Browse File »
```
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

d0561132 Merge branch 'stable' ... Browse File »

Conflicts:
	app/controllers/my_profile/profile_themes_controller.rb
	test/unit/comment_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2014-03-07 13:17:54 +0000

01 Mar, 2014

2 commits

c1fce26e Removed unnecessary assertion on test ... Browse File »
```
(ActionItem2909)
```
Daniela Feitosa
2014-03-01 15:40:24 +0000
a508d544 fix: failing test on first and last day of a month Browse File »

Daniela Feitosa
2014-03-01 15:32:57 +0000

28 Feb, 2014

1 commit

f15193c3 Merge branch 'ActionItem2909-SortUsersAlphabetically' of https://gitlab.com/unb-… ... Browse File »
```
…gama/noosfero into ActionItem2909-SortUsersAlphabetically
```
Daniela Feitosa
2014-02-28 22:09:05 +0000

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

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

03 Feb, 2014

1 commit

a0b2a343 rails3: fix some unit tests Browse File »

Victor Costa
2014-02-03 18:42:00 -0300

20 Jan, 2014

1 commit

70ff8448 rails3: custom methods assert_difference and assert_no_difference removed Browse File »

Victor Costa
2014-01-20 19:30:59 -0300

15 Jan, 2014

6 commits

1e6dcfa7 rails3: replace acts_as_taggable_on_steroids by acts-as-taggable-on Browse File »

Victor Costa
2014-01-15 18:23:09 -0300
5187f433 Merge remote-tracking branch 'participa/AI2919-track_fixes' into track-fixes ... Browse File »
```
Conflicts:
	test/functional/cms_controller_test.rb
	test/unit/profile_test.rb
```
Rodrigo Souto
2014-01-15 16:44:17 -0300
c4832b5f rails3: fix some profile tests Browse File »

Victor Costa
2014-01-15 15:33:38 -0300
89997cec rails3: fix use of Person.or_scope ... Browse File »
```
There must be a better way to merge scopes (grouped with OR) in rails3
```
Victor Costa
2014-01-15 15:33:21 -0300
6a3caadd sort_members: sort community members alphabetically in manage members and view all page ... Browse File »
```
(ActionItem2909)

Signed-off-by: Alex Campelo <campelo.al1@gmail.com>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
SIgned-off-by: Gabriela Navarro <navarro1703@gmail.com>
```
Arthur Del Esposte
2014-01-15 17:46:57 +0000
a997e8fc rails3: fix mass-assignment errors Browse File »

Victor Costa
2014-01-15 10:26:33 -0300

13 Jan, 2014

2 commits

c06aaf3e profile-test: remove unnecessary Article.destroy_all Browse File »

Rodrigo Souto
2014-01-13 22:02:24 +0000
88ba5f6e ProfileTest: compare array correctly Browse File »

Leandro Nunes dos Santos
2014-01-13 21:16:59 +0000

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

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

18 Dec, 2013

2 commits

9238c40c Merge branch 'users-management' Browse File »

Rodrigo Souto
2013-12-18 18:40:51 -0300
84cd2030 Merge remote branch 'mine/stoa-webservice' ... Browse File »
```
Conflicts:
	test/unit/profile_test.rb
```
Rodrigo Souto
2013-12-18 14:54:23 -0300

16 Dec, 2013

1 commit

2e30180c profile-templates: remove environment parameter from profile templates named_scope Browse File »

Rodrigo Souto
2013-12-16 04:22:46 -0300

12 Dec, 2013

1 commit

6cc3ecdd Merge commit 'refs/merge-requests/410' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/410
```
Rodrigo Souto
2013-12-12 18:00:41 -0300

02 Dec, 2013

1 commit

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

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

29 Nov, 2013

1 commit

41eb4171 Bug correction. The article inside a Step, wasn't showing the step / track in the folder combo. Browse File »

Eduardo Tourinho Edington
2013-11-29 09:39:57 -0300

28 Nov, 2013

1 commit

0834d18f improving agenda/events ... Browse File »

Show events by month
Event list now only show 10 events when listing events for month
(events for a day still listing all events)
Add information on indefined place
Enhance layout

(ActionItem2587)

Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Arthur Del Esposte <arthurmde@yahoo.com.br>
Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com>
Signed-off-by: Leandro Alves <leandrosustenido@gmail.com>
Signed-off-by: Tales Martins <tales.martins@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by; Gabriela Navarro <navarro1703@gmail.com>

2013-11-28 01:30:56 -0200

21 Nov, 2013

1 commit

acd66894 environment: destroy child profiles when destroyed ... Browse File »
```
Also includes migration to remove already orphaned profiles.

(ActionItem2906)
```
Rodrigo Souto
2013-11-21 13:57:40 -0300

08 Nov, 2013

1 commit

d09c5df5 Allow admins to set and reset admin role on environment users. ... Browse File »
```
Allow admins to activate and deactivate environment users.
```
Eduardo Tourinho Edington
2013-11-08 16:30:34 -0300

04 Nov, 2013

1 commit

fb79fda0 profile: include public named_scope Browse File »

Rodrigo Souto
2013-11-04 20:37:42 +0000

16 Oct, 2013

1 commit

ea0ab128 Profile#may_display_field_to: rewrite tests ... Browse File »

   * Adding tests for the new location method
   * Moving tests from profile_helper_test to profile_test
   * Rewriting tests of profile_helper_test

2013-10-16 08:07:45 -0300

24 Sep, 2013

1 commit

9e0087a1 rails3: rewrite Rails.root use to fix/avoid problems ... Browse File »

Rails.root is now a Pathname. The best use of it is with the #join
method instead of concatenation and such. I therefore am rewriting all
this calls to fix/avoid problems.

2013-09-24 14:48:29 -0300