Sarah Mei
8d74aba2ac
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-27 03:21:36 -07:00
Sarah Mei
0c8de9460c
Fix for 1.9 (no spaces between method name and parens)
2010-10-27 03:21:17 -07:00
danielvincent
039bf374d8
soft shadow on header
2010-10-26 23:38:12 -07:00
Raphael
aa819d2113
Putting an index on Person#diaspora_handle
2010-10-26 19:16:16 -07:00
Raphael
49c09b9c8c
Remove unused clean_hash
2010-10-26 19:16:16 -07:00
Sarah Mei
601bd91346
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-26 19:05:32 -07:00
Sarah Mei
f314ab39df
At some point, we should upgrade database_cleaner to 0.6.0. That point is not now. (It breaks cucumber.)
2010-10-26 19:05:18 -07:00
Raphael
f975199f19
Merge remote branch 'mael/fr-locales'
2010-10-26 16:40:50 -07:00
danielvincent
e62afae045
deselected tabs in top nav, made user drop down a bit clearer
2010-10-26 16:12:58 -07:00
danielvincent
6e015790a7
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
2010-10-26 16:02:53 -07:00
zhitomirskiyi
b36ce1ac80
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-26 14:49:52 -07:00
zhitomirskiyi
8acdf21234
MS IZ got rid of the requests for me scope in the user
2010-10-26 14:49:37 -07:00
danielvincent
d8ca91769f
dragging a person to Remove from Aspect on aspect#manage fades person correctly (re: #442 )
2010-10-26 13:03:45 -07:00
danielvincent
7f1d87f424
fixed pagination bug on aspect#show (re: #445 )
2010-10-26 12:57:43 -07:00
zhitomirskiyi
1075c4f96b
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-26 12:22:58 -07:00
danielvincent
ff13cad116
names of people display immediately on aspect#manage page
2010-10-26 12:19:32 -07:00
maxwell
af917557f6
can't call match on nil
2010-10-25 22:56:50 -07:00
maxwell
cf7a90d0a5
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-25 22:07:11 -07:00
maxwell
a992c5fbc2
dont show service if you dont have the keys for it. also, update deploy script
2010-10-25 22:06:53 -07:00
maxwell
ed99f29a09
dont show service if you dont have the keys for it. also, update deploy script
2010-10-25 22:03:36 -07:00
Sarah Mei
cd67d38a24
Clean checkout: bad idea.
2010-10-25 22:00:33 -07:00
Sarah Mei
69fc293829
CI does a clean checkout
2010-10-25 21:54:13 -07:00
Sarah Mei
33410899d9
Fix for build breakage
2010-10-25 21:38:53 -07:00
danielvincent
a1d00d41e5
deploys back to master
2010-10-25 19:33:23 -07:00
danielvincent
060d8f9c7b
DG MS; fixed some bugs with posting publicly.
2010-10-25 19:24:48 -07:00
danielvincent
6ff94e67b3
remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example"
2010-10-25 17:50:04 -07:00
danielvincent
287d633c44
user#post now handles posting to services.
2010-10-25 17:41:59 -07:00
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
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
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
