Alec Leamas
de06f43d26
bugfix
2010-10-30 06:11:27 +03:00
Alec Leamas
916d488298
New try, outside vendor
2010-10-27 20:21:54 +02:00
Alec Leamas
eee51f2527
Merge remote branch 'upstream/master'
2010-10-27 20:21:40 +02:00
Raphael
ae65b7fc9b
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-27 11:13:41 -07:00
Raphael
16e455958c
Merge remote branch 'hexagon/se-localization'
2010-10-27 11:08:06 -07:00
Raphael
6c94d40bd4
Factory.build saves users
2010-10-27 11:03:57 -07:00
zhitomirskiyi
ebce967550
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-27 10:32:25 -07:00
zhitomirskiyi
a5099bb89f
IZ moved methods found in spec helper to helper methods file. now we can include them in the db scripts to keep friending behavior in sync
2010-10-27 10:32:09 -07:00
Raphael
f700eb537a
Add activemodel error message for person to en and fr locales
2010-10-27 10:27:30 -07:00
zhitomirskiyi
4a09eb2ece
IZ MS update pending aspects controller spec
2010-10-27 10:14:24 -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
Alec Leamas
322faf3cc0
Error recovery
2010-10-27 13:28:48 +02:00
Alec Leamas
7b14569571
Merge remote branch 'upstream/master'
2010-10-27 13:28:27 +02: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
Alec Leamas
88a12ca889
Big cleanup, linking to bundle, removing garbage, git mgmt
2010-10-27 11:54:08 +02:00
Alec Leamas
97940073d7
Works, w ith bit gem file and git repos...
2010-10-27 11:54:08 +02:00
Alec Leamas
fcb88bdba7
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-27 11:54:08 +02:00
Alec Leamas
d6dec71225
Merge remote branch 'upstream/master'
...
Conflicts:
pkg/fedora/make-dist.sh
2010-10-27 11:53:18 +02: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
