Merge branch 'master' of github.com:diaspora/diaspora

.gitignore

@@ -18,3 +18,4 @@ config/app_config.yml
 bin/*
 nbproject
 config/initializers/secret_token.rb
+public/source.tar

Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.0.0'
-gem 'bundler', '1.0.0'
+gem 'bundler', '>= 1.0.0'
 
 #Security
 gem 'devise', :git => 'http://github.com/BadMinus/devise.git'

config/deploy_config.yml

@@ -12,51 +12,11 @@ servers:
   tom:
     - url: 'tom.joindiaspora.com'
   backer:
-    - username: 'washington'
-      given_name: 'George'
-      family_name: 'Washington'
-      number: 0
-      pin: 5072
-    - username: 'adams'
-      given_name: 'John'
-      family_name: 'Adams'
-      number: 1
-      pin: 3742
-    - username: 'jefferson'
-      given_name: 'Thomas'
-      family_name: 'Jefferson'
-      number: 2
-      pin: 7782
-    - username: 'madison'
-      given_name: 'James'
-      family_name: 'Madison'
-      number: 3
-      pin: 2691
-    - username: 'monroe'
-      given_name: 'James'
-      family_name: 'Monroe'
-      number: 4
-      pin: 6133
-    - username: 'quincyadams'
-      given_name: 'John Quincy'
-      family_name: 'Adams'
-      number: 5
-      pin: 7558
     - username: 'jackson'
       given_name: 'Andrew'
       family_name: 'Jackson'
       number: 6
       pin: 8670
-    - username: 'buren'
-      given_name: 'Martin'
-      family_name: 'Van Buren'
-      number: 7
-      pin: 1559
-    - username: 'harrison'
-      given_name: 'William Henry'
-      family_name: 'Harrison'
-      number: 8
-      pin: 5404
     - username: 'tyler'
       given_name: 'John'
       family_name: 'Tyler'

public/stylesheets/application.css

@@ -353,8 +353,14 @@ input[type='text'], textarea {
   padding: 0.3em;
   display: block;
   width: 66%;
-  border-top: 1px solid #666666;
-  height: auto; }
+  border: 1px solid #cccccc;
+  height: auto;
+  border-radius: 5px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  box-shadow: 0 1px 2px white;
+  -moz-box-shadow: 0 1px 2px white;
+  -webkit-box-shadow: 0 1px 2px white; }
 
 #submit_block {
   text-align: right;
@@ -392,10 +398,7 @@ label {
     width: 600px;
     height: 42px;
     margin-top: 0;
-    margin-bottom: 0;
-    box-shadow: 0 1px 2px white;
-    -moz-box-shadow: 0 1px 2px white;
-    -webkit-box-shadow: 0 1px 2px white; }
+    margin-bottom: 0; }
   #publisher .button {
     margin-left: 100px; }
   #publisher img {

public/stylesheets/sass/application.sass

@@ -474,9 +474,17 @@ input[type='text'], textarea
   :padding 0.3em
   :display block
   :width 66%
-  :border-top 1px solid #666
+  :border 1px solid #ccc
   :height auto
 
+  :border-radius 5px
+  :-webkit-border-radius 5px
+  :-moz-border-radius 5px
+
+  :box-shadow 0 1px 2px #fff
+  :-moz-box-shadow 0 1px 2px #fff
+  :-webkit-box-shadow 0 1px 2px #fff
+
 #submit_block
   :text
     :align right
@@ -526,10 +534,6 @@ label
       :top 0
       :bottom 0
 
-    :box-shadow 0 1px 2px #fff
-    :-moz-box-shadow 0 1px 2px #fff
-    :-webkit-box-shadow 0 1px 2px #fff
-
   .button
     :margin-left 100px
 

script/server

@@ -7,6 +7,9 @@ then
     echo "Mongod not started"
 else
     mkdir -p -v log/thin/
+		#force AGPL
+		tar cf ../_source.tar -X .gitignore *
+		mv ../_source.tar public/source.tar
     bundle exec ruby ./script/websocket_server.rb&
     bundle exec thin start $@
 fi