Daniel Vincent Grippi
|
0c5ab4f20e
|
undo for now
|
2010-09-10 15:44:36 -07:00 |
|
Daniel Vincent Grippi
|
ef6ce98c12
|
DG IZ alert on dragging a request, trying to check
|
2010-09-10 15:41:58 -07:00 |
|
Daniel Vincent Grippi
|
d3a8e27833
|
DG IZ; selector fix
|
2010-09-10 15:37:59 -07:00 |
|
Daniel Vincent Grippi
|
b4e3ea3937
|
another little fix
|
2010-09-10 15:33:16 -07:00 |
|
Daniel Vincent Grippi
|
9fd8cfcc99
|
DG IZ added the same structure as groups
|
2010-09-10 15:31:00 -07:00 |
|
Daniel Vincent Grippi
|
8afb590128
|
small fix
|
2010-09-10 15:28:11 -07:00 |
|
Daniel Vincent Grippi
|
4770616a26
|
DG IZ; small fix
|
2010-09-10 15:19:04 -07:00 |
|
Daniel Vincent Grippi
|
82a31228fa
|
DG IZ; requests bar added to group/edit
|
2010-09-10 15:07:55 -07:00 |
|
Daniel Vincent Grippi
|
136eb61b02
|
DG IZ; groups = relations. now you can rename groups in the manage relation page
|
2010-09-10 14:52:11 -07:00 |
|
Daniel Vincent Grippi
|
f70ade6705
|
DG IZ; moved info on the person show page
|
2010-09-10 13:52:12 -07:00 |
|
Raphael
|
cab8610bea
|
Actually use salmon to push comments
|
2010-09-10 10:38:16 -07:00 |
|
Raphael
|
aa1f3c6438
|
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
|
2010-09-10 10:31:23 -07:00 |
|
Raphael
|
68dc74e0b7
|
Tests pass again, use id => in retraction.perform
|
2010-09-09 18:15:30 -07:00 |
|
Raphael
|
7448684358
|
Return results of queries
|
2010-09-09 17:56:21 -07:00 |
|
Raphael
|
222847ca92
|
Using methods that exist can be helpful
|
2010-09-09 17:54:33 -07:00 |
|
Raphael
|
e9377a681c
|
Don't use push_to_groups for retractions
|
2010-09-09 17:52:35 -07:00 |
|
Raphael
|
2b1724c42f
|
Pass id to groups_with_post
|
2010-09-09 17:44:33 -07:00 |
|
Raphael
|
8b09d8107c
|
Add encryptable to profiles
|
2010-09-09 17:43:07 -07:00 |
|
Raphael
|
87bef90932
|
Salmon for retractions and profiles
|
2010-09-09 17:28:32 -07:00 |
|
Raphael
|
a449afca8e
|
RS IZ salmon back friend acceptances
|
2010-09-09 17:07:40 -07:00 |
|
Raphael
|
fcadf7ab96
|
Salmon the requests
|
2010-09-09 16:54:51 -07:00 |
|
Raphael
|
d03c8e3323
|
removed the gen key method from encryptor
|
2010-09-09 16:31:10 -07:00 |
|
Raphael
|
6b4501c342
|
Move generate key back into user
|
2010-09-09 16:23:08 -07:00 |
|
Raphael
|
c73ce3ff99
|
RS IZ added a logger statement and a guid in the webfinger profile
|
2010-09-09 16:20:27 -07:00 |
|
Raphael
|
522450c9d3
|
RS IZ added a logger statement and a guid in the webfinger profile
|
2010-09-09 16:19:34 -07:00 |
|
Raphael
|
86d9a41d25
|
send_friend_request_to now takes a person and group, rather than a receive url and a group id
|
2010-09-09 16:06:42 -07:00 |
|
Raphael
|
d0de8b4988
|
Merge branch 'master' of github.com:diaspora/diaspora into salmon
|
2010-09-09 15:43:20 -07:00 |
|
Raphael
|
fd61535e11
|
Hcards working
|
2010-09-09 15:43:16 -07:00 |
|
Raphael
|
67f9d9dab5
|
Add hcard, add id for pod_location
|
2010-09-09 15:34:20 -07:00 |
|
Raphael
|
59006e657f
|
Hcard done manually
|
2010-09-09 15:15:37 -07:00 |
|
Raphael
|
3e9a36e1f1
|
Layout false on all publics controller routes
|
2010-09-09 14:15:20 -07:00 |
|
Raphael
|
c6aff4a562
|
making the hcard work
|
2010-09-09 13:02:59 -07:00 |
|
Raphael
|
6645d2090e
|
Deploy the salmon branch
|
2010-09-09 12:22:30 -07:00 |
|
Raphael
|
240dda4eab
|
Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished
|
2010-09-09 12:21:36 -07:00 |
|
Daniel Vincent Grippi
|
5812bbd1f1
|
removed group name edit madness from javascript.
|
2010-09-09 09:35:32 -07:00 |
|
Daniel Vincent Grippi
|
a15bf73287
|
minor textbox css fix
|
2010-09-08 23:35:07 -07:00 |
|
Daniel Vincent Grippi
|
1c2bfa64a1
|
cleaned login page resources
|
2010-09-08 23:30:08 -07:00 |
|
Daniel Vincent Grippi
|
bb30b69685
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-08 20:52:43 -07:00 |
|
Daniel Vincent Grippi
|
134bdab49d
|
group header now has a page_title field.
|
2010-09-08 20:52:35 -07:00 |
|
maxwell
|
3cf7938028
|
MS fixing pagination numbers and couple of other things
|
2010-09-08 20:51:46 -07:00 |
|
maxwell
|
2ce4fb27fa
|
MS; removing some dumb user stuff
|
2010-09-08 20:39:05 -07:00 |
|
maxwell
|
2a9e988b1f
|
MS fixing the zindex on the search
|
2010-09-08 20:03:01 -07:00 |
|
maxwell
|
c3a1b36282
|
MS fixing this to be request host on the login page
|
2010-09-08 19:49:09 -07:00 |
|
Daniel Vincent Grippi
|
7072c633ec
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-08 19:39:42 -07:00 |
|
Daniel Vincent Grippi
|
e6114e76f5
|
MS DG more tweaking
|
2010-09-08 19:39:24 -07:00 |
|
Raphael
|
4fd0853e71
|
Moving to salmon
|
2010-09-08 18:29:39 -07:00 |
|
Raphael
|
061f9de668
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-08 17:35:39 -07:00 |
|
Raphael
|
91f2e2e6ae
|
Add public key to webfinger profile
|
2010-09-08 17:35:18 -07:00 |
|
Daniel Vincent Grippi
|
ca780f3560
|
DG MS; hide debug info by default. also, made the text lighter.
|
2010-09-08 16:35:30 -07:00 |
|
Daniel Vincent Grippi
|
1e6b309163
|
DG MS; tweaking top nav and publisher.
|
2010-09-08 14:34:42 -07:00 |
|