Software Publico / Noosfero

11 Sep, 2014

1 commit

6bc2c9c5 Merge branch 'stable' into stable-merge ... Browse File »

Conflicts:
	AUTHORS
	app/controllers/public/content_viewer_controller.rb
	debian/changelog
	lib/noosfero.rb
	po/de/noosfero.po
	po/eo/noosfero.po
	po/es/noosfero.po
	po/fr/noosfero.po
	po/hy/noosfero.po
	po/it/noosfero.po
	po/noosfero.pot
	po/pt/noosfero.po
	po/ru/noosfero.po

2014-09-11 19:53:28 -0300

13 Aug, 2014

1 commit

72a59859 Merge branch 'AI3223-fix_article_versions' into 'master' ... Browse File »
```
Ai3223 fix article versions

http://noosfero.org/Development/ActionItem3223

See merge request !265
```
Antonio Terceiro
2014-08-13 18:54:45 +0000

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

25 Jul, 2014

1 commit

849d10c7 Remove posts relations eager loading ... Browse File »

It improved the performance on local environment but after testing it on
alpha environment, it displayed a reasonable performance degradation.

2014-07-25 17:21:15 -0300

24 Jul, 2014

1 commit

45d9194b Fix visualization of forum posts Browse File »

Victor Costa
2014-07-24 11:28:55 -0300

23 Jul, 2014

1 commit

f9f7f341 Fix article versioning page ... Browse File »
```
(AI3223)
```
Victor Costa
2014-07-23 16:19:41 -0300

22 Jul, 2014

2 commits

4bbfef7e article: author refactoring ... Browse File »

I'm adding the author as a record relation instead of calculating it
based on the last_changed_by. This change has a reasonable performance
improvement on pages that access this information, like blog page.

Still saving author_name in order to deal with the problem of the author
being removed.

Including new method to facilitate specific article version retrieval.

ActionItem3201

2014-07-22 21:30:33 +0000

2c6eb234 content-viewer-controller: include relations on posts to avoid database multiple repetitive queries ... Browse File »
```
ActionItem3201
```
Rodrigo Souto
2014-07-22 18:10:49 -0300

03 Jul, 2014

1 commit

1b990d18 view-page: avoid multiple render Browse File »

Rodrigo Souto
2014-07-03 20:59:43 +0000

26 Jun, 2014

1 commit

84645da3 Typo fix Browse File »

Rodrigo Souto
2014-06-26 18:47:16 +0000

06 Jun, 2014

1 commit

a482d2bc Refactoring view_page method of content_viewer_controller Browse File »

Arthur Esposte
2014-06-06 21:30:55 +0000

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

2 commits

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

5710cda8 rails3: fix render of private profile Browse File »

Victor Costa
2014-05-06 15:22:39 -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

3 commits

845ae13e minor: removing empty lines and trailing whitespaces Browse File »

Rodrigo Souto
2014-04-02 20:18:43 +0000
a739edce Merge branch 'article-version' of https://gitlab.com/juniorsilva1001/noosfero in… ... Browse File »
```
…to juniorsilva1001/noosfero-article-version

Conflicts:
	app/views/content_viewer/versioned_article.rhtml
	db/schema.rb
	public/stylesheets/application.css
```
Rodrigo Souto
2014-04-02 19:52:23 +0000

48038fc5 Merge branch 'stable' into noosfero_0.47.0 ... Browse File »

Conflicts:
	app/controllers/public/content_viewer_controller.rb
	features/categories_block.feature
	po/eo/noosfero.po
	po/es/noosfero.po
	po/it/noosfero.po
	test/unit/block_test.rb

2014-04-02 19:40:37 +0000

01 Apr, 2014

1 commit

67f6ebd9 content-viewer-controller: user_is_a_bot consider possible empty user_agent Browse File »

Rodrigo Souto
2014-04-01 18:30:30 +0000

29 Mar, 2014

1 commit

f9ab314e comment_order_improvement: Add an option to order comments by the newest or oldest comments. ... Browse File »

(ActionItem2911)

Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>

2014-03-29 22:55:09 +0000

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

25 Feb, 2014

1 commit

a3b75892 rails3: small fixes Browse File »

Victor Costa
2014-02-25 16:10:42 -0300

20 Feb, 2014

2 commits

1221eda4 versions-diff: included js to radio_button control and adjusts on look-and-feel ... Browse File »
```
AI2822
```
Junior Silva
2014-02-20 19:56:28 -0300
0075cead rails3: fix cucumber tests Browse File »

Victor Costa
2014-02-20 17:21:25 -0300

18 Feb, 2014

1 commit

e1da1211 rails3: fix some cucumber tests Browse File »

Victor Costa
2014-02-18 11:21:46 -0300

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

31 Jan, 2014

1 commit

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

Conflicts:
	app/views/content_viewer/view_page.rhtml
```
Rodrigo Souto
2014-01-31 16:37:47 -0300

30 Jan, 2014

1 commit

2253cc66 diff-article-versions: display differences between two article versions ... Browse File »
```
AI2822
```
Junior Silva
2014-01-30 17:59:39 -0300

24 Jan, 2014

1 commit

0597ba64 Merge remote-tracking branch 'danifeitosa/AI2822-fixes' into article-version ... Browse File »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
	db/schema.rb
```
Junior Silva
2014-01-24 18:14:16 -0300

21 Jan, 2014

1 commit

79890fca article-version: versioned_article: using diff to show differences between versions of article ... Browse File »
```
AI2822
```
Junior Silva
2014-01-21 16:12:57 -0300

20 Jan, 2014

1 commit

8c6bca29 rails3: fix params from routes with wildcards ... Browse File »
```
Routes with wildcards returns string (do not need to transform from array to string anymore).
```
Victor Costa
2014-01-20 12:57:33 -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

4 commits

8e720312 Replacing rev by version Browse File »

Daniela Feitosa
2014-01-18 21:11:45 +0000
658ecf81 Trying to make it prettier :) Browse File »

Daniela Feitosa
2014-01-18 16:32:20 +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