Commit graph

14839 commits

Author SHA1 Message Date
Raphael
ac45960bbf Fixed album spec, condensed traversing tests to halve the time of the spec (It was reading the photos from disk on every spec) 2010-08-02 12:33:36 -07:00
Raphael
8658276385 Post button back, but needs moving, did latest_message css change in sass 2010-08-02 11:21:48 -07:00
Raphael
d503c6541f RS; posted statuses now use the websocket to update latest, time is now styled right 2010-08-02 11:13:21 -07:00
Raphael
b8ae6b44a2 RS; Image filename is now the Photo model id 2010-08-02 10:05:34 -07:00
danielvincent
5974bf3571 group nav is now links to nothing 2010-08-01 23:26:24 -07:00
danielvincent
19b633d3a3 top nav for groups partially there. 2010-08-01 22:26:56 -07:00
Raphael
dc1a164b67 Removing unused function 2010-07-30 12:42:39 -07:00
Raphael
c95ceecf9e Clarified socket helper, added a selenium test 2010-07-30 12:40:02 -07:00
Raphael
6fe00982f2 RS, IZ, fixing another error on person show 2010-07-30 10:32:36 -07:00
Raphael
0fd35709b1 RS, IZ, fixing error on person show with no posts 2010-07-30 10:26:00 -07:00
Raphael
e7ef3c06ed Websocketed photos now fade in 2010-07-30 10:20:50 -07:00
ilya
3eeb81ad34 DG IZ; time_created_at uses published_at instead of created_at for OstatusPost 2010-07-29 20:43:03 -07:00
ilya
f191aef981 DG IZ profile profile photos should update, removed the scaled down hack 2010-07-29 19:44:58 -07:00
ilya
abc5ee412d DG IZ assiging the new profile to the person in the parse objects from xml 2010-07-29 19:24:52 -07:00
ilya
0aa268a62d DG IZ trying asymetric searization and marshaling 2010-07-29 19:12:20 -07:00
ilya
dea85f580f DG IZ testing profile on polk 2010-07-29 18:37:21 -07:00
ilya
27bf29119d restoring display inline 2010-07-29 18:03:18 -07:00
ilya
085ea0a665 RS, IZ, DG Removing display inline 2010-07-29 17:59:44 -07:00
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