Charles Oliveira / noosfero

30 Oct, 2014

2 commits

a0ef4f25 Merge branch 'fix_lazy_queries' into stable ... Browse File »
```
Conflicts:
	app/controllers/public/content_viewer_controller.rb
```
Victor Costa
2014-10-30 15:31:52 -0300
b4435ba8 Added includes in models to prevent n+1 queries ... Browse File »
```
N+1 queries found with the help of bullet gem
```
Victor Costa
2014-10-30 15:24:16 -0300

21 Oct, 2014

1 commit

6a6171ef Merge branch 'fix_report_abuse' into stable Browse File »

Victor Costa
2014-10-21 08:19:13 -0300

20 Oct, 2014

1 commit

2cbd78d6 Fix report abuse Browse File »

Victor Costa
2014-10-20 16:45:09 -0300

01 Sep, 2014

1 commit

1cc40a0b hotfix to manage translation Browse File »

Leandro Santos
2014-09-01 15:55:55 -0300

19 Aug, 2014

2 commits

29490ac8 Merge branch 'AI3220_proposals' into rails3_stable Browse File »

Victor Costa
2014-08-19 14:19:02 -0300
f25f4e24 Merge branch 'master' into AI3220_proposals Browse File »

Victor Costa
2014-08-19 14:08:38 -0300

15 Aug, 2014

1 commit

cec25930 Merge branch 'rails3' into rails3_stable ... Browse File »
```
Conflicts:
	db/schema.rb
	public/javascripts/application.js
```
Victor Costa
2014-08-15 12:10:31 -0300

11 Aug, 2014

1 commit

7ba54a9d Fix merge problems ... Browse File »

At least as far as unit tests are concerned. Still missing:

  - 1 failing test in ArticleTest
  - 1 failing test in PersonTest

2014-08-11 16:34:21 -0300

08 Aug, 2014

2 commits

08c7da41 Merge branch 'AI3269_link-article' into rails3_stable Browse File »

Victor Costa
2014-08-08 10:44:20 -0300
1dfcb26d Added a option to create a link when approve an article Browse File »

Victor Costa
2014-08-08 10:30:28 -0300

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

06 Aug, 2014

1 commit

78e7bdcc proposals_discussion: fix ambiguous problem on article Browse File »

Victor Costa
2014-08-06 13:55:48 -0300

23 Jul, 2014

3 commits

65b9e90a Avoid crash on article allow_edit if there is no user Browse File »

Rodrigo Souto
2014-07-23 21:34:32 +0000
10e3a093 Merge branch 'rails3' into rails3_stable Browse File »

Victor Costa
2014-07-23 16:46:56 -0300
5ff64d4f Added image_builder to attr_accessible on article Browse File »

Victor Costa
2014-07-23 16:36:32 -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

457c9f59 blog-page: use article comments_count instead of querying the database for it ... Browse File »
```
Was necessary to create a spam_comments_count in order to get the
correct count without considering spams.

ActionItem3201
```
Rodrigo Souto
2014-07-22 18:11:00 -0300

09 Jul, 2014

1 commit

e87635a1 Merge branch 'rails3' into rails3_stable Browse File »

Victor Costa
2014-07-09 16:08:02 -0300

03 Jul, 2014

1 commit

dd1dc498 article: add external_link to mass-assignment Browse File »

Rodrigo Souto
2014-07-03 22:08:45 +0000

17 Jun, 2014

1 commit

e77ff7f1 Merge branch 'rails3' into rails3_stable Browse File »

Victor Costa
2014-06-17 10:41:19 -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

2 commits

550663e9 Added migration to include created_by on articles ... Browse File »
```
the migration also fills in the attribute for all the existent articles
updated db/schema

(ActionItem3097)
```
Daniela Feitosa
2014-06-15 14:48:25 +0000
9fc96fa9 load article's author only when necessary ... Browse File »
```
(ActionItem3097)
```
Leandro Santos
2014-06-15 14:35:04 +0000

04 Jun, 2014

1 commit

f309c8f7 topic-forum: allow the author to edit and delete your own topic ... Browse File »
```
AI3135
```
Junior Silva
2014-06-04 18:05:21 +0000

03 Jun, 2014

2 commits

a8ef617f Merge branch 'rails3_community_dashboard' into rails3_stable Browse File »

Victor Costa
2014-06-03 16:34:54 -0300
b428f589 Fix article view_page Browse File »

Victor Costa
2014-06-03 16:34:18 -0300

02 Jun, 2014

1 commit

c6e843e5 Merge branch 'rails3_community_dashboard' into rails3_stable Browse File »

Victor Costa
2014-06-02 16:59:39 -0300

20 May, 2014

1 commit

7b8dee32 Merge branch 'AI3074-community_dashboard' into rails3_community_dashboard Browse File »

Francisco Marcelo de Araújo Lima Júnior
2014-05-20 16:07:39 -0300

16 May, 2014

1 commit

043bbbd1 Merge branch 'noosfero_grape_api' into rails3_api ... Browse File »
```
Conflicts:
	app/models/article.rb
	app/models/user.rb
	config.ru
```
Victor Costa
2014-05-16 13:34:16 -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