zhitomirskiyi
ad3e557eb5
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-24 18:58:38 -07:00
danielvincent
a9451d19b9
another publisher fix (broke aspect#show pages with last fix). changed flash message colors/opacity.
2010-10-24 18:16:38 -07:00
danielvincent
26cada5866
ff 3.6 publisher fix.
2010-10-24 18:01:38 -07:00
zhitomirskiyi
2eba8fbba7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-24 16:40:49 -07:00
root
30955d0100
Unify into one centos cookbook (people will want other OSes) and get mongo and ImageMagick installed
2010-10-24 23:21:01 +00:00
ilya
bd32e09bf3
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-24 15:18:12 -07:00
ilya
c8663b45e2
readme added link to our convention
2010-10-24 15:17:15 -07:00
maelsoucaze
14ac908c3d
French localizations updates.
2010-10-25 00:06:05 +02:00
maelsoucaze
294c8849b9
Merge remote branch 'upstream/master' into fr-locales
2010-10-25 00:04:24 +02:00
danielvincent
7b3f6f66c1
removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments.
2010-10-24 14:44:43 -07:00
danielvincent
661ad20a02
added delegate, proper finders, and more chaining to stream.js. removed div.comment_set from the DOM.
2010-10-24 14:44:43 -07:00
ilya
ff3dad2bff
adding assertion to album_spec many association
2010-10-24 14:03:03 -07:00
Alec Leamas
f07bcb19da
Merge remote branch 'upstream/master'
2010-10-24 21:28:09 +02:00
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
