Software Público Brasileiro

16 Dec, 2014

4 commits

• c11afdc5   Merge branch 'disable_assets_search_categories' into stable Browse Dir »
  Victor Costa

  2014-12-16 17:16:51 -0300  
• 3f8af204   Consider disabled assets at category search Browse Dir »

  1
  Victor Costa

  2014-12-16 17:16:32 -0300  
• 2aace982   Merge branch 'AI3279-block_store' into stable ... Browse Dir »

  Conflicts:
  	app/controllers/box_organizer_controller.rb
  	app/controllers/my_profile/profile_design_controller.rb
  	app/helpers/layout_helper.rb

  Victor Costa

  2014-12-16 13:21:30 -0300  
• dfad044a   Merge branch 'master' into AI3279-block_store ... Browse Dir »

  Conflicts:
  	Gemfile
  	Gemfile.lock
  	app/controllers/admin/environment_design_controller.rb
  	app/helpers/layout_helper.rb
  	app/models/block.rb
  	script/quick-start

  Victor Costa

  2014-12-16 10:19:11 -0300  

11 Dec, 2014

1 commit

• 04ae2fd2   Merge branch 'master' into stable Browse Dir »
  Victor Costa

  2014-12-11 16:25:22 -0300  

08 Dec, 2014

5 commits

• ea021e7f   curriculum_lattes_plugin: fixed functionals tests Browse Dir »
  Daniela Feitosa

  2014-12-08 20:10:02 -0300  
• 1ea73489   curriculum_lattes_plugin: Refactoring to use load_plugin_filters hotspot Browse Dir »
  Arthur Esposte

  2014-12-08 20:10:02 -0300  
• fd23e874   curriculum_lattes_plugin: Refactorign plugin structure ... Browse Dir »

  - Indent files properly
  - Fix signup page changing lambda to proc
  - Create the needed plugin's hotspots
  - Fix academic_info attributes update
  - Fix hotspot to work in edit page

  Arthur Esposte

  2014-12-08 20:10:02 -0300  
• 3e4f46a0   Merge branch 'fix_members_listing' into 'master' ... Browse Dir »

  Fix members listing
  
  There is a problem in environments when listing profile members:
  
  No Method Error 'map' for #<Arel::Nodes::SqlLiteral>
  
  This problem is related to a 'count' being executed in a query with 'includes'.
  
  See merge request !392

  Antonio Terceiro

  2014-12-08 18:40:57 +0000  
• b811e582   ChatController: handle gravatar URL's without protocol Browse Dir »
  Antonio Terceiro

  2014-12-08 13:43:46 -0200  

03 Dec, 2014

5 commits

• cc5d8647   Fix get_signup_start_time Browse Dir »
  Victor Costa

  2014-12-03 16:04:53 -0300  
• b019de86   Fix listing of profile members with included relations Browse Dir »
  Victor Costa

  2014-12-03 08:42:33 -0300  
• 595c4145   Revert "Fix problem when listing profiles with included relations" ... Browse Dir »

  This reverts commit 64cf718401e6fcab9572e72d7534fb0b2b224006.

  Victor Costa

  2014-12-03 08:12:32 -0300  
• 64cf7184   Fix problem when listing profiles with included relations Browse Dir »

  1
  Victor Costa

  2014-12-03 08:06:49 -0300  
• f4c6569d   Fix search autocomplete from profile design Browse Dir »
  Victor Costa

  2014-12-03 07:34:22 -0300  

01 Dec, 2014

2 commits

• 2e10394e   Show logged in user in rails log Browse Dir »
  Victor Costa

  2014-12-01 16:40:38 -0300  
• b8b25f86   Fix get_signup_start_time Browse Dir »
  Victor Costa

  2014-12-01 15:45:54 -0300  

10 Nov, 2014

2 commits

• 2e3c97a0   Merge branch 'fix_notification_mail' into stable Browse Dir »
  Victor Costa

  2014-11-10 10:07:22 -0300  
• 05765444   Fix mail sending at send_notification method Browse Dir »
  Victor Costa

  2014-11-10 09:52:39 -0300  

03 Nov, 2014

1 commit

• 67d07fd9   Merge branch 'master' into stable Browse Dir »
  Victor Costa

  2014-11-03 11:17:56 -0300  

31 Oct, 2014

5 commits

• 55b340af   Force html format for home index page Browse Dir »
  Victor Costa

  2014-10-31 18:29:14 -0300  
• 08581a0c   SearchController: avoid invalid dates ... Browse Dir »

  You cannot use Date.today.day together with arbitrary year/month
  combinations, because will crash on 2014-10-31 and you are viewing the
  page for 2014-11 (2014-11-31 is not a valid date).

  Antonio Terceiro

  2014-10-31 17:26:13 -0200  
• 1aa32327   Fix broken functional tests Browse Dir »
  Antonio Terceiro

  2014-10-31 14:29:11 -0200  
• 8f571c03   Merge branch 'AI3074-community_dashboard' into stable Browse Dir »
  Victor Costa

  2014-10-31 10:30:44 -0300  
• 1ac61676   Merge branch 'master' into AI3074-community_dashboard Browse Dir »
  Victor Costa

  2014-10-31 10:26:57 -0300  

30 Oct, 2014

4 commits

• 853cc8ef   Merge branch 'fix_lazy_queries' into stable ... Browse Dir »

  1

  Conflicts:
  	app/models/comment.rb

  Victor Costa

  2014-10-30 16:07:27 -0300  
• 00b9fc3d   Added includes in models to prevent n+1 queries ... Browse Dir »

  N+1 queries found with the help of bullet gem

  Victor Costa

  2014-10-30 16:03:59 -0300  
• a0ef4f25   Merge branch 'fix_lazy_queries' into stable ... Browse Dir »

  2

  Conflicts:
  	app/controllers/public/content_viewer_controller.rb

  Victor Costa

  2014-10-30 15:31:52 -0300  
• b4435ba8   Added includes in models to prevent n+1 queries ... Browse Dir »

  N+1 queries found with the help of bullet gem

  Victor Costa

  2014-10-30 15:24:16 -0300  

22 Oct, 2014

2 commits

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

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

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

21 Oct, 2014

1 commit

• 6a6171ef   Merge branch 'fix_report_abuse' into stable Browse Dir »
  Victor Costa

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

20 Oct, 2014

2 commits

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

  2014-10-20 16:45:09 -0300  

14 Oct, 2014

1 commit

• 99fa04df   Don't cache error responses (status >= 400) Browse Dir »
  Antonio Terceiro

  2014-10-14 12:06:39 -0300  

25 Sep, 2014

2 commits

• b76a4336   Merge branch 'rails3_community_dashboard' into rails3_stable ... Browse Dir »

  Conflicts:
  	app/controllers/public/content_viewer_controller.rb

  Victor Costa

  2014-09-25 11:43:30 -0300  
• e37bc72b   community_dashboard: fix view_page Browse Dir »
  Victor Costa

  2014-09-25 11:41:22 -0300  

24 Sep, 2014

1 commit

• 0cd81fcc   Fix article rendering for UploadedFile Browse Dir »
  Victor Costa

  2014-09-24 12:54:38 -0300  

22 Sep, 2014

1 commit

• 9804917f   Merge branch 'master' into rails3_stable ... Browse Dir »

  Conflicts:
  	Gemfile
  	Gemfile.lock
  	lib/tasks/gettext.rake
  	test/unit/dates_helper_test.rb

  Victor Costa

  2014-09-22 16:38:12 -0300  

15 Sep, 2014

1 commit

• 8ee125a8   signup_image_upload: Add image on user signup ... Browse Dir »

  Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Fabio Teixeira

  2014-09-15 15:56:21 -0300