Commit graph

148 commits

Author SHA1 Message Date
maxwell
204c910f66 MS fixing small bugs, adding a very dump list of a groups that a friend is in for you 2010-08-24 15:47:44 -07:00
maxwell
de335e7366 MS messed with the temporary group picker thing: whatever, it is less annoying 2010-08-24 14:37:47 -07:00
danielvincent
c3cf135a3f tabs on top 2010-08-24 11:33:20 -07:00
danielvincent
86146d195f moving stuff around to the header 2010-08-24 11:07:39 -07:00
danielvincent
a8803a1c0b fixed flash messages 2010-08-23 17:40:59 -07:00
danielvincent
2b125fdc66 fixed left friends bar a bit 2010-08-23 17:00:40 -07:00
danielvincent
1f59d2ccc4 minor ui tweaks 2010-08-23 15:55:19 -07:00
danielvincent
f9a19e679f made header shorter 2010-08-23 15:27:34 -07:00
danielvincent
41b3117a41 removed that annoying rollover on diaspora text 2010-08-23 15:13:27 -07:00
danielvincent
4e996f8412 user name darker 2010-08-23 14:30:20 -07:00
danielvincent
d874ba3b38 dropdown menu for user 2010-08-23 14:17:05 -07:00
danielvincent
d9c091d3f8 search box in top nav 2010-08-23 12:43:12 -07:00
danielvincent
2d21ac0460 moving things around 2010-08-23 11:05:28 -07:00
maxwell
361adda6cd added group picker. sends the right params, but posts only have one group right now so thats a bummer 2010-08-22 22:20:34 -07:00
ilya
f5811df5b7 DG IZ; added info text to add new friend button 2010-08-18 11:59:20 -07:00
ilya
6c729b382f fixed some color on the header 2010-08-17 21:50:18 -07:00
Raphael
08de5caf97 make signup page look better 2010-08-17 17:20:29 -07:00
danielvincent
c81ea5a632 minor changes 2010-08-14 00:21:10 -07:00
danielvincent
a7eab9e50c minor section header tweaks (album stuff) 2010-08-13 23:20:39 -07:00
danielvincent
f7e43ee3d0 photo fancybox indicates progress. unfortunately, it doesn't reset after you close it right now... 2010-08-12 00:27:26 -07:00
danielvincent
013a6d0849 add photo is now in a fancy-pancy box 2010-08-11 20:45:57 -07:00
danielvincent
d207c8b955 fixed way too high z-index in album div 2010-08-09 21:27:17 -07:00
danielvincent
96fa34ea60 changed the pop-up boxes. going to probably switch to fancybox jquery plugin... also, fixed the user page so viewing it doesn't throw an error. 2010-08-09 21:10:11 -07:00
danielvincent
fd8d92a095 moved next/prev links in photo show to be inline with full size link. 2010-08-09 20:23:01 -07:00
danielvincent
acd00c2a59 fixed top right buttons on album page, etc. also, made the image loader simpler. 2010-08-09 20:14:03 -07:00
Raphael
aebe7b97c0 DG RS; added groups. can't delete, but can make new ones 2010-08-09 15:58:53 -07:00
Raphael
d71966476b Merge branch 'group-top' of github.com:diaspora/diaspora_rails into group-top
Conflicts:
	app/views/albums/show.html.haml
	app/views/authors/show.html.haml
	app/views/layouts/application.html.haml
	app/views/photos/show.html.haml
2010-08-09 15:09:05 -07:00
danielvincent
6f1a596dff small color changes 2010-08-06 00:40:44 -07:00
danielvincent
c54d47337b updated button style 2010-08-06 00:15:22 -07:00
Raphael
b74438a5dc Made comments a little easier to see, especially on photo show page 2010-08-04 18:12:12 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -07:00
danielvincent
7afe8e12a0 DG MS; correctly aligned publisher box submit button 2010-08-04 15:39:19 -07:00
danielvincent
f3bc651359 stuff fades 2010-08-02 19:16:01 -07:00
danielvincent
5030fbb8b5 Merge branch 'master' into group-top 2010-08-02 17:28:17 -07:00
danielvincent
3d5f27fe5a javascript gets group param for temp testing... friend pictures on group nav displays all people and authors, also for testing 2010-08-02 17:27:45 -07:00
Raphael
74691228d3 RS, IZ; All relevant controllers now create with user.post 2010-08-02 16:32:52 -07:00
danielvincent
3e5cecd532 Merge branch 'master' into group-top
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
2010-08-02 16:09:13 -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
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
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
ilya
6f3e7bc78b DG IZ; minor tweaks 2010-07-28 17:31:05 -07:00
ilya
03cf61bd7c new user top bar 2010-07-28 17:04:56 -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
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