Daniel Vincent Grippi
|
48403996f0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:11:38 -07:00 |
|
Daniel Vincent Grippi
|
2fae1049d9
|
silent comments in all views except the layout and session wall
|
2010-09-13 15:11:14 -07:00 |
|
maxwell
|
a7231d041e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:09:20 -07:00 |
|
maxwell
|
c098be99bc
|
MS IZ attempt one to fix remote profile images
|
2010-09-13 15:08:39 -07:00 |
|
Daniel Vincent Grippi
|
a87925b359
|
missing license on layout
|
2010-09-13 14:39:18 -07:00 |
|
Daniel Vincent Grippi
|
40ecf176e8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 14:26:15 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
maxwell
|
0b33e6b3eb
|
MS IZ album page is now not completely wonky, but still kind of pointless...
|
2010-09-13 14:23:38 -07:00 |
|
maxwell
|
24d957cb32
|
MS IZ removed the views and redirected the edit route
|
2010-09-13 12:20:47 -07:00 |
|
maxwell
|
27f1b29581
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 11:54:50 -07:00 |
|
maxwell
|
812f2550aa
|
removed status message webfinger link
|
2010-09-13 11:52:47 -07:00 |
|
Daniel Vincent Grippi
|
6aeaea1b7d
|
removed some things. also, comment buttons are now css-ified when they come through the socket
|
2010-09-13 11:42:41 -07:00 |
|
Raphael
|
1312728b88
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
public/stylesheets/application.css
public/stylesheets/sass/application.sass
|
2010-09-13 11:16:45 -07:00 |
|
Raphael
|
aa0a00d9cb
|
Finish moving to aspects, DB reset required
|
2010-09-13 11:15:08 -07:00 |
|
Daniel Vincent Grippi
|
7579c0ec50
|
more cleanup
|
2010-09-13 11:05:10 -07:00 |
|
Raphael
|
9837340eb2
|
Rename files from group to aspect
|
2010-09-13 10:43:15 -07:00 |
|
Daniel Vincent Grippi
|
a74e00c159
|
removed hover user menu
|
2010-09-13 10:40:09 -07:00 |
|
Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
ilya
|
a738807cf4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 22:56:29 -07:00 |
|
ilya
|
0896efa5d6
|
now requests are called requested people, same css but less hacky selection
|
2010-09-12 22:54:53 -07:00 |
|
Daniel Vincent Grippi
|
897074c869
|
replace in comment websocket action replaces one or more number instead of just the first
|
2010-09-12 22:33:51 -07:00 |
|
ilya
|
370e2ef688
|
not displaying requests in the remove
|
2010-09-12 21:31:03 -07:00 |
|
ilya
|
1e74acd9b0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-12 19:56:47 -07:00 |
|
ilya
|
6b7f0888d0
|
Testing ignore friend request on remote
|
2010-09-12 19:56:23 -07:00 |
|
Daniel Vincent Grippi
|
31df3cea11
|
friend pictures on group edit page should now display the default person image if friend's picture isn't present
|
2010-09-12 18:11:05 -07:00 |
|
Daniel Vincent Grippi
|
db5d000757
|
made a sticky request link on the bottom of every page
|
2010-09-11 12:09:55 -07:00 |
|
Daniel Vincent Grippi
|
1092c7b8d1
|
moved manage to be its own tab on right
|
2010-09-11 07:53:45 -07:00 |
|
Daniel Vincent Grippi
|
266a896bde
|
mtweaking comments in stream
|
2010-09-10 23:55:33 -07:00 |
|
Daniel Vincent Grippi
|
9c7e0e3bcb
|
minor sass tweaks
|
2010-09-10 23:16:46 -07:00 |
|
Raphael
|
b704704334
|
People index now works when there is a non-friend on the page
|
2010-09-10 16:49:09 -07:00 |
|
Raphael
|
c170726f6c
|
Merge branch 'master' of github.com:diaspora/diaspora into salmon
|
2010-09-10 16:04:30 -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
|
522450c9d3
|
RS IZ added a logger statement and a guid in the webfinger profile
|
2010-09-09 16:19:34 -07:00 |
|
Raphael
|
d0de8b4988
|
Merge branch 'master' of github.com:diaspora/diaspora into salmon
|
2010-09-09 15:43:20 -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
|
c6aff4a562
|
making the hcard work
|
2010-09-09 13:02:59 -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
|
2ce4fb27fa
|
MS; removing some dumb user stuff
|
2010-09-08 20:39:05 -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 |
|