Raphael
|
f700eb537a
|
Add activemodel error message for person to en and fr locales
|
2010-10-27 10:27:30 -07:00 |
|
zhitomirskiyi
|
634538eff3
|
IZ MS change back deploy config
|
2010-10-27 10:13:04 -07:00 |
|
zhitomirskiyi
|
63c740fce7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
|
2010-10-27 09:53:50 -07:00 |
|
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 |
|
zhitomirskiyi
|
21c75c08bb
|
removed the http inspect
|
2010-10-26 19:19:34 -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 |
|
zhitomirskiyi
|
c4b79aebc0
|
mongo query profing
|
2010-10-26 18:42:53 -07:00 |
|
zhitomirskiyi
|
708927cc6d
|
more debugging on remote, back to 5 sec timeout
|
2010-10-26 18:31:06 -07:00 |
|
zhitomirskiyi
|
d61ec0186f
|
debugging, trying increasing the timeout
|
2010-10-26 18:21:47 -07:00 |
|
zhitomirskiyi
|
8b16dd25e7
|
trying better logging
|
2010-10-26 18:16:10 -07:00 |
|
zhitomirskiyi
|
0b2e00b7d6
|
MS IZ the mailer will not be setup unless turned on in the APP_CONFIG
|
2010-10-26 17:46:19 -07:00 |
|
zhitomirskiyi
|
fa484e95e4
|
MS IZ refactored querying
|
2010-10-26 17:05:38 -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
|
acdbbe4dfc
|
no mail for debugging for now
|
2010-10-26 15:34:02 -07:00 |
|
zhitomirskiyi
|
c0c8c6253c
|
added a logging line for debugging
|
2010-10-26 15:13:16 -07:00 |
|
zhitomirskiyi
|
1024b8a3a7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
Conflicts:
app/controllers/aspects_controller.rb
|
2010-10-26 14:57:52 -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 |
|
zhitomirskiyi
|
e776389d19
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
|
2010-10-26 11:19:50 -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 |
|
zhitomirskiyi
|
917d1838de
|
MS IZ specs are green
|
2010-10-25 18:55:51 -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 |
|