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

Merge pull request #2803 from Stultus2/master

Browse source 
Fixing 2 bugs
This commit is contained in:
Dennis Collective 2012-02-02 00:20:28 -08:00
commit f25e25a7e7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/conversations/_show.haml
View file

@ -28,5 +28,5 @@
.content .content
= form_for [conversation, Message.new] do |message| = form_for [conversation, Message.new] do |message|
= message.text_area :text, :rows => 5, :tabindex => 1 = message.text_area :text, :rows => 5, :tabindex => 1
.right .left
= message.submit t('.reply').capitalize, :disable_with => t('.replying'), :class => 'button creation', :tabindex => 2 = message.submit t('.reply').capitalize, :disable_with => t('.replying'), :class => 'button creation', :tabindex => 2

1
config/application.yml.example
View file

@ -214,6 +214,7 @@ defaults: &defaults
development: development:
<<: *defaults <<: *defaults
serve_static_assets: true serve_static_assets: true
no_follow_diasporahq: true
production: production:
<<: *defaults <<: *defaults