Daniel Vincent Grippi
|
f2c6e7b820
|
made group manage a little nicer
|
2010-09-14 20:35:30 -07:00 |
|
Daniel Vincent Grippi
|
d0c8f9ccd6
|
silent comments on views
|
2010-09-14 19:54:48 -07:00 |
|
Daniel Vincent Grippi
|
fc3fb817c8
|
profile photo doesn't change to null if not changed on profile update
|
2010-09-14 19:48:11 -07:00 |
|
ilya
|
8aa39c5f08
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-14 11:58:55 -07:00 |
|
ilya
|
0560b46080
|
MS IZ added friend redirect, and moved the webfinger responces to fixture directory
|
2010-09-14 11:58:40 -07:00 |
|
Daniel Vincent Grippi
|
be7c3f28a9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-14 11:43:03 -07:00 |
|
Daniel Vincent Grippi
|
71ef54dbcc
|
spelling mistake, broken links on search page
|
2010-09-14 11:42:47 -07:00 |
|
ilya
|
cb12e497f6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-14 11:14:10 -07:00 |
|
ilya
|
2311c33626
|
MS IZ mocked all the webrequest tests
|
2010-09-14 11:13:58 -07:00 |
|
Daniel Vincent Grippi
|
24cd518f11
|
DG, RS; Album creation no longer ejects you from context
|
2010-09-14 11:00:16 -07:00 |
|
Daniel Vincent Grippi
|
da8ec589b7
|
RS, DG; display the correct tab on manage, change edit to manage
|
2010-09-14 10:05:59 -07:00 |
|
Daniel Vincent Grippi
|
a7c6e22e01
|
DG RS; passing around params[:aspect]. querying in application controller for current aspect.
|
2010-09-14 09:44:09 -07:00 |
|
Daniel Vincent Grippi
|
01b14a66e8
|
fixed photo show header
|
2010-09-13 22:51:51 -07:00 |
|
Daniel Vincent Grippi
|
b49eaa1ceb
|
minor visual tweaks
|
2010-09-13 20:51:27 -07:00 |
|
Daniel Vincent Grippi
|
0782e0b199
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 19:54:56 -07:00 |
|
Daniel Vincent Grippi
|
fe57a698d3
|
minor cleanup on album flow
|
2010-09-13 19:54:30 -07:00 |
|
Daniel Vincent Grippi
|
aa5447f553
|
Albums are now created within a context
|
2010-09-13 19:39:51 -07:00 |
|
maxwell
|
15651a7bb6
|
IZ MS group manage page can now add friends to groups
|
2010-09-13 18:10:07 -07:00 |
|
Daniel Vincent Grippi
|
5ecbb28dc7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 17:57:59 -07:00 |
|
Daniel Vincent Grippi
|
c059069144
|
albums don't show publisher, refactored css
|
2010-09-13 17:57:30 -07:00 |
|
Daniel Vincent Grippi
|
1b92bcd17c
|
Add albums_by_aspect method to user
|
2010-09-13 17:26:24 -07:00 |
|
maxwell
|
650a502404
|
MS IZ removed a bunch of unused request stuff
|
2010-09-13 16:58:23 -07:00 |
|
maxwell
|
63b3513a12
|
MS IZ removed the links to the requests index
|
2010-09-13 16:53:33 -07:00 |
|
maxwell
|
3b1223c9dd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:48:50 -07:00 |
|
maxwell
|
6f75a81a9d
|
IZ MS trying again on fixing remote profile images
|
2010-09-13 15:48:30 -07:00 |
|
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 |
|