Alec Leamas
9df1d526eb
bugfix
2010-10-24 14:14:02 +02:00
Alec Leamas
f697064cb6
bugfix
2010-10-22 13:49:38 +02:00
Alec Leamas
70e1d2de53
bugfixes
2010-10-22 12:49:11 +02:00
Alec Leamas
e9ce7614bd
bugfix
2010-10-22 11:35:11 +02:00
Alec Leamas
d5e8e516aa
First try on ubuntu
2010-10-22 09:19:10 +02:00
Alec Leamas
03f637eca9
Polishing up after git mess...
2010-10-20 22:05:42 +02:00
Raphael
1bd54aba63
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit 570d0cf104 , reversing
changes made to 9da5399425 .
2010-10-20 09:52:23 -07:00
Raphael
951c513f39
Revert "socket server update: pidfile, ubuntu upstart, bugfixes"
...
This reverts commit c08121e6eb .
2010-10-20 09:52:12 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2 .
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c99 , reversing
changes made to 53fef63a9a .
Conflicts:
pkg/fedora/diaspora-setup
pkg/ubuntu/diaspora-setup
public/stylesheets/sass/application.sass
spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
Alec Leamas
c08121e6eb
socket server update: pidfile, ubuntu upstart, bugfixes
...
patching websocket_server.rb to provide a pidfile, important
for SystemV init files. Ubuntu upstart configuration. Bugfixes
2010-10-20 14:08:44 +02:00
Alec Leamas
fb70dc8c99
Merge remote branch 'upstream/master'
...
Conflicts:
pkg/ubuntu/diaspora-setup
2010-10-20 08:54:56 +02:00
Alec Leamas
8dbd61f167
Point fix: error in diaspora-setup (x2) blocks build.
2010-10-19 23:39:22 +02:00
Alec Leamas
53fef63a9a
linking
2010-10-19 22:53:38 +02:00
Alec Leamas
2cf2b5f8b7
Linking
2010-10-19 22:44:07 +02:00
Alec Leamas
10f6a6994c
Docs...
2010-10-19 22:29:25 +02:00
Alec Leamas
a0c6c175f6
websocket service cleanup
...
Complete implementation of the websocket service as a separate
SystemV service. Patch to websocket_server.rb to make it support
a pidfile. Complete rewrite of the /etc/init.d script for
ubuntu. Support in installation scripts.
2010-10-19 22:15:47 +02:00
Alec Leamas
b1423e9e0f
Firts try, nothing tested
2010-10-19 20:04:23 +02:00
Alec Leamas
815e846684
Test provisions.
2010-10-19 20:04:23 +02:00
Alec Leamas
d8fc7d572e
Pkg updates: separate wsd pkg, bad Gemfile.lock mgmt, docs, fixes
...
For fedora, splits off the wsd daemon in separate package. Overall,
tools to handle bad Gemfile.lock: README notes, -f option to invoke
'bundle update' in make-dist.sh. Handling of missing libmozjs in
Ubuntu 10.04 (https://bugs.launchpad.net/ubuntu/+source/mongodb/+bug/557024 )
Various fixes & typos.
2010-10-19 14:29:20 +02:00
Alec Leamas
656d9387a6
Separate wsd daemon, simpler bundle directories, -f bundle update flag
...
For fedora, splits off the wsd daemin in separate package. Overall,
tools to handle bad Gemfile.lock README notes, -f option to invoke
'bundle update' in make-dist.sh. Minor bugfixes
2010-10-17 07:01:24 +02:00
Alec Leamas
0c5d197295
README update on Gemfile.lock problem, blocking.
2010-10-13 22:40:49 +02:00
Alec Leamas
d3a6031f88
Merge remote branch 'upstream/master' into port-test
2010-10-13 12:47:49 +02:00
Alec Leamas
8c2ccfc5a8
Updating to reflect new tests on 10.04 desktop.
2010-10-13 10:34:32 +02:00
Alec Leamas
e922a3be5c
Ubuntu 10.10 desktop fixes
2010-10-13 08:29:24 +02:00
Alec Leamas
2a153316ce
Not used
2010-10-13 01:41:28 +02:00
Alec Leamas
c818885b6e
Fixes after more tests
2010-10-13 00:35:50 +02:00
Alec Leamas
00bcfaf345
Check for universe enabled in diaspora-install-deps
2010-10-12 23:10:29 +02:00
Alec Leamas
fac7629610
Minor bugfixes, discovered after checking in ubuntu stuff.
2010-10-12 23:10:08 +02:00
Alec Leamas
5bc174da15
Well, another gitignore ;)
2010-10-12 21:24:21 +02:00
Alec Leamas
6177362c4a
Adding the ubuntu install package, initial version.
...
T
2010-10-12 21:22:49 +02:00