Omar Junior / Noosfero

20 Nov, 2014

1 commit

94eaff08 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	Gemfile.lock
	script/development
```
Larissa Reis
2014-11-20 01:24:55 -0300

10 Nov, 2014

1 commit

366eba58 Fix mail sending at send_notification method Browse Dir »

Victor Costa
2014-11-10 10:58:36 -0300

31 Oct, 2014

2 commits

08581a0c SearchController: avoid invalid dates ... Browse Dir »

You cannot use Date.today.day together with arbitrary year/month
combinations, because will crash on 2014-10-31 and you are viewing the
page for 2014-11 (2014-11-31 is not a valid date).

2014-10-31 17:26:13 -0200

1aa32327 Fix broken functional tests Browse Dir »

Antonio Terceiro
2014-10-31 14:29:11 -0200

27 Oct, 2014

1 commit

fb147d67 Merge branch 'fix_content_viewer_private_uploaded_file' into 'master' ... Browse Dir »
```
Fix access denied view for uploaded files in private profiles

See merge request !347
```
Antonio Terceiro
2014-10-27 20:58:50 +0000

22 Oct, 2014

1 commit

c46b3355 Fix access denied view for uploaded files in private profiles Browse Dir »

Victor Costa
2014-10-22 13:58:22 -0300

20 Oct, 2014

1 commit

2cbd78d6 Fix report abuse Browse Dir »

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

14 Oct, 2014

1 commit

99fa04df Don't cache error responses (status >= 400) Browse Dir »

Antonio Terceiro
2014-10-14 12:06:39 -0300

18 Sep, 2014

1 commit

9cc4340d Merge branch 'master' into stoa Browse Dir »

Daniela Feitosa
2014-09-18 08:19:26 -0300

15 Sep, 2014

1 commit

8ee125a8 signup_image_upload: Add image on user signup ... Browse Dir »

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2014-09-15 15:56:21 -0300

12 Sep, 2014

1 commit

d3ade277 ChatController: fix assumption about default avatar Browse Dir »

Antonio Terceiro
2014-09-12 10:41:09 -0300

11 Sep, 2014

1 commit

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

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

08 Sep, 2014

1 commit

79e1ad7b Merge branch 'master' into stoa ... Browse Dir »

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/my_profile/memberships_controller.rb
	app/controllers/public/account_controller.rb
	app/helpers/application_helper.rb
	app/helpers/layout_helper.rb
	app/helpers/token_helper.rb
	app/views/account/signup.html.erb
	app/views/layouts/_javascript.html.erb
	db/schema.rb
	test/functional/application_controller_test.rb

2014-09-08 12:36:01 -0300

20 Aug, 2014

9 commits

8af1ea81 AI3036 Fixed bugs on User Moderation ... Browse Dir »

Solved code duplication that creates the Task for moderation.
Fixed the signup page to show the correct messages in case of any combination of the features "Admin Must Approve New Users" and "Skip Email Activation"

Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2014-08-20 21:44:29 -0300

fa585a8c User Moderation new support ... Browse Dir »

Added support for using User Moderation and Skip user email activation features together

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2014-08-20 21:44:29 -0300

c034e703 Fixed selenium tests and signup join in community check. ... Browse Dir »
```
(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
```
Hebert Santos
2014-08-20 21:44:29 -0300
bdeb37d3 Fixed redirecting after signup. ... Browse Dir »
```
(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
```
André Guedes
2014-08-20 21:44:28 -0300
65f294e1 Changed when user is created on moderation and removed unused user data ... Browse Dir »
```
from task.

(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
```
André Guedes
2014-08-20 21:44:28 -0300

ccfe5f79 Fixing person identifier not saving and validation of user attributes. ... Browse Dir »

(AI3036)

Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
Signed-off-by: Renan Costa <renan2727@hotmail.com>
Signed-off-by: Rodrigo Medeiros <rodrigo.mss01@gmail.com>
Signed-off-by: Iolane Andrade <andrade.icaa@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

2014-08-20 21:44:28 -0300

24c79664 Refactoring "perform" method on CreateUser task and "signup" method on AccountController ... Browse Dir »
```
Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
```
tallys
2014-08-20 21:44:28 -0300
d9a22bdf user_registration: Add CreateUser type on task.rb ... Browse Dir »
```
Signed-off-by: Álvaro Fernando<alvarofernandoms@gmail.com>
```
Gabriela Navarro
2014-08-20 21:44:28 -0300
52ab5d7f user_registration: Creates task for the admin to process and cucumber test. ... Browse Dir »
```
(ActionItem3036)

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Wilton Rodrigues <braynwilton@gmail.com>
```
Gabriela Navarro
2014-08-20 21:39:41 -0300

18 Aug, 2014

1 commit

b7823262 Merge branch 'master' into stoa ... Browse Dir »
```
Conflicts:
	app/controllers/my_profile/cms_controller.rb
	db/schema.rb
```
Rodrigo Souto
2014-08-18 12:31:32 -0300

13 Aug, 2014

1 commit

72a59859 Merge branch 'AI3223-fix_article_versions' into 'master' ... Browse Dir »
```
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 Dir »

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

e7df3c52 Update find_by_contents call on invite_controller Browse Dir »

Rodrigo Souto
2014-08-06 20:13:02 +0000

31 Jul, 2014

4 commits

587415cd Reorder search and navigation links to a common ordering ... Browse Dir »
```
Ideally we want to merge both of them somehow...
```
Rodrigo Souto
2014-07-31 20:12:57 +0000
0c0fadaa Fix comment pagination in profile wall Browse Dir »

Victor Costa
2014-07-31 14:36:40 -0300
3b35e215 [search-term-improvements] Simple query normalization using downcase Browse Dir »

Rodrigo Souto
2014-07-31 17:18:02 +0000
9d7ae0e2 Fix communities listing when sub_organizations plugin is enabled ... Browse Dir »
```
Some count queries breaks when there is a join with other entity.
```
Victor Costa
2014-07-31 10:02:58 -0300

28 Jul, 2014

2 commits

eec520b6 Merge branch 'invite-user' into stoa-merge ... Browse Dir »
```
Conflicts:
	app/controllers/application_controller.rb
```
Rodrigo Souto
2014-07-28 10:57:25 -0300

0409f85d Merge branch 'invite-user-to-community' of https://gitlab.com/larissa/noosfero into invite-user ... Browse Dir »

Conflicts:
	app/views/friends/index.rhtml
	app/views/invite/_select_address_book.rhtml
	app/views/invite/select_friends.rhtml
	app/views/profile/friends.rhtml
	config/routes.rb
	plugins/stoa/lib/ext/person.rb
	test/functional/invite_controller_test.rb
	test/unit/invite_member_test.rb

2014-07-28 10:53:39 -0300

25 Jul, 2014

2 commits

024d804a Adds a label string to SEARCHABLE_FIELDS ... Browse Dir »
```
  To make presentation easier, adds a label to SEARCHABLE_FIELDS as part
  of a hash.
```
Larissa Reis
2014-07-25 19:33:13 -0300

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

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 Dir »

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

23 Jul, 2014

1 commit

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

22 Jul, 2014

4 commits

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

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 Dir »
```
ActionItem3201
```
Rodrigo Souto
2014-07-22 18:10:49 -0300
a441e326 Merge branch 'search-improvements' into stoa ... Browse Dir »
```
Conflicts:
	app/models/profile.rb
```
Rodrigo Souto
2014-07-22 16:02:30 +0000
8af46e72 Merge branch 'master' into search-improvements ... Browse Dir »
```
Conflicts:
	public/stylesheets/application.css
```
Rodrigo Souto
2014-07-22 11:24:21 -0300