Charles Oliveira / noosfero

16 Jun, 2015

1 commit

364e52a3 Merge branch 'master' into production ... Browse Dir »
```
Conflicts:
	lib/noosfero/plugin.rb
```
Victor Costa
2015-06-16 18:16:44 -0300

12 Jun, 2015

1 commit

dbea8847 Refactor deprecated code for date to use rails method ... Browse Dir »

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

2015-06-12 13:33:36 -0300

08 Jun, 2015

2 commits

3ce0f54e Merge branch 'master' into production Browse Dir »

Victor Costa
2015-06-08 10:46:33 -0300
85cd639c Fix rss icon Browse Dir »

Victor Costa
2015-06-08 10:46:15 -0300

27 Apr, 2015

1 commit

ea03b2d7 Merge branch 'api' into stable ... Browse Dir »
```
Conflicts:
	test/unit/block_test.rb
```
Victor Costa
2015-04-27 19:54:43 -0300

22 Apr, 2015

1 commit

cb9f5142 Revert "report-abuse: replace modal windwow by colorbox" ... Browse Dir »
```
Mistakenly replaced the correct way of doing modals by the old way.

This reverts commit ed63bab09a77c398c9228030a8ace0f11e9a6268.
```
Rodrigo Souto
2015-04-22 16:42:16 -0300

21 Apr, 2015

2 commits

07ed3e2f report-abuse: fix html parameter by converting it to json Browse Dir »

Rodrigo Souto
2015-04-21 17:25:06 -0300
ed63bab0 report-abuse: replace modal windwow by colorbox Browse Dir »

Rodrigo Souto
2015-04-21 17:25:01 -0300

06 Mar, 2015

1 commit

be05a862 Merge branch 'I227-add_members_community' into stable Browse Dir »

Michel Felipe
2015-03-06 07:25:40 -0300

05 Mar, 2015

1 commit

c91330e1 Move new member highligth feature to another branch in another momment. Will be … ... Browse Dir »
```
…checked by created_at in role_assignment entity
```
Michel Felipe
2015-03-05 19:34:59 -0300

02 Mar, 2015

1 commit

7ba0db11 Modify invite friend to community feature for add member imediatly, if logged us… ... Browse Dir »
```
…er is a admin of environment
```
Michel Felipe
2015-03-02 16:56:49 -0300

24 Feb, 2015

1 commit

0531c6a2 merging with master Browse Dir »

Leandro Santos
2015-02-24 11:37:25 -0300

22 Feb, 2015

2 commits

eed38cd8 Move to modal api Browse Dir »

Braulio Bhavamitra
2015-02-22 20:13:00 -0300
48e8a1da modals: Replace lightbox with colorbox Browse Dir »

Braulio Bhavamitra
2015-02-22 20:11:50 -0300

11 Feb, 2015

1 commit

592a3c64 Replace prototype calls/callbacks to jquery/jrails Browse Dir »

Braulio Bhavamitra
2015-02-11 09:21:21 -0300

04 Feb, 2015

1 commit

60262a33 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/controllers/public/search_controller.rb
	app/models/profile.rb
	app/views/cms/edit.html.erb
	public/stylesheets/application.css

2015-02-04 13:02:40 -0300

03 Feb, 2015

2 commits

ede53a92 invitation: review texts and icons Browse Dir »

Rodrigo Souto
2015-02-03 11:37:45 -0300

23f8a40a invite: allow network member/friend invitation ... Browse Dir »

This feature allows organizations to invite people and users to request
friendship from other users from the network instead of only through
email.

Signed-off-by: Rodrigo Souto <rodrigo@colivre.coop.br>
Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Pedro de Lyra  <pedrodelyra@gmail.com>

2015-02-03 10:08:37 -0300

02 Feb, 2015

2 commits

26edc24e Merge branch 'rails3-custom_fields' into stable ... Browse Dir »
```
Conflicts:
	app/views/profile/_person_profile.html.erb
```
Victor Costa
2015-02-02 11:17:20 -0300
bdca1607 Merge branch 'master' into rails3-custom_fields ... Browse Dir »
```
Conflicts:
	app/helpers/application_helper.rb
	app/views/profile/_person_profile.html.erb
```
Victor Costa
2015-02-02 11:02:30 -0300

23 Dec, 2014

2 commits

66c88f16 Merge branch 'fix_profile_wall' into stable Browse Dir »

Victor Costa
2014-12-23 16:46:21 -0300
f2365de4 Update profile activities when leave scraps Browse Dir »

Victor Costa
2014-12-23 15:47:05 -0300

04 Dec, 2014

1 commit

889fe05a Do not crash when an activity has no target anymore ... Browse Dir »
```
Some targets was destroyed but the related acitivity still exists.
```
Victor Costa
2014-12-04 14:04:44 -0300

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

17 Nov, 2014

1 commit

fd9e479a Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-11-17 14:45:15 -0300

13 Nov, 2014

2 commits

f2439d1b Fix syntax error Browse Dir »

Antonio Terceiro
2014-11-13 12:10:12 -0200
d333a169 Merge branch 'master' into stable Browse Dir »

Victor Costa
2014-11-13 11:06:33 -0300

03 Nov, 2014

1 commit

2d020ab7 Fix javascript behavior on comments ... Browse Dir »
```
-The text "Leave your comment" did not disappear when clicking on it.
```
Parley
2014-11-03 17:25:41 -0200

20 Oct, 2014

1 commit

896b46c3 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/views/profile/_person_profile.html.erb
	app/views/shared/tiny_mce.html.erb
	public/javascripts/application.js
	public/javascripts/tinymce/js/tinymce/license.txt
	public/javascripts/tinymce/js/tinymce/plugins/compat3x/css/dialog.css
	public/javascripts/tinymce/js/tinymce/plugins/compat3x/utils/editable_selects.js
	public/javascripts/tinymce/jscripts/tiny_mce/langs/en.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/js/media.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/media.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/css/props.css
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/js/props.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/style/props.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/cell.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/row.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/js/table.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/row.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/table/table.htm
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css
	public/javascripts/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm
	public/javascripts/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif
	public/javascripts/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js
	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce.js
	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce_popup.js
	public/javascripts/tinymce/jscripts/tiny_mce/tiny_mce_src.js
	public/stylesheets/application.css

2014-10-20 17:07:21 -0300

09 Oct, 2014

1 commit

9be859d4 profile: refactor profile fields display process ... Browse Dir »

Also displays every field that is not defined in any category in the
last category called "General". Fields are now easily moved between
categories and categories a easily created.

Fields html generation centered in only one method and the field name
and value are customizable through methods.

Fix #14

2014-10-09 13:39:41 -0300

01 Sep, 2014

1 commit

a24518ab fixes Browse Dir »

Francisco Marcelo de Araújo Lima Júnior
2014-09-01 19:24:49 -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

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

d8fd6277 checkpoint Browse Dir »

Rodrigo Souto
2014-08-06 20:19:38 +0000

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

28 Jul, 2014

1 commit

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

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