maxwell
|
7741951a42
|
MS removing production stuff from master... yowch
|
2010-09-15 15:26:06 -07:00 |
|
maxwell
|
8828707c45
|
MS fixed the login bug, deploying to master
|
2010-09-15 15:15:15 -07:00 |
|
maxwell
|
55c1530c9f
|
MS DG fixing an edit profile bug
|
2010-09-15 14:09:05 -07:00 |
|
maxwell
|
b68ec3a5b8
|
MS DG setting diaspora handle in a unclean way
|
2010-09-15 13:53:36 -07:00 |
|
maxwell
|
84c60e5f2e
|
DG MS fixing webfinger, i hope to goodness
|
2010-09-15 13:28:06 -07:00 |
|
Daniel Vincent Grippi
|
57bd052c5b
|
user edit bug
|
2010-09-15 12:22:03 -07:00 |
|
Daniel Vincent Grippi
|
deac53f178
|
see yourself in aspect sidebar, because you're going to post to yourself anyway
|
2010-09-15 11:59:39 -07:00 |
|
Daniel Vincent Grippi
|
fe35d60b13
|
hack on aspect nav for ff & chrome compatability
|
2010-09-15 11:44:56 -07:00 |
|
Daniel Vincent Grippi
|
ea3e372474
|
fixed 500 error with @photos
|
2010-09-15 11:24:23 -07:00 |
|
Raphael
|
d9eb3abd9d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-15 10:59:00 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
a38a354065
|
moving things around for consistency. consistency isn't pretty right now.
|
2010-09-15 10:26:57 -07:00 |
|
Raphael
|
8c8eb02316
|
Reset albumscontroller
|
2010-09-15 10:20:46 -07:00 |
|
Daniel Vincent Grippi
|
73dab4b3ef
|
fixed stream elements
|
2010-09-15 10:17:37 -07:00 |
|
Raphael
|
5d303518c2
|
Adding in COPYRIGHT, AUTHORS, and blueprint attribution
|
2010-09-15 10:09:42 -07:00 |
|
Daniel Vincent Grippi
|
4a86632cf3
|
show default user photos for requests
|
2010-09-14 20:47:21 -07:00 |
|
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 |
|
Daniel Vincent Grippi
|
f256d433fd
|
nevermind
|
2010-09-14 19:34:26 -07:00 |
|
Daniel Vincent Grippi
|
02e1ed82a3
|
making profiles socket
|
2010-09-14 19:07:23 -07:00 |
|
maxwell
|
0d37f065dc
|
MS RS fixed a small group adding bug
|
2010-09-14 15:13:55 -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
|
b2b60af8aa
|
Albums_by_aspect now takes :all
|
2010-09-13 17:32:29 -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 |
|
Daniel Vincent Grippi
|
84b29770fe
|
Put raise back in webfinger fail
|
2010-09-13 16:05:43 -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
|
26e4e088d7
|
flash messages are now being set.
|
2010-09-13 15:44:26 -07:00 |
|
Raphael
|
35a4e0aaa1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:21:38 -07:00 |
|
Raphael
|
ff348eb944
|
Add flashes back in to aspect and albums
|
2010-09-13 15:20:57 -07:00 |
|
Daniel Vincent Grippi
|
48403996f0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 15:11:38 -07:00 |
|