social_stream-base 0.9.7 → 0.9.8

Sign up to get free protection for your applications and to get access to all the features.
@@ -11,11 +11,11 @@ class InvitationsController < ApplicationController
11
11
  receivers.each do |receiver|
12
12
  InvitationMailer.send_invitation(receiver, current_subject, params[:message]).deliver
13
13
  end
14
- redirect_to new_invitation_path, :flash => { :success => t('invitation.success')}
14
+ render :action => :new, :locals => {:flash => { :success => t('invitation.success')}}
15
15
  return
16
16
  end
17
17
  end
18
- redirect_to new_invitation_path, :flash => { :error => t('invitation.error')}
18
+ render :action => :new, :locals => {:flash => { :error => t('invitation.error')}}
19
19
 
20
20
  end
21
21
 
@@ -194,7 +194,7 @@ en:
194
194
  one: "Inbox"
195
195
  invitation:
196
196
  e-mails: "E-mail addresses"
197
- error: "Your request was unprocessable"
197
+ error: "Your request was unprocessable. Make sure you wrote correct e-mail addresses."
198
198
  invited: " has invited you to Social Stream!"
199
199
  join: "Invite other people to join Social Stream!"
200
200
  join_me: "Join me at Social Stream!"
data/config/routes.rb CHANGED
@@ -1,6 +1,13 @@
1
1
  Rails.application.routes.draw do
2
2
  #Background tasks
3
- mount Resque::Server, :at => "/resque"
3
+ resque_constraint = lambda do |request|
4
+ #request.env['warden'].authenticate? and request.env['warden'].user.admin?
5
+ true
6
+ end
7
+
8
+ constraints resque_constraint do
9
+ mount Resque::Server, :at => "/resque"
10
+ end
4
11
 
5
12
  root :to => "frontpage#index"
6
13
 
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Base
3
- VERSION = "0.9.7".freeze
3
+ VERSION = "0.9.8".freeze
4
4
  end
5
5
  end
@@ -1,3 +1,4 @@
1
+ # encoding: UTF-8
1
2
  require File.join(File.dirname(__FILE__), 'lib', 'social_stream', 'base', 'version')
2
3
 
3
4
  Gem::Specification.new do |s|
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream-base
3
3
  version: !ruby/object:Gem::Version
4
- hash: 53
4
+ hash: 43
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 9
9
- - 7
10
- version: 0.9.7
9
+ - 8
10
+ version: 0.9.8
11
11
  platform: ruby
12
12
  authors:
13
13
  - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-09-23 00:00:00 +02:00
19
+ date: 2011-09-27 00:00:00 +02:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency