16 Jun, 2015
1 commit
-
Conflicts: lib/noosfero/plugin.rb
12 Jun, 2015
1 commit
-
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>
08 Jun, 2015
2 commits
27 Apr, 2015
1 commit
-
Conflicts: test/unit/block_test.rb
22 Apr, 2015
1 commit
-
Mistakenly replaced the correct way of doing modals by the old way. This reverts commit ed63bab09a77c398c9228030a8ace0f11e9a6268.
21 Apr, 2015
2 commits
06 Mar, 2015
1 commit
05 Mar, 2015
1 commit
-
…checked by created_at in role_assignment entity
02 Mar, 2015
1 commit
-
…er is a admin of environment
24 Feb, 2015
1 commit
22 Feb, 2015
2 commits
11 Feb, 2015
1 commit
04 Feb, 2015
1 commit
-
Conflicts: app/controllers/public/search_controller.rb app/models/profile.rb app/views/cms/edit.html.erb public/stylesheets/application.css
03 Feb, 2015
2 commits
-
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>
02 Feb, 2015
2 commits
-
Conflicts: app/views/profile/_person_profile.html.erb
-
Conflicts: app/helpers/application_helper.rb app/views/profile/_person_profile.html.erb
23 Dec, 2014
2 commits
04 Dec, 2014
1 commit
-
Some targets was destroyed but the related acitivity still exists.
20 Nov, 2014
1 commit
-
Conflicts: Gemfile.lock script/development
17 Nov, 2014
1 commit
13 Nov, 2014
2 commits
03 Nov, 2014
1 commit
-
-The text "Leave your comment" did not disappear when clicking on it.
20 Oct, 2014
1 commit
-
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
09 Oct, 2014
1 commit
-
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
01 Sep, 2014
1 commit
18 Aug, 2014
1 commit
-
Conflicts: app/controllers/my_profile/cms_controller.rb db/schema.rb
07 Aug, 2014
1 commit
-
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
06 Aug, 2014
1 commit
31 Jul, 2014
1 commit
-
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
28 Jul, 2014
1 commit
-
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
07 Jul, 2014
1 commit
30 Jun, 2014
1 commit
-
fixed the bug Signed-off-by: José Pedro de Santana Neto <1jpsneto@gmail.com>
05 Jun, 2014
1 commit
-
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
04 Jun, 2014
1 commit
-
Also enables to correctly display icons Closes ActionItem3158