Download as
Browse Code »

Commit e83ed4e9d024ec8cf7feae5b6bcfc3290177dfc3

Authored by Victor Costa
2 parents cfd2f58b 590cd157
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'master' into stable

Showing 2 changed files with 3 additions and 4 deletions   Show diff stats
plugins/container_block/public/container_block.js
  Diff comments   View file @e83ed4e
1 1 function enableMoveContainerChildren(container, box) {
2 2 var div = jQuery('#box-'+box+' > .block-outer > .block');
3 3 if(!div.is('.ui-resizable')) {
  4 + div.removeClass('ui-draggable');
4 5 div.resizable({
5 6 handles: 'e, w',
6 7 containment: '#block-'+container+' .block-inner-2',
... ... @@ -14,6 +15,7 @@ function enableMoveContainerChildren(container, box) {
14 15 function disableMoveContainerChildren(container, box) {
15 16 var div = jQuery('#box-'+box+' > .block-outer > .block');
16 17 if(div.is('.ui-resizable')) {
  18 + div.addClass('ui-draggable');
17 19 div.resizable('destroy');
18 20 }
19 21 }
... ...
plugins/remote_user/lib/remote_user_plugin.rb
  Diff comments   View file @e83ed4e
... ... @@ -16,10 +16,7 @@ class RemoteUserPlugin < Noosfero::Plugin
16 16 user_data = request.env['HTTP_REMOTE_USER_DATA']
17 17  
18 18 if remote_user.blank?
19   - if logged_in?
20   - self.current_user.forget_me
21   - reset_session
22   - end
  19 + self.current_user = nil
23 20 else
24 21 if user_data.blank?
25 22 remote_user_email = remote_user + '@remote.user'
... ...