Software Público Brasileiro

22 Oct, 2014

2 commits

• 0f384987   Merge branch 'fix_content_viewer_private_uploaded_file' into stable Browse Code »
  Victor Costa

  2014-10-22 13:59:21 -0300  
• c46b3355   Fix access denied view for uploaded files in private profiles Browse Code »
  Victor Costa

  2014-10-22 13:58:22 -0300  

21 Oct, 2014

8 commits

• e17b6cba   Merge branch 'AI3220_proposals' into stable Browse Code »
  Victor Costa

  2014-10-21 09:41:58 -0300  
• dc7c3bad   proposals_discussion: fix topic title css Browse Code »
  Victor Costa

  2014-10-21 09:41:26 -0300  
• 2199b6b8   Merge branch 'AI3220_proposals' into stable Browse Code »
  Victor Costa

  2014-10-21 09:36:43 -0300  
• 1d652f60   proposals_discussion: small fixes Browse Code »
  Victor Costa

  2014-10-21 09:36:18 -0300  
• 29b94603   Merge branch 'fix_agenda' into stable Browse Code »
  Victor Costa

  2014-10-21 08:43:13 -0300  
• 25520705   Merge branch 'oauth_rails3' into stable Browse Code »
  Victor Costa

  2014-10-21 08:38:49 -0300  
• 1c67d96d   oauth_client: setup multitenancy in omniauth setup phase Browse Code »
  Victor Costa

  2014-10-21 08:35:18 -0300  
• 6a6171ef   Merge branch 'fix_report_abuse' into stable Browse Code »
  Victor Costa

  2014-10-21 08:19:13 -0300  

20 Oct, 2014

7 commits

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

  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  
• 2cbd78d6   Fix report abuse Browse Code »
  Victor Costa

  2014-10-20 16:45:09 -0300  
• f8dfd5bc   Merge branch 'hotfixes' into stable Browse Code »
  Victor Costa

  2014-10-20 13:51:31 -0300  
• 4ebcbe31   Added a way to set a proxy for https requests in feed handler Browse Code »

  3
  Victor Costa

  2014-10-20 13:51:09 -0300  
• 099c7927   Merge branch 'oauth_rails3' into stable Browse Code »
  Victor Costa

  2014-10-20 12:03:41 -0300  
• 0ce73152   oauth_client: skip login_required filter in oauth controller Browse Code »
  Victor Costa

  2014-10-20 12:02:08 -0300  
• a7948d54   Merge branch 'oauth_rails3' into stable Browse Code »
  Victor Costa

  2014-10-20 11:05:37 -0300  

17 Oct, 2014

5 commits

• e8f6202d   oauth_client: fix oauth login flow Browse Code »
  Victor Costa

  2014-10-17 13:51:05 -0300  
• 35f0b393   Merge branch 'I4-Video-Gallery-Plugin' into stable ... Browse Code »

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

  Victor Costa

  2014-10-17 13:02:09 -0300  
• d1cd13c2   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Victor Costa

  2014-10-17 12:56:20 -0300  
• 9febba7f   comment_paragraph: change js method name to avoid conflict with comment_group plugin Browse Code »
  Victor Costa

  2014-10-17 12:56:13 -0300  
• 45deacbe   Merge branch 'AI3205-comment-paragraph' into stable ... Browse Code »

  Conflicts:
  	app/models/comment.rb

  Victor Costa

  2014-10-17 11:08:43 -0300  

16 Oct, 2014

6 commits

• f46898b5   Merge branch 'oauth_rails3' into stable Browse Code »
  Victor Costa

  2014-10-16 14:56:16 -0300  
• 8b18bd6f   oauth_client: small css fixes Browse Code »
  Victor Costa

  2014-10-16 14:55:16 -0300  
• 8f037442   Merge branch 'oauth_rails3' into stable Browse Code »
  Victor Costa

  2014-10-16 11:11:09 -0300  
• 074d20a9   oauth_client: identifier attribute is no longer used Browse Code »
  Victor Costa

  2014-10-16 11:07:07 -0300  
• 82b600ea   oauth_client: display icons for login with oauth providers Browse Code »
  Victor Costa

  2014-10-16 11:00:39 -0300  
• 4adb9e74   Fix agenda links for days that has events Browse Code »
  Victor Costa

  2014-10-16 09:48:54 -0300  

15 Oct, 2014

5 commits

• 32dfc0b8   comment_paragraph: add filter for marking paragraphs by default Browse Code »
  Francisco Júnior

  2014-10-15 16:47:20 -0300  
• 53d4dc1c   oauth_provider: customize views Browse Code »
  Victor Costa

  2014-10-15 16:35:49 -0300  
• 756b3931   oauth_provider: add default dookeeper views Browse Code »
  Victor Costa

  2014-10-15 15:06:29 -0300  
• 58188d54   oauth_client: added more tests Browse Code »
  Victor Costa

  2014-10-15 14:56:20 -0300  
• 64b4bd83   oauth_client: fix client Browse Code »
  Victor Costa

  2014-10-15 14:04:02 -0300  

14 Oct, 2014

4 commits

• d60663d3   oauth_client: fix tests Browse Code »
  Victor Costa

  2014-10-14 16:17:19 -0300  
• 7b92b4e3   oauth_provider: use noosfero layout in doorkeeper views Browse Code »
  Victor Costa

  2014-10-14 15:51:04 -0300  
• 99fa04df   Don't cache error responses (status >= 400) Browse Code »
  Antonio Terceiro

  2014-10-14 12:06:39 -0300  
• 3c206e7b   Rewrite HTTP caching tests as integration tests ... Browse Code »

  Total runtime drops from ~21s to ~7s

  Antonio Terceiro

  2014-10-14 11:00:35 -0300  

13 Oct, 2014

3 commits

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

  2014-10-13 19:09:27 -0300  
• 23837332   oauth_client: refactoring to allow login with multiple noosfero providers Browse Code »
  Victor Costa

  2014-10-13 15:43:26 -0300  
• bbc4e168   Merge branch 'tinymce4' into 'master' ... Browse Code »

  Remove etherpad code from tinymce
  
  See merge request !339

  Antonio Terceiro

  2014-10-13 18:15:51 +0000