root
acc9c116e5
Add a cookbook to run after bundling to install everything
2010-10-24 19:22:15 +00:00
Michael Sofaer
8b38b87c6c
event machine needs C++
2010-10-24 11:56:07 -07:00
root
cd913887d8
Bootstrap recipe for Centos
2010-10-24 18:40:05 +00:00
Alec Leamas
993e5613c6
Merge branch 'v2_clean'
2010-10-24 16:47:57 +02:00
Alec Leamas
6f4682cce7
Establish proper workflow w bundle package + bundle install.
...
make-dist now creates the bundle using 'bundle package', the
rpm files for Fedora ande install scripts for ubuntu installs
using 'bundle install'. This is the way bundler is intended to
work.
Bugs: bundler requires that shipped packages are built, altough
this is done in target system anyway. bundler also downloads
git gems from repo despite that they are already in cache on
target system.
2010-10-24 16:44:29 +02:00
Alec Leamas
f5f707d3e6
Merge branch 'v2_clean'
2010-10-24 16:27:16 +02:00
Alec Leamas
df8bcdf663
Establish proper workflow w bundle package + bundle install.
...
make-dist now creates the bundle using 'bundle package', the
rpm files for Fedora ande install scripts for ubuntu installs
using 'bundle install'. This is the way bundler is intended to
work.
2010-10-24 14:55:49 +02:00
Alec Leamas
1a0fcd1500
Merge remote branch 'upstream/master'
2010-10-24 14:21:52 +02:00
Alec Leamas
020f77289a
Merge branch 'v2'
2010-10-24 14:14:15 +02:00
Alec Leamas
9df1d526eb
bugfix
2010-10-24 14:14:02 +02:00
Alec Leamas
233d26fd02
Merge branch 'v2'
2010-10-24 13:42:05 +02:00
Alec Leamas
bbe56d0c0f
bugfix
2010-10-24 13:41:27 +02:00
Alec Leamas
cb0d68732f
Merge branch 'v2'
2010-10-24 13:19:20 +02:00
Alec Leamas
6502e28fbf
bugfix
2010-10-24 13:19:00 +02:00
ilya
c7b9ecb20c
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-24 01:48:45 -07:00
ilya
8d61fb0aeb
tiny bug in the spec
2010-10-24 01:45:26 -07:00
danielvincent
f8347a3dd4
added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show
2010-10-23 22:21:51 -07:00
danielvincent
18acdc7b55
everyone instead of all on aspect#index page. photo partial avatar now links to poster's profile.
2010-10-23 22:01:01 -07:00
Alec Leamas
0a5055514d
Merge branch 'v2'
2010-10-23 16:49:13 +02:00
Alec Leamas
06215365b4
testing
2010-10-23 16:48:44 +02:00
danielvincent
f5a0f44c25
fixed error in posting to all albums through publisher on albums#index
2010-10-23 00:36:29 -07:00
Alec Leamas
05616b698f
Merge branch 'v2'
2010-10-23 07:27:34 +02:00
Alec Leamas
abec01f98b
testing
2010-10-23 07:27:28 +02:00
Alec Leamas
537360bf95
Merge branch 'v2'
2010-10-23 06:22:53 +02:00
Alec Leamas
4ecb3d0b51
testing
2010-10-23 06:22:48 +02:00
Alec Leamas
578e3a594d
Merge branch 'v2'
2010-10-23 05:40:09 +02:00
Alec Leamas
164cc7e6f6
testing
2010-10-23 05:39:56 +02:00
Alec Leamas
1a49f3fb7d
Merge remote branch 'upstream/master'
2010-10-23 05:14:10 +02:00
Alec Leamas
c28da31f61
testing
2010-10-23 04:50:04 +02:00
Alec Leamas
1bb046dd1e
testing
2010-10-23 04:32:29 +02:00
ilya
a60287348d
not overwriting app config if it already exists
2010-10-22 19:13:35 -07:00
ilya
c27f05ed42
Initial refactor done, need to stop mapping user.friends to people so much
2010-10-22 18:11:04 -07:00
ilya
7083d2aa03
Moving friendships into a 'Contact' proxy object.
2010-10-22 18:11:04 -07:00
maxwell
606a6bb43a
status message length is limited to 1000 chars.
2010-10-22 17:42:59 -07:00
maxwell
6913381781
username now can only contain letters numbers, periods, and underscores
2010-10-22 17:26:10 -07:00
maxwell
096a0308e1
update attachment with emails
2010-10-22 17:12:28 -07:00
maxwell
9748767ec9
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-22 16:57:12 -07:00
maxwell
de04e717c0
made image or default to help with hcard parsing, deleted old default user picture
2010-10-22 16:57:01 -07:00
ilya
b337d5acc9
delivery method test in tests
2010-10-22 16:36:54 -07:00
maxwell
5af3d5fa82
double checking that matches are in front or back
2010-10-22 16:34:08 -07:00
maxwell
6720fa2c59
added tests to make sure Person.by_webfinger only returns exact matches
2010-10-22 16:28:03 -07:00
danielvincent
c0423e5e56
reverting commit manually
2010-10-22 15:57:00 -07:00
danielvincent
829ad6360a
multiple dropzones function. person image does not copy, delete is disabled.
2010-10-22 15:56:28 -07:00
danielvincent
a52870b21c
improved animations
2010-10-22 15:56:28 -07:00
danielvincent
e1f4e12b8f
style. also, made sense of aspect-edit.js
2010-10-22 15:56:28 -07:00
danielvincent
69528b95a3
removed ignore bucket. people now have x's to delete them
2010-10-22 15:56:27 -07:00
danielvincent
b5976753ea
removed unused view
2010-10-22 15:47:22 -07:00
danielvincent
f2cfa3c378
user name in breadcrumb
2010-10-22 15:38:22 -07:00
maxwell
837b418201
reverting, going to write a test
2010-10-22 15:37:22 -07:00
danielvincent
f20078cc5c
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-22 15:32:50 -07:00
