Thiago Ribeiro / Noosfero

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

01 Apr, 2014

1 commit

0ef66132 content-viewer-controller-test: adapt tests to new file_presenter infras Browse File »

Rodrigo Souto
2014-04-01 18:35:04 +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

26 Mar, 2014

1 commit

84503cc0 view-page: do not count hits on bot access ... Browse File »
```
(ActionItem3063)
```
Rodrigo Souto
2014-03-26 19:00:38 +0000

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

c19a7b46 content-viewer: remove obsolete test Browse File »

Rodrigo Souto
2014-03-19 22:05:19 +0000

18 Mar, 2014

1 commit

a91ba23d Removed unused method ... Browse File »
```
Also included tests for meta tags and removed not-needed tests

(ActionItem2610)
```
Daniela Feitosa
2014-03-18 18:40:07 +0000

13 Feb, 2014

1 commit

dd172119 rails3: fix controller tests Browse File »

Victor Costa
2014-02-13 18:33:55 -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

04 Feb, 2014

1 commit

981b0c92 rails3: fix cms_controller tests Browse File »

Victor Costa
2014-02-04 16:53:21 -0300

28 Jan, 2014

1 commit

caf8c081 Merge branch 'AI2786-like' of https://gitlab.com/participa/noosfero into partici… ... Browse File »
```
…pa/noosfero-AI2786-like
```
Rodrigo Souto
2014-01-28 14:44:47 +0000

27 Jan, 2014

1 commit

159de064 rails3: fix assert_template that references rhtml Browse File »

Victor Costa
2014-01-27 15:49:36 -0300

23 Jan, 2014

1 commit

f9e55386 rails3: change from lambda to proc Browse File »

Victor Costa
2014-01-23 17:48:12 -0300

22 Jan, 2014

1 commit

6abd4658 rails3: fix mass-assignment errors on functional tests Browse File »

Victor Costa
2014-01-22 16:40:47 -0300

19 Jan, 2014

2 commits

35d7a6af Checking if perrmission to view article before version Browse File »

Daniela Feitosa
2014-01-19 23:53:43 -0300
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

2 commits

8e720312 Replacing rev by version Browse File »

Daniela Feitosa
2014-01-18 21:11:45 +0000

4ab1ad9c Add links to articles versions. ... Browse File »

(ActionItem2822)

Signed-off-by: Daniela Feitosa
Signed-off-by: Ana Losnak <analosnak@gmail.com>
Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>

2014-01-18 16:32:19 +0000

03 Jan, 2014

1 commit

08480dd5 New hotspot to add extra content at article header Browse File »

Victor Costa
2014-01-03 14:25:15 -0300

16 Dec, 2013

1 commit

9c082693 Merge commit 'refs/merge-requests/425' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/425
```
Rodrigo Souto
2013-12-16 16:57:22 -0300

03 Dec, 2013

1 commit

4f861626 uploaded-file: don't display private images thumbnails and private images on slideshow ... Browse File »
```
AI2824
```
Junior Silva
2013-12-03 11:01:10 -0300

02 Dec, 2013

1 commit

f21d2a48 content_viewer tests: fix text view page expectations Browse File »

Rodrigo Souto
2013-12-02 15:37:04 -0300

27 Nov, 2013

1 commit

96ad392a Merge branch 'stable' ... Browse File »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/manage_products.feature
```
Rodrigo Souto
2013-11-27 14:13:20 -0300

22 Nov, 2013

2 commits

4befe13d content_viewer_test: explicitly test content_disposition type of uploaded_file Browse File »

Rodrigo Souto
2013-11-22 16:46:14 -0300
6475a4d3 Force a browser to save file as after clicking a uploaded file link ... Browse File »
```
(ActionItem2829)
```
Braulio Bhavamitra
2013-11-22 16:46:13 -0300

19 Sep, 2013

1 commit

0d6a8190 Merge commit 'refs/merge-requests/316' of git://gitorious.org/noosfero/noosfero … ... Browse File »
```
…into merge-requests/316

Conflicts:
	app/helpers/blog_helper.rb
```
Rodrigo Souto
2013-09-19 17:40:33 -0300

25 Jul, 2013

1 commit

60c6ac65 Fix for escaped HTML in blog posts listing Browse File »

Antonio Terceiro
2013-07-25 18:55:43 -0300

23 Jul, 2013

1 commit

99e9e72f Fixing broken tests on content_viewer Browse File »

Rodrigo Souto
2013-07-23 16:27:32 -0300

16 Jul, 2013

1 commit

5004be38 Merge commit 'refs/merge-requests/343' of git://gitorious.org/noosfero/noosfero … ... Browse File »

…into merge-requests/343

Also replacing the load_comments method by a filter that receives a
scope.

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	app/models/comment.rb
	app/views/content_viewer/view_page.rhtml
	test/functional/content_viewer_controller_test.rb
	test/unit/comment_test.rb

2013-07-16 16:36:56 -0300