Software Publico / Noosfero

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

31 Jul, 2014

1 commit

b75cdb5c Merge branch 'AI3180-profile-tabs-wrong' into 'master' ... Browse Dir »

AI3180: profile tabs wrong

When we create a new tab to put more informations in profile's informations, we cannot indicate if the tab is shown in the beginning or not.

ActionItem3077: http://noosfero.org/Development/ActionItem3180

See merge request !247

2014-07-31 18:18:25 +0000

07 Jul, 2014

1 commit

bad8766a Update every old syntax of form_for and javascript_tag Browse Dir »

Rodrigo Souto
2014-07-07 11:59:05 -0300

30 Jun, 2014

1 commit

a4ea1622 bug fix: Profile tabs wrong ... Browse Dir »
```
fixed the bug

Signed-off-by: José Pedro de Santana Neto <1jpsneto@gmail.com>
```
Jose Pedro
2014-06-30 01:03:07 -0300

05 Jun, 2014

1 commit

ac139797 Merge branch 'AI3158-icons-in-folder' into 'stable' ... Browse Dir »

Display missed icons on folder view

A small rewrite with more coherent names and context-able listing to make that thing to work.

http://noosfero.org/Development/ActionItem3158

2014-06-05 14:31:28 +0000

04 Jun, 2014

1 commit

f9a7c1f7 Makes folder listing context-able ... Browse Dir »
```
Also enables to correctly display icons
Closes ActionItem3158
```
Aurélio A. Heckert
2014-06-04 18:40:04 -0300

19 May, 2014

1 commit

ec227289 wall: correct textarea growing indefinetely ... Browse Dir »
```
ActionItem3136
```
Rodrigo Souto
2014-05-19 16:40:51 -0300

13 May, 2014

3 commits

684589bc Merge branch 'rails3' of gitlab.com:noosfero/noosfero into rails3 Browse Dir »

Rodrigo Souto
2014-05-13 19:58:35 -0300
d4026821 rails3: fix escape of javascript Browse Dir »

Victor Costa
2014-05-13 17:55:35 -0300
a39c63db Replace instance_eval by instance_exec to avoid api break ... Browse Dir »
```
http://makandracards.com/makandra/14725-instance_eval-behaves-different-in-ruby-1-8-and-ruby-1-9-use-instance_exec-instead
```
Rodrigo Souto
2014-05-13 20:38:15 +0000

02 May, 2014

1 commit

59d132f8 Remove disabled enterprise message ... Browse Dir »
```
(ActionItem3129)
```
Braulio Bhavamitra
2014-05-02 16:51:55 -0300

13 Feb, 2014

1 commit

e201637a rails3: rename files from rhtml to html.erb Browse Dir »

Victor Costa
2014-02-13 17:17:52 -0300

11 Feb, 2014

1 commit

e9fea38f Merge branch 'master' into rails3-merge ... Browse Dir »

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

2 commits

aa0f384c Merge branch 'AI2922-wall_tab_by_default' into 'master' ... Browse Dir »
```
Ai2922 Wall Tab By Default

Display the wall tab by default on user's profile
```
Antonio Terceiro
2014-02-04 18:58:30 +0000
c21b9081 Merge branch 'AI2924-add_verb_users_wall' into 'master' ... Browse Dir »
```
AI2924 Add verb for the activities on user's wall

ActionItem: http://noosfero.org/Development/ActionItem2924
```
Antonio Terceiro
2014-02-04 18:54:53 +0000

31 Jan, 2014

2 commits

3a5bb313 rails3: fix profile_controller tests Browse Dir »

Victor Costa
2014-01-31 16:47:52 -0300
be72d6f1 Merge commit 'refs/merge-requests/367' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/367

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

29 Jan, 2014

1 commit

d700982f rails3: output html tags Browse Dir »

Victor Costa
2014-01-29 17:01:34 -0300

28 Jan, 2014

1 commit

6ca74255 rails3: fix json escape for profile views Browse Dir »

Victor Costa
2014-01-28 15:19:23 -0300

27 Jan, 2014

2 commits

4d9c1b3f rails3: fix action_tracker ... Browse Dir »
```
- Change from returning to tap;
- Change from lambda to proc;
- Fix broken links.
```
Victor Costa
2014-01-27 17:40:35 -0300
19261527 rails3: output the results of form_tag Browse Dir »

Victor Costa
2014-01-27 14:24:55 -0300

22 Jan, 2014

1 commit

057e255f rails3: rename *.rhtml to *.html.erb Browse Dir »

Victor Costa
2014-01-22 11:25:50 -0300

10 Jan, 2014

1 commit

3465dd97 rails3: remove deprecated terminology method Browse Dir »

Rodrigo Souto
2014-01-10 10:51:11 -0300

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse Dir »

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

07 Jan, 2014

1 commit

c9eccb09 Merge branch 'stable' ... Browse Dir »
```
Conflicts:
	db/schema.rb
	test/unit/person_test.rb
```
Rodrigo Souto
2014-01-07 14:38:59 +0000

06 Jan, 2014

1 commit

3e8bfd50 application-helper: refactor gravatar logic Browse Dir »

Rodrigo Souto
2014-01-06 19:27:45 +0000

16 Dec, 2013

1 commit

2d3800c3 erge commit 'refs/merge-requests/390' of git://gitorious.org/noosfero/noosfero i… ... Browse Dir »
```
…nto merge-requests/390
```
Rodrigo Souto
2013-12-16 15:02:07 -0300

02 Dec, 2013

1 commit

bd4954d3 Merge branch 'master' into next-origin ... Browse Dir »

Conflicts:
	app/models/category.rb
	app/models/uploaded_file.rb
	test/functional/memberships_controller_test.rb
	test/functional/profile_controller_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb

2013-12-02 20:33:51 -0300

29 Nov, 2013

1 commit

8d4fd4f0 add string *has published* Browse Dir »

Francisco Marcelo A. Lima Júnior
2013-11-29 15:20:13 -0300

28 Nov, 2013

1 commit

0d1e5791 change wall tab to default on users's profile Browse Dir »

Francisco Marcelo A. Lima Júnior
2013-11-28 14:01:14 -0300

26 Nov, 2013

1 commit

80b79e67 Don't force view of location field Browse Dir »

Braulio Bhavamitra
2013-11-26 17:22:53 -0300

24 Nov, 2013

1 commit

e9867fe1 Replaced link_to_remote by link_to ... Browse Dir »
```
the method link_to_remote is deprecated on Rails 3

(ActionItem2899)
```
Daniela Feitosa
2013-11-24 05:22:47 +0000

20 Nov, 2013

1 commit

ca5ebf95 Pagination of comments and replies on profile wall. ... Browse Dir »
```
The comments and replies are fetched only after the View all and More links are clicked.
```
Eduardo Tourinho Edington
2013-11-20 14:27:01 -0300

07 Oct, 2013

1 commit

e7aa3273 Merge commit 'refs/merge-requests/328' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/328

Conflicts:
	app/controllers/public/catalog_controller.rb
```
Rodrigo Souto
2013-10-07 16:28:47 -0300

01 Oct, 2013

1 commit

38427d37 finishing action item 2722 Browse Dir »

Naíla Alves
2013-10-01 20:20:11 -0300

04 Sep, 2013

1 commit

067a2a2d articles, profiles: stop using ajax for some logged-in stuff Browse Dir »

Lucas Melo
2013-09-04 14:28:34 -0300

13 Aug, 2013

1 commit

93577ed9 user-profile: Changes on enterprises item ... Browse Dir »
```
(ActionItem2768)
```
Junior Silva
2013-08-13 20:22:12 +0000

19 Jul, 2013

1 commit

b05904aa Merge branch 'master' into rails3 ... Browse Dir »

Conflicts:
	app/helpers/boxes_helper.rb
	app/models/comment.rb
	app/views/comment/_comment.rhtml
	app/views/comment/_comment_form.rhtml
	app/views/content_viewer/_comment.html.erb
	app/views/content_viewer/_comment.rhtml
	app/views/content_viewer/_comment_form.html.erb
	app/views/content_viewer/_comment_form.rhtml
	app/views/profile/send_mail.html.erb
	config/routes.rb
	debian/control

2013-07-19 15:36:31 -0300

11 Jul, 2013

2 commits

90af49b9 Merge commit 'refs/merge-requests/323' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/323
```
Rodrigo Souto
2013-07-11 17:23:36 -0300
620c0b86 Merge commit 'refs/merge-requests/307' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »
```
…into merge-requests/307
```
Rodrigo Souto
2013-07-11 14:54:41 -0300