Software Público Brasileiro

28 Oct, 2014

1 commit

• cde58fc4   Merge branch 'master' into stable Browse File »
  Victor Costa

  2014-10-28 09:34:50 -0300  

23 Oct, 2014

1 commit

• f2eb9480   Merge branch 'master' into stable Browse File »
  Victor Costa

  2014-10-23 11:27:12 -0300  

22 Oct, 2014

4 commits

• 3600569d   Added translation markup on profile fields Browse File »
  Daniela Feitosa

  2014-10-22 23:05:15 -0300  
• 0f01bf09   Added article tags list on profiles Browse File »
  Daniela Feitosa

  2014-10-22 18:42:24 -0300  
• 9dcfa5de   Removed debug lines Browse File »
  Daniela Feitosa

  2014-10-22 19:21:35 +0000  
• e7e132e7   Fix: profile_controller tests Browse File »
  Daniela Feitosa

  2014-10-22 19:11:34 +0000  

20 Oct, 2014

1 commit

• 896b46c3   Merge branch 'master' into stable ... Browse File »

  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

  Victor Costa

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

13 Oct, 2014

1 commit

• d54e2a0d   Remove debug statements left behind Browse File »
  Antonio Terceiro

  2014-10-13 19:09:27 -0300  

09 Oct, 2014

4 commits

• 401a2773   profile-helper: avoid method name conflict Browse File »
  Rodrigo Souto

  2014-10-09 16:04:51 -0300  
• b78517b8   profile-helper: avoid method name conflict Browse File »
  Rodrigo Souto

  2014-10-09 16:02:32 -0300  
• c2e18c90   profile: refactor profile fields display process ... Browse File »

  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

  Rodrigo Souto

  2014-10-09 13:53:07 -0300  
• 9be859d4   profile: refactor profile fields display process ... Browse File »

  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

  Rodrigo Souto

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

03 Sep, 2014

1 commit

• e01734c7   fixes Browse File »
  Francisco Marcelo de Araújo Lima Júnior

  2014-09-03 14:38:16 -0300  

02 Sep, 2014

1 commit

• adc5c4e7   fixes Browse File »
  Francisco Marcelo de Araújo Lima Júnior

  2014-09-02 19:35:21 -0300  

01 Sep, 2014

1 commit

• a24518ab   fixes Browse File »
  Francisco Marcelo de Araújo Lima Júnior

  2014-09-01 19:24:49 -0300  

28 Jan, 2014

2 commits

• d53d8b69   profile-helper: refactor display_contact and add html-safe to string concatenation ... Browse File »

  Also removing trailing whitespaces

  Rodrigo Souto

  2014-01-28 18:48:43 +0000  
• eb5062af   profile_editor: add extra optional fields for person ... Browse File »

  Signed-off-by: Ana Losnak <analosnak@gmail.com>
  Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
  
  ActionItem1011

  Ana Losnak

  2014-01-28 18:42:02 +0000  

16 Oct, 2013

1 commit

• ea0ab128   Profile#may_display_field_to: rewrite tests ... Browse File »

     * Adding tests for the new location method
     * Moving tests from profile_helper_test to profile_test
     * Rewriting tests of profile_helper_test

  Rodrigo Souto

  2013-10-16 08:07:45 -0300  

03 Oct, 2013

1 commit

• d9394c87   Display location only if address' fields are public Browse File »
  Braulio Bhavamitra

  2013-10-03 17:08:17 -0300  

04 Nov, 2012

3 commits

• 339df62d   Enhancements on privacy settings ... Browse File »

  Added tests
  Added background on edition of profile to be easier to know which field
  the checkbox is related
  
  (ActionItem1717)

  Daniela Feitosa

  2012-11-04 17:11:49 -0200  
• 0c29ae21   Hide contact if no information available Browse File »
  Caio Almeida

  2012-11-04 14:24:54 -0200  
• 27eb1487   Done Browse File »
  Caio Almeida

  2012-11-04 14:24:53 -0200  

24 Jan, 2012

1 commit

• 9d8ebf69   Signup interface improvements ... Browse File »

  (ActionItem2070)

  Caio Almeida

  2012-01-24 14:21:44 -0200  

16 Jan, 2012

2 commits

• 0d62704c   Revert "Signup interface improvements" ... Browse File »

  This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.

  Caio Almeida

  2012-01-16 14:15:18 -0300  
• 5ee0d0ee   Signup interface improvements Browse File »

  2
  Caio Almeida

  2012-01-16 14:14:45 -0300  

04 Jan, 2011

1 commit

• f8137b7a   Plugins ... Browse File »

  Done:
    * Plugin loading process
    * Infra-structure for plugins registering and event activations.
    * Three fixed routes for plugins.
    * Methods to define plugins meta-information.
    * Interface for activation and deactivation of plugins in the
      environment panel.
    * Hotspots:
      - Buttons in the control panel.
      - Tabs in the profile (including expanded_template method).
      - New attributes for profile.
    * Possibility for the plugin to add new tables.
    * Mezuro prototype.
  
  Missing:
    * Test integration.
    * Dependencies integration.
    * Possibility to add behaviours in noosfero base models.

  Rodrigo Souto

  2011-01-04 16:27:41 -0300  

14 Aug, 2010

1 commit

• 347fbb41   Generate translatable pagination links ... Browse File »

  Also removed the duplication of pagination links methods
  
  (ActionItem1588)

  Antonio Terceiro

  2010-08-14 23:19:08 -0300  

18 Jun, 2009

1 commit

• 2630255d   ActionItem1122: don't display disabled fields in profile Browse File »
  Antonio Terceiro

  2009-06-18 13:09:52 -0300  

25 May, 2009

1 commit

• a03dc433   ActionItem990: Added pagination and cache to friends Browse File »
  Daniela Feitosa

  2009-05-25 16:16:17 -0300  

21 May, 2009

1 commit

• ae069d09   ActionItem1044: better profile page Browse File »
  Antonio Terceiro

  2009-05-21 19:35:53 -0300  

04 Jul, 2008

1 commit

• a5313c2a   ActionItem518: add article to enterprise homepage (and removing unnused ... Browse File »

  code)
  
  git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2155 3f533792-8f58-4932-b0fe-aaf55b0a4547

  JoenioCosta

  2008-07-04 18:38:37 +0000  

16 May, 2008

1 commit

• ec0761a4   ActionItem380: moving all fields from PersonInfo and OrganizationInfo to profile… ... Browse File »

  … using settings_items
  
  git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1802 3f533792-8f58-4932-b0fe-aaf55b0a4547

  JoenioCosta

  2008-05-16 14:23:25 +0000  

29 Apr, 2008

2 commits

• a03718fe   ActionItem280: fixing test and helper ... Browse File »

  
  git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1748 3f533792-8f58-4932-b0fe-aaf55b0a4547

  AntonioTerceiro

  2008-04-29 20:44:01 +0000  
• 4d68bf95   ActionItem318: a better control panel ... Browse File »

  git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1733 3f533792-8f58-4932-b0fe-aaf55b0a4547

  AurelioAHeckert

  2008-04-29 03:27:19 +0000  

12 Sep, 2007

1 commit

• e0f4d9ee   ActionItem7: redesigning relation between profile and info ... Browse File »

  git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@455 3f533792-8f58-4932-b0fe-aaf55b0a4547

  AntonioTerceiro

  2007-09-12 02:13:47 +0000  

07 Sep, 2007

1 commit

• 15262820   ActionItem8: displaying profile ... Browse File »

  
  
  git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@420 3f533792-8f58-4932-b0fe-aaf55b0a4547

  AntonioTerceiro

  2007-09-07 17:41:36 +0000