11 commits

Author	SHA1	Message	Date
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	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	e922a3be5c	Ubuntu 10.10 desktop fixes	2010-10-13 08:29:24 +02:00
Alec Leamas	6177362c4a	Adding the ubuntu install package, initial version. ... T	2010-10-12 21:22:49 +02:00