ilya
|
b660e5fefb
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-29 17:26:41 -07:00 |
|
ilya
|
f6495e2bec
|
RS IZ photos now fade in on the album upload page
|
2010-07-29 17:26:05 -07:00 |
|
maxwell
|
4f78af5623
|
Gemfile
|
2010-07-29 17:03:08 -07:00 |
|
maxwell
|
a534d6424e
|
gemfile
|
2010-07-29 16:58:14 -07:00 |
|
maxwell
|
004233ed73
|
gemfile
|
2010-07-29 16:53:12 -07:00 |
|
maxwell
|
3fac7c8dbc
|
roll back gemfile
|
2010-07-29 16:35:15 -07:00 |
|
maxwell
|
6aa1fa1826
|
DG MS profiles send? who knows...
|
2010-07-29 15:53:38 -07:00 |
|
Raphael
|
a636d97837
|
Removed crash if there was no latest status message
|
2010-07-29 14:38:46 -07:00 |
|
Raphael
|
3376057c33
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-29 13:58:49 -07:00 |
|
Raphael
|
f4bace85b3
|
No more key deletion in specs, parser included correctly
|
2010-07-29 12:45:43 -07:00 |
|
danielvincent
|
11a099914c
|
on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited.
|
2010-07-29 11:07:44 -07:00 |
|
danielvincent
|
fd4475370d
|
added profile url to author show page
|
2010-07-29 10:30:24 -07:00 |
|
ilya
|
e185498c4e
|
Fixing keyring
|
2010-07-29 10:14:35 -07:00 |
|
Raphael
|
9750684e61
|
Maybe because diasporaparser was moved out to a different file?
|
2010-07-29 10:10:17 -07:00 |
|
maxwell
|
cb3d6db9b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-29 10:06:11 -07:00 |
|
maxwell
|
2040c0d347
|
MS fixed lots of debug messages
|
2010-07-29 10:05:02 -07:00 |
|
maxwell
|
7a0db375ab
|
MS added rails 3rc
|
2010-07-29 09:59:03 -07:00 |
|
ilya
|
c8b40001e5
|
IZ album edit page was not added
|
2010-07-28 21:10:35 -07:00 |
|
Raphael
|
1e954eae4f
|
took out old puts, put in new one
|
2010-07-28 20:37:42 -07:00 |
|
maxwell
|
6a8291b56f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-28 18:35:06 -07:00 |
|
maxwell
|
049361ea15
|
MS profiles should send, need to just make the parser now
|
2010-07-28 18:32:00 -07:00 |
|
ilya
|
96a9c9455d
|
DG IZ; make photos in stream larger, because they need love too
|
2010-07-28 17:46:43 -07:00 |
|
ilya
|
6f3e7bc78b
|
DG IZ; minor tweaks
|
2010-07-28 17:31:05 -07:00 |
|
ilya
|
acb295d695
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-28 17:05:14 -07:00 |
|
ilya
|
03cf61bd7c
|
new user top bar
|
2010-07-28 17:04:56 -07:00 |
|
maxwell
|
e14e391a22
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-28 16:50:48 -07:00 |
|
maxwell
|
80db1132d1
|
Fixed the tests;
|
2010-07-28 16:50:38 -07:00 |
|
ilya
|
1700ce8e18
|
DG IZ; tweaks to album index page
|
2010-07-28 16:12:49 -07:00 |
|
ilya
|
b5b8e29d6a
|
DG IZ album view page brush up
|
2010-07-28 15:33:27 -07:00 |
|
ilya
|
3f27e1f67d
|
DG IZ photo spacing now works
|
2010-07-28 14:48:28 -07:00 |
|
ilya
|
5723d91dae
|
DG IZ; moved some buttons around, added album edit page
|
2010-07-28 14:00:02 -07:00 |
|
ilya
|
9e3c6a0936
|
DG IZ; brushed up ostatus user page
|
2010-07-28 12:13:36 -07:00 |
|
maxwell
|
75fd69bc67
|
MS; pushing weirdy buble thing
|
2010-07-28 11:14:27 -07:00 |
|
maxwell
|
eb4262dfc7
|
MS merged master
|
2010-07-28 11:13:17 -07:00 |
|
danielvincent
|
ef0a2c465d
|
fixed photo show comment picture bug
|
2010-07-28 10:06:20 -07:00 |
|
danielvincent
|
e2b5af35c1
|
minute changes
|
2010-07-28 00:04:43 -07:00 |
|
danielvincent
|
d710ff6f4a
|
shadows on album titles on album/index
|
2010-07-27 23:08:43 -07:00 |
|
maxwell
|
a57727c1fc
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 16:18:59 -07:00 |
|
maxwell
|
c41dea1e8b
|
MS small profile tweaks
|
2010-07-27 16:18:46 -07:00 |
|
danielvincent
|
7992b1b0e0
|
delete photo button on photo show page instead of delete album.
|
2010-07-27 16:10:42 -07:00 |
|
danielvincent
|
e6d2f51675
|
more visual recovery
|
2010-07-27 16:08:28 -07:00 |
|
danielvincent
|
fdd1a5d93b
|
more recovery
|
2010-07-27 16:04:59 -07:00 |
|
maxwell
|
92cc48beaf
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 15:52:50 -07:00 |
|
maxwell
|
3cecbf1511
|
MS profile page fixes
|
2010-07-27 15:52:42 -07:00 |
|
danielvincent
|
34291340b2
|
trying to get back up to speed
|
2010-07-27 15:50:44 -07:00 |
|
maxwell
|
9dd5c08296
|
fixed two small UI bugs
|
2010-07-27 14:45:04 -07:00 |
|
maxwell
|
86e090bac3
|
MS figured out moz gradient business
|
2010-07-27 14:34:16 -07:00 |
|
maxwell
|
9c7b3f0c07
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-27 14:23:44 -07:00 |
|
maxwell
|
bdca2348a6
|
MS IZ profile page has more useful info, but ultimatly kinda ugly
|
2010-07-27 14:23:31 -07:00 |
|
danielvincent
|
9b0206df1b
|
forgot to add ui stylesheet
|
2010-07-27 12:36:05 -07:00 |
|