Commit graph

15358 commits

Author SHA1 Message Date
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
danielvincent
d4ac19e9ce all form buttons are now using button definition in UI 2010-07-27 12:23:21 -07:00
danielvincent
dbc8f0112e some misc design cleanup. album page toggle pending. 2010-07-27 12:12:25 -07:00
danielvincent
97daaf81c2 made custom css3 buttons (pending FF compatability; works in webkit for now.) 2010-07-26 21:48:02 -07:00
maxwell
bda87bbeab MS switched request new links to just the request link 2010-07-26 18:13:20 -07:00
maxwell
d73d36f162 MS i had broke atom generation in my refactor. now it is fixed 2010-07-26 17:39:48 -07:00
danielvincent
9afb8beb25 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-26 17:04:00 -07:00
danielvincent
ec59b89e83 DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page 2010-07-26 16:57:44 -07:00
maxwell
a9b1954ff6 MS status message now updates the big one on the index page...hooray for jquery 2010-07-26 16:27:10 -07:00
danielvincent
f6687316d6 DG IZ; only a remote scaled photo is downloaded, not the full res 2010-07-26 16:08:19 -07:00
danielvincent
65acd48885 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-26 15:52:02 -07:00
danielvincent
087cf47b3f DG IZ added the JS file 2010-07-26 15:51:30 -07:00
danielvincent
36abb19e2c added the uploading photo wjava script 2010-07-26 15:50:41 -07:00
maxwell
88c83bb028 MS added pagination to the author show page 2010-07-26 15:15:42 -07:00