Software Público Brasileiro

28 Aug, 2015

1 commit

• 1ed260f3   Merge branch 'master' into staging Browse Dir »
  Leandro Santos

  2015-08-28 18:11:21 -0300  

26 Aug, 2015

1 commit

• c9cbe34e   remove prev_icons.yml due to conflict with asset-pipeline Browse Dir »

  1
  Rodrigo Souto

  2015-08-26 18:56:19 -0300  

13 Aug, 2015

1 commit

• eb070c85   fixing conflit with master Browse Dir »
  Leandro Santos

  2015-08-13 17:44:13 -0300  

10 Aug, 2015

3 commits

• 5d003955   Use standard method for RSS-feed icon ... Browse Dir »

  Move icon to the icon theme structure (awesome also have an icon for
  this)

  dtygel

  2015-08-10 19:27:46 -0300  
• b9225f6a   Merge branch 'download-icon' into noosfero Browse Dir »
  Braulio Bhavamitra

  2015-08-10 17:46:09 -0300  
• ac306a5b   Add download icon Browse Dir »
  dtygel

  2015-08-10 16:56:59 -0300  

09 Aug, 2015

1 commit

• bb71f7db   Add 'love' icon Browse Dir »
  dtygel

  2015-08-09 20:40:41 -0300  

31 Jul, 2015

2 commits

• df32d845   awesome: Remove asset pipeline generated files Browse Dir »
  Braulio Bhavamitra

  2015-07-31 20:07:13 -0300  
• c892b950   responsive: support glyphicons Browse Dir »
  Braulio Bhavamitra

  2015-07-31 20:06:46 -0300  

16 Jun, 2015

1 commit

• 364e52a3   Merge branch 'master' into production ... Browse Dir »

  1

  Conflicts:
  	lib/noosfero/plugin.rb

  Victor Costa

  2015-06-16 18:16:44 -0300  

11 Jun, 2015

1 commit

• bbcc0618   Improvments on folder visualization ... Browse Dir »

  - Refactoring CSS to better display folder itens
  - Creating method to display uploaded file names with extension in upper
    case
  
  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

  André Guedes

  2015-06-11 16:43:09 -0300  

21 May, 2015

1 commit

• f8a595c3   Merge branch 'master' into production ... Browse Dir »

  Conflicts:
  	app/views/content_viewer/_article_toolbar.html.erb

  Victor Costa

  2015-05-21 14:28:17 -0300  

19 May, 2015

1 commit

• e152b3a2   Enables fullscreen view for article view and edit Browse Dir »
  Evandro Junior

  2015-05-19 17:51:26 -0300  

24 Feb, 2015

1 commit

• 0531c6a2   merging with master Browse Dir »
  Leandro Santos

  2015-02-24 11:37:25 -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

  Victor Costa

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

03 Feb, 2015

1 commit

• 71439c6c   Merge branch 'master' into stoa ... Browse Dir »

  Conflicts:
  	app/controllers/my_profile/profile_editor_controller.rb
  	app/helpers/search_helper.rb
  	app/models/invitation.rb
  	app/models/person.rb
  	app/views/cms/view.html.erb
  	app/views/templates/index.html.erb
  	plugins/community_track/views/content_viewer/_step_item.html.erb
  	test/functional/home_controller_test.rb
  	test/unit/person_test.rb
  	test/unit/profile_test.rb

  Rodrigo Souto

  2015-02-03 18:06:21 -0300  

22 Jan, 2015

1 commit

• 16dce14c   Add awesome icon set Browse Dir »
  Braulio Bhavamitra

  2015-01-22 11:25:25 -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  

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

  Victor Costa

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

10 Oct, 2014

1 commit

• 30560212   Support running Noosfero as a /subdirectory ... Browse Dir »

  - Remove absolute URL's from stylesheets and javascripts
  - Handle prefix in LinkListBlock
  - add Noosfero.root method as a central data source
  
  The application server needs to be started with the
  RAILS_RELATIVE_URL_ROOT environment variable set to the desired prefix.
  
  In development, this can be tested with
  
    # assuming /social prefix
    $ RAILS_RELATIVE_URL_ROOT=/social thin --prefix /social start
  
  For production, see INSTALL.md

  Antonio Terceiro

  2014-10-10 11:43:43 -0300  

29 Jul, 2014

1 commit

• e643284a   [media-panel-improvements] Show/Hide media panel Browse Dir »
  Rodrigo Souto

  2014-07-29 18:03:01 -0300  

22 Jul, 2014

1 commit

• 44b54952   [template-welcome-page] Refactor templates page Browse Dir »
  Rodrigo Souto

  2014-07-22 11:18:45 -0300  

30 Jun, 2014

1 commit

• a910deb8   Added full screen mode for view and edit. Browse Dir »
  Evandro Jr

  2014-06-30 11:56:59 -0300  

12 May, 2014

1 commit

• af190be9   Merge branch 'rails235' ... Browse Dir »

  Conflicts:
  	features/categories_block.feature
  	public/stylesheets/application.css

  Daniela Feitosa

  2014-05-12 15:58:32 +0000  

02 Apr, 2014

2 commits

• 845ae13e   minor: removing empty lines and trailing whitespaces Browse Dir »
  Rodrigo Souto

  2014-04-02 20:18:43 +0000  
• a739edce   Merge branch 'article-version' of https://gitlab.com/juniorsilva1001/noosfero in… ... Browse Dir »

  …to juniorsilva1001/noosfero-article-version
  
  Conflicts:
  	app/views/content_viewer/versioned_article.rhtml
  	db/schema.rb
  	public/stylesheets/application.css

  Rodrigo Souto

  2014-04-02 19:52:23 +0000  

28 Mar, 2014

1 commit

• 4825fe87   article-version: improvements in article versions navegability. Added buttons ... Browse Dir »

  and warnings.
  AI2822

  Junior Silva

  2014-03-28 18:39:43 -0300  

07 Mar, 2014

2 commits

• 019bbf17   add infra to embed track block Browse Dir »
  Francisco Marcelo de Araújo Lima Júnior

  2014-03-07 16:24:40 -0300  
• 705a8ec6   add infra to embed feature Browse Dir »
  Francisco Marcelo de Araújo Lima Júnior

  2014-03-07 16:22:33 -0300  

23 Jan, 2014

2 commits

• b9d5a64e   Remove trailing whitespaces and fix identation Browse Dir »
  Rodrigo Souto

  2014-01-23 20:03:00 -0300  
• 6d7a0824   Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes ... Browse Dir »

  Conflicts:
  	public/stylesheets/application.css

  Rodrigo Souto

  2014-01-23 19:15:27 -0300  

21 Jan, 2014

1 commit

• e80da508   Merge commit 'refs/merge-requests/339' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/339
  
  Conflicts:
  	app/models/block.rb
  	public/designs/icons/tango/style.css
  	test/unit/block_test.rb

  Rodrigo Souto

  2014-01-21 16:45:31 -0300  

18 Jan, 2014

1 commit

• 658ecf81   Trying to make it prettier :) Browse Dir »
  Daniela Feitosa

  2014-01-18 16:32:20 +0000  

12 Dec, 2013

1 commit

• 6cc3ecdd   Merge commit 'refs/merge-requests/410' of git://gitorious.org/noosfero/noosfero … ... Browse Dir »

  …into merge-requests/410

  Rodrigo Souto

  2013-12-12 18:00:41 -0300  

20 Nov, 2013

1 commit

• 83fd2007   Change the Content Management form to allow the reset of the profile's homepage. Browse Dir »
  Leandro Nunes dos Santos

  2013-11-20 17:13:40 -0300  

19 Nov, 2013

1 commit

• 9dfe5a7c   Merge branches 'ActionItem2882' and 'ActionItem2882_merge' into ActionItem2882_merge Browse Dir »
  Leandro Nunes dos Santos

  2013-11-19 10:08:16 -0300  

08 Nov, 2013

1 commit

• d09c5df5   Allow admins to set and reset admin role on environment users. ... Browse Dir »

  Allow admins to activate and deactivate environment users.

  Eduardo Tourinho Edington

  2013-11-08 16:30:34 -0300  

04 Jul, 2013

1 commit

• dd55c842   Clone blocks Browse Dir »
  Rodrigo Souto + Ana Losnak + Daniel Bucher + Caio Almeida + Leandro Nunes + Daniela Feitosa + Mariel Zasso

  2013-07-04 22:14:54 +0000  

09 May, 2013

1 commit

• 12e28e82   Remove IE6 suport and CSS loading from Tango theme Browse Dir »
  Aurélio A. Heckert

  2013-05-09 16:46:06 -0300  

08 May, 2013

1 commit

• 825c88ca   Create FilePresenter infra ... Browse Dir »

  The idea is never to give a Upload File to a view. That must
  always work with a File Presenter providing overwrite methods
  and specific views/partials.
  
  ActionItem2373

  Aurélio A. Heckert

  2013-05-08 01:13:11 -0300