ilya
|
17080730f8
|
opening the file in the set photo
|
2010-08-24 14:48:26 -07:00 |
|
maxwell
|
00be2a6c40
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-08-24 14:46:02 -07:00 |
|
Raphael
|
143db96d7e
|
No more socket debug
|
2010-08-24 14:45:50 -07:00 |
|
maxwell
|
f5316fb3c1
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-08-24 14:45:04 -07:00 |
|
Raphael
|
03abd1ac21
|
Remove statuS MESsages new page. TaKE New OUt OF ROutes
|
2010-08-24 14:44:32 -07:00 |
|
Raphael
|
ef9cf8fc52
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:41:04 -07:00 |
|
maxwell
|
13253d3591
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:40:50 -07:00 |
|
maxwell
|
de335e7366
|
MS messed with the temporary group picker thing: whatever, it is less annoying
|
2010-08-24 14:37:47 -07:00 |
|
Raphael
|
db33d94f07
|
Render nothing on status_messages create, Websockets now honestly
support multiple groups.
|
2010-08-24 14:36:03 -07:00 |
|
ilya
|
27de7f930a
|
forgot the backer number set photo
|
2010-08-24 14:29:05 -07:00 |
|
ilya
|
d92ae1c871
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 14:22:47 -07:00 |
|
ilya
|
a70132fcdc
|
IZ we update profile in zombie friends accept
|
2010-08-24 14:22:21 -07:00 |
|
maxwell
|
cc1f1e2f24
|
removed the plus button from the all people add a friend page
|
2010-08-24 14:16:54 -07:00 |
|
maxwell
|
4f63f60b03
|
MS merging, and added a dumb check for the email validating twice
|
2010-08-24 14:03:57 -07:00 |
|
maxwell
|
2c9a1e3a43
|
added wall spec
|
2010-08-24 13:47:58 -07:00 |
|
maxwell
|
b4ab91043a
|
MS added check for current user
|
2010-08-24 13:45:38 -07:00 |
|
ilya
|
fa6e12d808
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 13:43:59 -07:00 |
|
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 |
|
ilya
|
79be6f0628
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-24 12:33:39 -07:00 |
|
ilya
|
319f87f9a8
|
trying setting profile photos
|
2010-08-24 12:29:00 -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 |
|
Raphael
|
88e8a11871
|
Tom should start with two groups
|
2010-08-24 11:40:49 -07:00 |
|
danielvincent
|
c3cf135a3f
|
tabs on top
|
2010-08-24 11:33:20 -07:00 |
|
Raphael
|
b5bb61a135
|
Merging master into production
|
2010-08-24 11:18:42 -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 |
|
danielvincent
|
5722936911
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 17:41:26 -07:00 |
|
danielvincent
|
a8803a1c0b
|
fixed flash messages
|
2010-08-23 17:40:59 -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
|
c7cd9792ae
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 17:01:03 -07:00 |
|
danielvincent
|
2b125fdc66
|
fixed left friends bar a bit
|
2010-08-23 17:00:40 -07:00 |
|
Raphael
|
ed99532a83
|
memory leak gone for real
|
2010-08-23 16:52:19 -07:00 |
|
Raphael
|
74be86395b
|
Changing env back to development mode, the memory leak is likely fixed
|
2010-08-23 16:33:44 -07:00 |
|
danielvincent
|
ee7005ad74
|
db:purge now deletes everything in uploads folder
|
2010-08-23 16:11:39 -07:00 |
|
danielvincent
|
18a77c8381
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 15:55:37 -07:00 |
|
danielvincent
|
1f59d2ccc4
|
minor ui tweaks
|
2010-08-23 15:55:19 -07:00 |
|
Raphael
|
b87c936b34
|
use rsofaer redfinger
|
2010-08-23 15:51:43 -07:00 |
|
danielvincent
|
f9a19e679f
|
made header shorter
|
2010-08-23 15:27:34 -07:00 |
|
danielvincent
|
8a4c6fc2ee
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-08-23 15:13:42 -07:00 |
|