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

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

Browse source
This commit is contained in:
danielvincent 2010-10-05 16:28:21 -07:00
commit 8d2cc724b0
17 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
public/javascripts/fancybox/jquery.easing-1.3.pack.js Executable file → Normal file
View file

0
public/javascripts/fancybox/jquery.fancybox-1.3.1.css Executable file → Normal file
View file

0
public/javascripts/fancybox/jquery.fancybox-1.3.1.js Executable file → Normal file
View file

0
public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js Executable file → Normal file
View file

0
public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js Executable file → Normal file
View file

0
public/javascripts/fileuploader.js Executable file → Normal file
View file

0
public/javascripts/jquery.cycle/jquery.cycle.lite.min.js vendored Executable file → Normal file
View file

0
public/javascripts/jquery.infieldlabel.js Executable file → Normal file
View file

0
public/javascripts/web_socket.js Executable file → Normal file
View file

0
public/stylesheets/blueprint/src/grid.css Executable file → Normal file
View file

0
public/stylesheets/blueprint/src/print.css Executable file → Normal file
View file

0
public/stylesheets/blueprint/src/reset.css Executable file → Normal file
View file

0
public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg Executable file → Normal file
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

0
public/stylesheets/brandongrotesque_light/demo.html Executable file → Normal file
View file

0
public/stylesheets/brandongrotesque_light/stylesheet.css Executable file → Normal file
View file

0
public/stylesheets/fileuploader.css Executable file → Normal file
View file

8
script/server
View file

@ -8,8 +8,12 @@ then
else else
mkdir -p -v log/thin/ mkdir -p -v log/thin/
#force AGPL #force AGPL
tar cf ../_source.tar -X .gitignore * test -w public -a ! -e public/source.tar &&
mv ../_source.tar public/source.tar tar cf public/source.tar --exclude='source.tar' -X .gitignore *
test -e public/source.tar || {
echo "Can't find, or even create, public/source.tar. Giving up"
exit 2
}
bundle exec ruby ./script/websocket_server.rb& bundle exec ruby ./script/websocket_server.rb&
bundle exec thin start $@ bundle exec thin start $@
fi fi