nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use improved whitespace:scrub_gratuitous_newlines

Browse source
This commit is contained in:
Dorian 2010-09-26 11:48:19 +02:00 committed by Stephen Caudill
parent 4223769df0
commit e792344c0e
77 changed files with 0 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Capfile
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
load 'deploy' if respond_to?(:namespace) # cap2 differentiator load 'deploy' if respond_to?(:namespace) # cap2 differentiator
Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) } Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }

1
Gemfile
View file

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

2
README.md
View file

@ -32,8 +32,6 @@ We are continuing to build features and improve the code base.
When we think it is ready for general use, we will post more final When we think it is ready for general use, we will post more final
instructions. instructions.
## Resources ## Resources
We are maintaining a We are maintaining a

2
Rakefile
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Add your own tasks in files placed in lib/tasks ending in .rake, # Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.

1
app/views/albums/_new_album.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%h1=t('.add_a_new_album') %h1=t('.add_a_new_album')
= form_for Album.new do |f| = form_for Album.new do |f|

1
app/views/albums/edit.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
.back= link_to "⇧ #{@album.name}", @album .back= link_to "⇧ #{@album.name}", @album
%h1.big_text %h1.big_text

1
app/views/albums/index.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :head do - content_for :head do
:javascript :javascript
$(document).ready(function(){ $(document).ready(function(){

3
app/views/albums/show.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
:javascript :javascript
$(document).ready(function(){ $(document).ready(function(){
$(".image_thumb img").load( function() { $(".image_thumb img").load( function() {
@ -25,8 +24,6 @@
= @album.name = @album.name
="#{t('.updated')} #{how_long_ago(@album)}" ="#{t('.updated')} #{how_long_ago(@album)}"
.album_id{:id => @album.id, :style => "display:hidden;"} .album_id{:id => @album.id, :style => "display:hidden;"}
-unless current_user.owns? @album -unless current_user.owns? @album

1
app/views/aspects/_new_aspect.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%h1=t('.add_a_new_aspect') %h1=t('.add_a_new_aspect')
= form_for Aspect.new do |f| = form_for Aspect.new do |f|
= f.error_messages = f.error_messages

2
app/views/aspects/index.html.haml
View file

@ -2,11 +2,9 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :page_title do - content_for :page_title do
= link_to t('.photos'), albums_path(:aspect => @aspect) = link_to t('.photos'), albums_path(:aspect => @aspect)
- content_for :left_pane do - content_for :left_pane do
= render "shared/aspect_friends" = render "shared/aspect_friends"

3
app/views/aspects/manage.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :head do - content_for :head do
= javascript_include_tag 'jquery-ui-1.8.4.custom.min.js' = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
= javascript_include_tag 'aspect-edit.js' = javascript_include_tag 'aspect-edit.js'
@ -29,8 +28,6 @@
- content_for :publish do - content_for :publish do
= link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect')) = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
%ul#aspect_list %ul#aspect_list
- for aspect in @aspects - for aspect in @aspects
%li.aspect %li.aspect

1
app/views/aspects/show.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :page_title do - content_for :page_title do
= link_to t('.photos'), albums_path(:aspect => @aspect) = link_to t('.photos'), albums_path(:aspect => @aspect)

1
app/views/comments/_comment.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%li.comment{:id => post.id} %li.comment{:id => post.id}
= person_image_tag(post.person) = person_image_tag(post.person)
%span.from %span.from

1
app/views/comments/_comments.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%div.comments %div.comments
%ul.comment_set{:id => post.id} %ul.comment_set{:id => post.id}
- for comment in post.comments - for comment in post.comments

1
app/views/comments/_new_comment.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
= form_for Comment.new, :remote => true do |f| = form_for Comment.new, :remote => true do |f|
%p %p
%label{:for => "comment_text_on_#{post.id}"} Comment %label{:for => "comment_text_on_#{post.id}"} Comment

3
app/views/js/_websocket_js.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
= javascript_include_tag 'FABridge', 'swfobject', 'web_socket' = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
:javascript :javascript
WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf"; WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
@ -29,7 +28,6 @@
processPost(obj['class'], obj['html'], obj['aspect_ids']) processPost(obj['class'], obj['html'], obj['aspect_ids'])
} }
}; };
ws.onclose = function() { debug("socket closed"); }; ws.onclose = function() { debug("socket closed"); };
ws.onopen = function() { ws.onopen = function() {
@ -37,7 +35,6 @@
debug("connected..."); debug("connected...");
}; };
}); });
function processRetraction(post_id){ function processRetraction(post_id){
$('#' + post_id ).fadeOut(500, function(){ $('#' + post_id ).fadeOut(500, function(){

1
app/views/layouts/application.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
!!! !!!
%html %html
%head %head

1
app/views/layouts/session_wall.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
!!! !!!
%html %html
%head %head

1
app/views/people/index.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :publish do - content_for :publish do
%h1 %h1
Search Search

2
app/views/people/new.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- title=t('.new_person') - title=t('.new_person')
= form_for @person do |f| = form_for @person do |f|
@ -28,5 +27,4 @@
= p.text_field :last_name = p.text_field :last_name
= f.submit = f.submit
%p= link_to t('.back_to_list'), people_path %p= link_to t('.back_to_list'), people_path

1
app/views/people/show.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :page_title do - content_for :page_title do
profile profile

1
app/views/photos/_new_photo.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
:javascript :javascript
function createUploader(){ function createUploader(){
var uploader = new qq.FileUploader({ var uploader = new qq.FileUploader({

1
app/views/photos/_photo.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%li.message{:id => post.id} %li.message{:id => post.id}
= person_image_tag(post.person) = person_image_tag(post.person)

1
app/views/photos/edit.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%h1.big_text %h1.big_text
.back .back
= link_to "⇧ #{@album.name}", album_path(@album) = link_to "⇧ #{@album.name}", album_path(@album)

1
app/views/photos/new.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- title t('.new_photo') - title t('.new_photo')
= form_for( @photo, :html => {:multipart => true}) do |f| = form_for( @photo, :html => {:multipart => true}) do |f|

2
app/views/photos/show.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
:javascript :javascript
$(document).keydown(function(e){ $(document).keydown(function(e){
switch(e.keyCode) { switch(e.keyCode) {
@ -35,7 +34,6 @@
-if current_user.owns? @album -if current_user.owns? @album
= link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button" = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button"
%div{:id => @photo.id} %div{:id => @photo.id}
#show_photo #show_photo
= linked_scaled_photo @photo, @album = linked_scaled_photo @photo, @album

1
app/views/posts/_debug.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
#debug_info #debug_info
%h5 DEBUG INFO %h5 DEBUG INFO
#debug_more{ :style => "display:none;" } #debug_more{ :style => "display:none;" }

1
app/views/posts/_post.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%ul %ul
%h3= link_to post.class, object_path(post) %h3= link_to post.class, object_path(post)
- for field in object_fields(post) - for field in object_fields(post)

1
app/views/registrations/new.html.haml
View file

@ -1,6 +1,5 @@
= image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg" = image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg"
= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
%p %p
= f.label :username = f.label :username

1
app/views/requests/_new_request.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%h1 %h1
=t('.add_a_new_friend_to') =t('.add_a_new_friend_to')
%i= aspect.name %i= aspect.name

1
app/views/shared/_aspect_friends.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
#friend_pictures #friend_pictures
= owner_image_link = owner_image_link
- for friend in @friends - for friend in @friends

1
app/views/shared/_aspect_nav.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
#aspect_nav #aspect_nav
%ul %ul
- for aspect in @aspects - for aspect in @aspects

1
app/views/shared/_post_wrapper.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
= person_image_link(post.person) = person_image_link(post.person)
= yield post_yield_tag(post) = yield post_yield_tag(post)

1
app/views/shared/_publisher.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
#publisher #publisher
= owner_image_tag = owner_image_tag

2
app/views/shared/_reshare.haml
View file

@ -2,8 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
:javascript :javascript
$(".reshare_button").toggle(function(e){ $(".reshare_button").toggle(function(e){
e.preventDefault(); e.preventDefault();

1
app/views/shared/log.haml
View file

@ -2,5 +2,4 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
= @log.to_s = @log.to_s

1
app/views/status_messages/_new_status_message.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
= form_for StatusMessage.new, :remote => true do |f| = form_for StatusMessage.new, :remote => true do |f|
= f.error_messages = f.error_messages
%p %p

1
app/views/status_messages/_status_message.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))} %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
= person_image_link(post.person) = person_image_link(post.person)

1
app/views/status_messages/index.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
%h1.big_text status messages %h1.big_text status messages
= render "status_messages/new_status_message", :status_message => @status_message = render "status_messages/new_status_message", :status_message => @status_message
%ul#stream %ul#stream

1
app/views/users/edit.html.haml
View file

@ -2,7 +2,6 @@
-# licensed under the Affero General Public License version 3. See -# licensed under the Affero General Public License version 3. See
-# the COPYRIGHT file. -# the COPYRIGHT file.
- content_for :publish do - content_for :publish do
%h1="#{t('.editing_profile')}" %h1="#{t('.editing_profile')}"

2
config.ru
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# This file is used by Rack-based servers to start the application. # This file is used by Rack-based servers to start the application.
require ::File.expand_path('../config/environment', __FILE__) require ::File.expand_path('../config/environment', __FILE__)

1
config/app_config.yml.example
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
default: default:
pod_url: "http://example.org/" pod_url: "http://example.org/"
debug: false debug: false

2
config/deploy_config.yml
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
cross_server: cross_server:
deploy_to: '/usr/local/app/diaspora' deploy_to: '/usr/local/app/diaspora'
user: 'root' user: 'root'

1
config/locales/devise/devise.cs.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
cs: cs:
errors: errors:
messages: messages:

1
config/locales/devise/devise.cy.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
cy: cy:
errors: errors:
messages: messages:

1
config/locales/devise/devise.de.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
de: de:
errors: errors:
messages: messages:

1
config/locales/devise/devise.en.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
en: en:
errors: errors:
messages: messages:

1
config/locales/devise/devise.fr-informal.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
fr-informal: fr-informal:
errors: errors:
messages: messages:

1
config/locales/devise/devise.fr.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
fr: fr:
errors: errors:
messages: messages:

1
config/locales/devise/devise.he.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
en: en:
errors: errors:
messages: messages:

1
config/locales/devise/devise.it.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
it: it:
errors: errors:
messages: messages:

1
config/locales/devise/devise.lt.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
lt: lt:
errors: errors:
messages: messages:

1
config/locales/devise/devise.pl.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
pl: pl:
errors: errors:
messages: messages:

1
config/locales/devise/devise.pt-BR.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
pt-BR: pt-BR:
errors: errors:
messages: messages:

1
config/locales/devise/devise.pt-PT.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
pt-PT: pt-PT:
errors: errors:
messages: messages:

1
config/locales/devise/devise.ro.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
ro: ro:
errors: errors:
messages: messages:

1
config/locales/devise/devise.ru.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
ru: ru:
errors: errors:
messages: messages:

1
config/locales/devise/devise.sv.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
sv: sv:
errors: errors:
messages: messages:

1
config/locales/diaspora/cs.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for Lithuanian. Add more files in this directory for other locales. # Sample localization file for Lithuanian. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/cy.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for English. Add more files in this directory for other locales. # Sample localization file for English. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/de.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Localization file for German. Add more files in this directory for other locales. # Localization file for German. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/en.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for English. Add more files in this directory for other locales. # Sample localization file for English. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/es.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for English. Add more files in this directory for other locales. # Sample localization file for English. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/fr-informal.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Localization file for French (Informal Honorifics). Add more files in this directory for other locales. # Localization file for French (Informal Honorifics). Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/it.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for Italian. Add more files in this directory for other locales. # Sample localization file for Italian. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/lt.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for Lithuanian. Add more files in this directory for other locales. # Sample localization file for Lithuanian. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/pl.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for English. Add more files in this directory for other locales. # Sample localization file for English. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/pt-BR.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for Portuguese Brazilian. Add more files in this directory for other locales. # Sample localization file for Portuguese Brazilian. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/pt-PT.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for Portuguese Portugal. Add more files in this directory for other locales. # Sample localization file for Portuguese Portugal. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/ru.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Sample localization file for Russian. Add more files in this directory for other locales. # Sample localization file for Russian. Add more files in this directory for other locales.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

1
config/locales/diaspora/sv.yml
View file

@ -2,7 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Swedish localization file. # Swedish localization file.
# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.

2
config/selenium.yml
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
common: &common common: &common
# Try to kill mongrel after suite if tmp/pids/mongrel_selenium.pid exists # Try to kill mongrel after suite if tmp/pids/mongrel_selenium.pid exists
# kill_mongrel_after_suite: true # kill_mongrel_after_suite: true

2
config/sprinkle/conf/nginx.conf
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
worker_processes 1; worker_processes 1;
pid /tmp/pids/nginx.pid; pid /tmp/pids/nginx.pid;

2
config/thin.yml
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
rackup: /usr/local/app/diaspora/current/config.ru rackup: /usr/local/app/diaspora/current/config.ru
pid: /tmp/pids/thin.pid pid: /tmp/pids/thin.pid
wait: 30 wait: 30

2
lib/tasks/db.rake
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
namespace :db do namespace :db do
desc 'Seed the current RAILS_ENV database from db/seeds.rb' desc 'Seed the current RAILS_ENV database from db/seeds.rb'
namespace :seed do namespace :seed do

2
lib/tasks/rspec.rake
View file

@ -2,8 +2,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
begin begin
require 'rspec/core' require 'rspec/core'
require 'rspec/core/rake_task' require 'rspec/core/rake_task'

1
ubuntu-setup.bash
View file

@ -8,7 +8,6 @@
# licensed under the Affero General Public License version 3. See # licensed under the Affero General Public License version 3. See
# the COPYRIGHT file. # the COPYRIGHT file.
# Set extented globbing # Set extented globbing
shopt -s extglob shopt -s extglob