Raphael
|
abf48cefd4
|
Putting back in both generate_key
|
2010-08-24 13:41:09 -07:00 |
|
Raphael
|
2814dfceb7
|
Deleted the wrong generate_key
|
2010-08-24 13:40:36 -07:00 |
|
Raphael
|
ebfe77fc6d
|
Making warzombie work again
|
2010-08-24 12:17:06 -07:00 |
|
Raphael
|
d1c540439e
|
Moved friending out to a lib file, specs all pass
|
2010-08-24 12:13:10 -07:00 |
|
danielvincent
|
c3cf135a3f
|
tabs on top
|
2010-08-24 11:33:20 -07:00 |
|
danielvincent
|
85c268b5eb
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 11:12:04 -07:00 |
|
Raphael
|
fb33d955c9
|
Fix group show controller/view and haml error in nav
|
2010-08-24 11:11:25 -07:00 |
|
danielvincent
|
4ffb8e7fa3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 11:07:56 -07:00 |
|
danielvincent
|
86146d195f
|
moving stuff around to the header
|
2010-08-24 11:07:39 -07:00 |
|
Raphael
|
6ab6dc1c3a
|
Removing some unused routes
|
2010-08-24 11:06:56 -07:00 |
|
Raphael
|
7ca9d1e791
|
Changed group_nav a little, deleted people_sidebar
|
2010-08-24 11:02:30 -07:00 |
|
maxwell
|
f172c9e1d2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 18:45:31 -07:00 |
|
maxwell
|
a37b5ae09b
|
IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method
|
2010-08-23 18:45:20 -07:00 |
|
danielvincent
|
562656e96a
|
added edit link for group
|
2010-08-23 18:42:30 -07:00 |
|
Raphael
|
ab4ad249df
|
Forgot to return in that rescue
|
2010-08-23 17:09:20 -07:00 |
|
Raphael
|
21e2b323d0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 17:05:33 -07:00 |
|
Raphael
|
e05956bddd
|
rescuing 500 on friending someone that was already friends
|
2010-08-23 17:05:24 -07:00 |
|
danielvincent
|
2b125fdc66
|
fixed left friends bar a bit
|
2010-08-23 17:00:40 -07:00 |
|
danielvincent
|
f9a19e679f
|
made header shorter
|
2010-08-23 15:27:34 -07:00 |
|
Raphael
|
dbb16faed1
|
Photo filename is now better
|
2010-08-23 15:10:19 -07:00 |
|
Raphael
|
0cff5a45a2
|
Deleting gridfs controller
|
2010-08-23 15:02:28 -07:00 |
|
Raphael
|
511f571ae5
|
Specs mostly pass again
|
2010-08-23 15:01:39 -07:00 |
|
Raphael
|
48959b3ded
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 14:45:20 -07:00 |
|
Raphael
|
76f2aa98ac
|
Push to multiple groups
|
2010-08-23 14:45:13 -07:00 |
|
danielvincent
|
fb7e945fc2
|
removed useless if/else
|
2010-08-23 14:19:16 -07:00 |
|
danielvincent
|
60b7c30a8a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 14:17:26 -07:00 |
|
danielvincent
|
d874ba3b38
|
dropdown menu for user
|
2010-08-23 14:17:05 -07:00 |
|
Raphael
|
5a02f92448
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 13:58:46 -07:00 |
|
Raphael
|
ae6f0fdc51
|
new photo form now loads through ajax
|
2010-08-23 13:58:33 -07:00 |
|
danielvincent
|
d9c091d3f8
|
search box in top nav
|
2010-08-23 12:43:12 -07:00 |
|
Raphael
|
0092069372
|
Take signed in check out of websocket js
|
2010-08-23 11:57:29 -07:00 |
|
Raphael
|
01dac4d173
|
Take tinymce out of layout
|
2010-08-23 11:56:06 -07:00 |
|
danielvincent
|
37a67b29a4
|
left/right arrow keys on photo show page go to prev/next
|
2010-08-23 11:22:55 -07:00 |
|
danielvincent
|
2355947d8e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 11:05:36 -07:00 |
|
danielvincent
|
2d21ac0460
|
moving things around
|
2010-08-23 11:05:28 -07:00 |
|
Raphael
|
dc1dd07720
|
Don't crash on requesting a non-existent email address
|
2010-08-23 11:04:57 -07:00 |
|
maxwell
|
361adda6cd
|
added group picker. sends the right params, but posts only have one group right now so thats a bummer
|
2010-08-22 22:20:34 -07:00 |
|
ilya
|
643c52fd62
|
making a clear text on the user index page
|
2010-08-19 18:10:55 -07:00 |
|
ilya
|
7eb1bb5a00
|
removing the sanity check
|
2010-08-19 14:36:15 -07:00 |
|
ilya
|
542c1769f9
|
doing a sanity check, that not requiring serialized key passes the validation
|
2010-08-19 14:25:34 -07:00 |
|
ilya
|
501d62f215
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 14:13:27 -07:00 |
|
ilya
|
f7608f6292
|
RS IZ trying to create user through instantiate in seed script
|
2010-08-19 14:12:52 -07:00 |
|
danielvincent
|
36b2445a11
|
added title to search page
|
2010-08-19 13:41:48 -07:00 |
|
maxwell
|
35f6856380
|
MS search and index works
|
2010-08-19 12:40:50 -07:00 |
|
maxwell
|
756278f498
|
MS added friend search, and allow for autodiscover
|
2010-08-19 12:37:34 -07:00 |
|
maxwell
|
c98c52ad14
|
MS IZ renamed the array
|
2010-08-19 12:17:29 -07:00 |
|
maxwell
|
02da9bf634
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 12:00:21 -07:00 |
|
maxwell
|
df435dc319
|
MS IZ made a reques form in the user index page
|
2010-08-19 11:59:58 -07:00 |
|
ilya
|
b723c5997e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-19 10:49:18 -07:00 |
|
ilya
|
54afb1bad4
|
Rolling assign_key into setup_person
|
2010-08-19 10:49:04 -07:00 |
|