Thiago Ribeiro / Noosfero

17 Jun, 2014

1 commit

23636102 fixing mass-assignment error in units tests ... Browse File »
```
(ActionItem3124)
```
Joenio Costa
2014-06-17 00:09:15 -0300

16 Jun, 2014

1 commit

5065dff0 Merge branch 'master' into AI3124-article_version Browse File »

Joenio Costa
2014-06-16 22:49:32 -0300

15 Jun, 2014

1 commit

9fc96fa9 load article's author only when necessary ... Browse File »
```
(ActionItem3097)
```
Leandro Santos
2014-06-15 14:35:04 +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

29 Apr, 2014

1 commit

296cbdb4 Limit creation of article versions ... Browse File »
```
(ActionItem3124)
```
Victor Costa
2014-04-29 12:57:34 -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

19 Mar, 2014

1 commit

8bef50d2 search-optimizations: fix broken tests Browse File »

Rodrigo Souto
2014-03-19 17:15:36 +0000

21 Feb, 2014

1 commit

289ca9e2 rails3: fix html display for short format on articles Browse File »

Victor Costa
2014-02-21 15:05:05 -0300

13 Feb, 2014

1 commit

ef0730cc rails3: fix unit tests Browse File »

Victor Costa
2014-02-13 17:14:51 -0300

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

22 Jan, 2014

1 commit

e15c8cea rails3: fix tests in article_test related to profile assignment Browse File »

Victor Costa
2014-01-22 10:50:28 -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

19 Jan, 2014

1 commit

25f34b4d article_versions: list of versions on a new page ... Browse File »
```
- Added pagination to versions
- Treating access denied and not found

(ActionItem2822)
```
Daniela Feitosa
2014-01-19 21:44:03 +0000

18 Jan, 2014

3 commits

8e720312 Replacing rev by version Browse File »

Daniela Feitosa
2014-01-18 21:11:45 +0000
d7da0420 Added methods to return data from specific version ... Browse File »
```
(ActionItem2822)
```
Daniela Feitosa
2014-01-18 16:32:20 +0000
bf80644c Add new template to display versioned article ... Browse File »
```
Also included revision number on cache key

Signed-off-by: Daniela Feitosa

(ActionItem2822)
```
Ana Losnak
2014-01-18 16:32:19 +0000

15 Jan, 2014

3 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
a997e8fc rails3: fix mass-assignment errors Browse File »

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

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

16 Dec, 2013

1 commit

4b0c7f1f Merge branch 'next' into AI2888-context_block ... Browse File »
```
Conflicts:
	test/unit/article_test.rb
```
Victor Costa
2013-12-16 17:47:15 -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

21 Nov, 2013

1 commit

a67cc855 Adding Community Track Plugin Browse File »

Leandro Nunes dos Santos
2013-11-21 17:43:37 +0000

19 Nov, 2013

1 commit

46f13390 rails3: fix article tests ... Browse File »
```
PS: still breaking some tests due to action_tracker problem and html
generation on models problem.
```
Rodrigo Souto
2013-11-19 14:29:00 -0300

06 Nov, 2013

1 commit

745bd505 Named scope to filter article by array of types Browse File »

Victor Costa
2013-11-06 17:09:04 -0300

07 Oct, 2013

2 commits

4251dcbc Merge branch 'stable' ... Browse File »
```
Conflicts:
	app/views/cms/view.rhtml
	test/functional/profile_controller_test.rb
```
Rodrigo Souto
2013-10-07 14:13:32 -0300
49c169dc tests: avoid randomness on article test Browse File »

Rodrigo Souto
2013-10-07 11:35:10 -0300

19 Sep, 2013

1 commit

fc5eba87 Merge commit 'bedad5b ' Browse File »

Rodrigo Souto
2013-09-19 15:25:53 -0300

05 Sep, 2013

1 commit

6d2a0edf rails3: refactor deprecated invalid? of ActiveRecord::Errors from all tests Browse File »

Rodrigo Souto
2013-09-05 23:57:39 +0000

13 Aug, 2013

2 commits

2fc52fa3 [postgres-tests] Avoiding database retrieve order assumptions from article tests Browse File »

Rodrigo Souto
2013-08-13 16:43:02 -0300
b376dedb [postgres-tests] Removing duplicated test from article Browse File »

Rodrigo Souto
2013-08-13 16:43:02 -0300

03 Aug, 2013

1 commit

0c8eff93 rails3: remove useless named scope in Article ... Browse File »

It seems it was created to avoid including too many objects when
retrieving that named_scope, but using :joins instead of :includes
already does this.

2013-08-03 12:02:21 -0300

27 Jun, 2013

1 commit

8f42e790 merging with stable Browse File »

Leandro Nunes dos Santos
2013-06-27 10:05:35 -0300

07 May, 2013

1 commit

b2a0c431 Merge branch 'master' into pluginize-solr ... Browse File »
```
Conflicts:
	app/models/article.rb
	app/views/layouts/application-ng.rhtml
	lib/noosfero/plugin.rb
	script/noosfero-plugins
```
Rodrigo Souto
2013-05-07 13:36:10 -0300