Skip to content
Extraits de code Groupes Projets
Valider e792344c rédigé par Dorian's avatar Dorian Validation de Stephen Caudill
Parcourir les fichiers

Use improved whitespace:scrub_gratuitous_newlines

parent 4223769d
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Affichage de
avec 0 ajout et 31 suppressions
...@@ -2,8 +2,6 @@ ...@@ -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) }
......
...@@ -3,7 +3,6 @@ source 'http://rubygems.org' ...@@ -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'
......
...@@ -32,8 +32,6 @@ We are continuing to build features and improve the code base. ...@@ -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,8 +2,6 @@ ...@@ -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.
......
...@@ -2,7 +2,6 @@ ...@@ -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|
......
...@@ -2,7 +2,6 @@ ...@@ -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
......
...@@ -2,7 +2,6 @@ ...@@ -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(){
......
...@@ -2,7 +2,6 @@ ...@@ -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 @@ ...@@ -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
......
...@@ -2,7 +2,6 @@ ...@@ -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,11 +2,9 @@ ...@@ -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"
......
...@@ -2,7 +2,6 @@ ...@@ -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 @@ ...@@ -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
......
...@@ -2,7 +2,6 @@ ...@@ -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)
......
...@@ -2,7 +2,6 @@ ...@@ -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
......
...@@ -2,7 +2,6 @@ ...@@ -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
......
...@@ -2,7 +2,6 @@ ...@@ -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
......
...@@ -2,7 +2,6 @@ ...@@ -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 @@ ...@@ -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 @@ ...@@ -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(){
......
...@@ -2,7 +2,6 @@ ...@@ -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
......
...@@ -2,7 +2,6 @@ ...@@ -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
......
...@@ -2,7 +2,6 @@ ...@@ -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,7 +2,6 @@ ...@@ -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 @@ ...@@ -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
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter