Commit graph

3849 commits

Author SHA1 Message Date
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
danielvincent
3d302f8db7 facebook and twitter both use omniauth and are saved as OmniauthServices 2010-10-25 17:41:59 -07:00
maxwell
c489f49a25 DG beginning to collapse twitter&facebook 2010-10-25 17:41:58 -07:00
maxwell
be39df75fe removed fb_status from the factories. whoops. 2010-10-25 17:41:58 -07:00
maxwell
fdd222003a fixed failing specs due to omitted factories. 2010-10-25 17:41:58 -07:00
maxwell
154b6e0ee7 MS DG added specs for posting to twitter, and basic services controller tests 2010-10-25 17:41:58 -07:00
maxwell
d66e986971 removing oauth keys 2010-10-25 17:41:58 -07:00
maxwell
606c7a02a4 MS DG public message now post to twitter, if connected 2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
Alec Leamas
31b3d739c0 Bundle: add licenses, handle git gems
Adding a docs dir collexting README and licenses from contained gems.
git gems, which bundler does not handle well today, are handled
by a hacked parsing of Gemfile.log, gem built into the source
bundle and installed on target system
2010-10-26 00:12:15 +02:00
Alec Leamas
76a8ea0e73 new git gem flow using. 2010-10-25 23:19:28 +02:00
Alec Leamas
11b6d61e5a Merge remote branch 'upstream/master' 2010-10-25 23:19:06 +02:00
Hexagon
1382bd9d08 Fixed header in swedish translation 2010-10-25 21:45:43 +02:00
Hexagon
d617392108 Added/complemented swedish translation 2010-10-25 21:41:32 +02:00
maxwell
b17ae0bf38 DG MS removed unused fb_status model and respective specs, fixtures. 2010-10-25 12:26:08 -07:00
zhitomirskiyi
0e2c20d817 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-25 10:12:11 -07:00
Alec Leamas
66d468c2b2 bugfix 2010-10-25 11:10:00 +02:00
Alec Leamas
1c17069491 bugfix 2010-10-25 10:59:57 +02:00
Alec Leamas
a279bae720 Separate doc dir collecting copyrights and readmes. 2010-10-25 10:34:28 +02:00
Alec Leamas
9b83b07f80 Install from local git gems without download from remote repo. 2010-10-25 10:34:27 +02:00
Sarah Mei
d32d47b790 work in progress cucumber feature for posting messages 2010-10-24 22:57:43 -07:00
root
c5a94c608e Daemontools installs and starts up mongo 2010-10-25 03:03:11 +00:00
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