Raphael
|
5b78a31d29
|
make_user now makes a user from fixtures
|
2010-10-29 15:53:21 -07:00 |
|
Raphael
|
0c434ff66a
|
rake task to generate user fixtures, helper method which saves them
|
2010-10-29 15:53:21 -07:00 |
|
Raphael
|
3d2dd073ea
|
Take diaspora_handle out of user
|
2010-10-29 15:52:54 -07:00 |
|
danielvincent
|
8ec49e685b
|
going to a non-friend's page contains a way to add them.
|
2010-10-29 15:43:44 -07:00 |
|
maxwell
|
a272b22208
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-29 15:16:17 -07:00 |
|
maxwell
|
3ce44d040f
|
mocking out emhttprequest everywhere
|
2010-10-29 15:16:11 -07:00 |
|
danielvincent
|
f2b7e4010e
|
edit profile link on owner's profile page.
|
2010-10-29 15:02:56 -07:00 |
|
danielvincent
|
7acc138a21
|
resolved issue regarding profile images referenced at https:// locations.
|
2010-10-29 14:56:41 -07:00 |
|
maxwell
|
4e2425cdef
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-29 14:26:20 -07:00 |
|
maxwell
|
7e7c4c3431
|
refactored message handler spec
|
2010-10-29 14:26:11 -07:00 |
|
danielvincent
|
6eb50ea934
|
profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so.
|
2010-10-29 14:11:59 -07:00 |
|
danielvincent
|
79ec02c6ad
|
photo uploader on edit profile page.
|
2010-10-29 14:11:59 -07:00 |
|
Raphael
|
ce805c8167
|
Test pollution from locale being set
|
2010-10-29 13:26:54 -07:00 |
|
Raphael
|
86ddc2561a
|
fix spec in users_controller
|
2010-10-29 13:22:25 -07:00 |
|
maxwell
|
f75bd6bc2e
|
whoops, taking out queue stuff untill i finish
|
2010-10-29 13:05:35 -07:00 |
|
maxwell
|
242c6e4336
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-29 12:30:54 -07:00 |
|
maxwell
|
a7b3fc48ec
|
https is now a valid url for people. thx grippi
|
2010-10-29 12:30:38 -07:00 |
|
zhitomirskiyi
|
2c0a189df4
|
removed the session secret from the repo
|
2010-10-29 12:20:06 -07:00 |
|
maxwell
|
9c2ca15e93
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-29 12:09:32 -07:00 |
|
maxwell
|
c6fbcd28f7
|
stubbing out the hub publish method
|
2010-10-29 12:09:10 -07:00 |
|
Raphael
|
d753e31205
|
Merge remote branch 'ed0h/309-user-choose-language'
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
|
2010-10-29 12:06:14 -07:00 |
|
maxwell
|
47a9b2d189
|
switching deploy branch to master
|
2010-10-29 11:39:28 -07:00 |
|
maxwell
|
a5eb4bf1a7
|
Merge branch 'emw-merge'
|
2010-10-29 11:38:47 -07:00 |
|
maxwell
|
23db4fe278
|
merge complete
|
2010-10-29 11:33:31 -07:00 |
|
maxwell
|
39f66cc5d9
|
tests are green
|
2010-10-29 11:19:07 -07:00 |
|
maxwell
|
7c32649df4
|
rebasing master
|
2010-10-29 11:18:20 -07:00 |
|
maxwell
|
6d139ab946
|
more tests pass
|
2010-10-29 11:17:39 -07:00 |
|
maxwell
|
1e349e6a61
|
last time
|
2010-10-29 11:16:50 -07:00 |
|
maxwell
|
1b48572674
|
MS tests are now green
|
2010-10-29 11:16:50 -07:00 |
|
maxwell
|
b8a9025616
|
bad merge in receive
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
a5ba14f89c
|
nope that last fix I was too tired. the problem is when someone sends me a request saying it is a response from me
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
09c4def70b
|
bug; when someone sends you an unknown request, your server crashes.
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
fdb169558a
|
dont restart servers after db:reset
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
493969e458
|
trying a timer
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
9f314f44d9
|
typo
|
2010-10-29 11:15:14 -07:00 |
|
maxwell
|
07b2e7e227
|
omg i was deploying the wrong branch for the past two hours
|
2010-10-29 11:15:14 -07:00 |
|
maxwell
|
fddec49655
|
adding nexttick
|
2010-10-29 11:15:14 -07:00 |
|
zhitomirskiyi
|
d1de921d46
|
longer timeout
|
2010-10-29 11:15:14 -07:00 |
|
zhitomirskiyi
|
483960ae98
|
MS IZ more begin rescue
|
2010-10-29 11:15:14 -07:00 |
|
zhitomirskiyi
|
8b3a9cd801
|
adding some zombie friend puts
|
2010-10-29 11:15:14 -07:00 |
|
zhitomirskiyi
|
534cc112bf
|
IZ MS rebase master
|
2010-10-29 11:15:13 -07:00 |
|
maxwell
|
acd977a115
|
adding pending spec to check for error within webfinger process
|
2010-10-29 11:14:55 -07:00 |
|
maxwell
|
dae9f6540b
|
adding case for error message being emmited
|
2010-10-29 11:14:28 -07:00 |
|
Raphael
|
7a44fc0194
|
Merge remote branch 'robustdj/479-exporter-fix'
|
2010-10-29 11:13:59 -07:00 |
|
maxwell
|
d89cb53e26
|
pumping up the zombie sleep to allow for mail to get send out .
|
2010-10-29 11:13:42 -07:00 |
|
maxwell
|
68a44af856
|
making a few more cleanup and tests
|
2010-10-29 11:13:08 -07:00 |
|
maxwell
|
eddcb71fcb
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:11:05 -07:00 |
|
maxwell
|
58f836ab46
|
adding pending spec to check for error within webfinger process
|
2010-10-29 11:06:31 -07:00 |
|
maxwell
|
0aae89aa03
|
adding case for error message being emmited
|
2010-10-29 11:06:31 -07:00 |
|
maxwell
|
53e9df5455
|
pumping up the zombie sleep to allow for mail to get send out .
|
2010-10-29 11:05:18 -07:00 |
|