28 Oct, 2014

1 commit


23 Oct, 2014

1 commit


22 Oct, 2014

4 commits


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
    Victor Costa
     

13 Oct, 2014

1 commit


09 Oct, 2014

4 commits


03 Sep, 2014

1 commit


02 Sep, 2014

1 commit


01 Sep, 2014

1 commit


28 Jan, 2014

2 commits


16 Oct, 2013

1 commit


03 Oct, 2013

1 commit


04 Nov, 2012

3 commits


24 Jan, 2012

1 commit


16 Jan, 2012

2 commits


04 Jan, 2011

1 commit

  • 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
     

14 Aug, 2010

1 commit


18 Jun, 2009

1 commit


25 May, 2009

1 commit


21 May, 2009

1 commit


04 Jul, 2008

1 commit


16 May, 2008

1 commit


29 Apr, 2008

2 commits


12 Sep, 2007

1 commit


07 Sep, 2007

1 commit