Commit graph

47 commits

Author SHA1 Message Date
maxwell
51b2737dde fixed some album stuff 2010-08-24 15:21:27 -07:00
Raphael
5a02f92448 Merge branch 'master' of github.com:diaspora/diaspora 2010-08-23 13:58:46 -07:00
Raphael
ae6f0fdc51 new photo form now loads through ajax 2010-08-23 13:58:33 -07:00
Raphael
01dac4d173 Take tinymce out of layout 2010-08-23 11:56:06 -07:00
danielvincent
37a67b29a4 left/right arrow keys on photo show page go to prev/next 2010-08-23 11:22:55 -07:00
ilya
5cae2b21b1 RS, IZ fixed the url for the image 2010-08-18 18:06:13 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -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
Raphael
cc070ba168 RS, DG; Removed fancybox gone mad from photo adder 2010-08-10 18:08:27 -07:00
Raphael
a201390123 DG, RS; Added fancybox, made the contextual panes fancyboxes, photo adding is all broken 2010-08-10 17:59:22 -07:00
Raphael
37bf5b45f1 RS, DG; You now can't open the photo upload form while photos are uploading 2010-08-10 16:56:19 -07:00
danielvincent
4e062c143b new album partial has a title. album title is in italics in new photo partial 2010-08-09 21:29:19 -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
d712218a14 removed commented out stuff on photo_new partial. also, fixed the delete button in photo show. 2010-08-09 20:18:20 -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
838fec4921 RS, DG; Working on group nav, fixed some stuff in photo 2010-08-09 16:34:06 -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
ilya
890f927492 removed references of mine? method in all views 2010-08-08 22:53:23 -07:00
danielvincent
6f1a596dff small color changes 2010-08-06 00:40:44 -07:00
danielvincent
75663b2447 DG MS; user can edit photo caption. also, photos have captions. 2010-08-04 16:00:59 -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
5723d91dae DG IZ; moved some buttons around, added album edit page 2010-07-28 14:00:02 -07:00
danielvincent
7992b1b0e0 delete photo button on photo show page instead of delete album. 2010-07-27 16:10:42 -07:00
danielvincent
fdd1a5d93b more recovery 2010-07-27 16:04:59 -07:00
danielvincent
34291340b2 trying to get back up to speed 2010-07-27 15:50:44 -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
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
danielvincent
36abb19e2c added the uploading photo wjava script 2010-07-26 15:50:41 -07:00
ilya
2fa9462e05 Next and Previous for photos buttions are now in the center 2010-07-23 20:09:52 -07:00
ilya
79aa12ee67 RS IZ Removing the destroy link from photos 2010-07-23 15:59:42 -07:00
maxwell
21bd875a3f MS DG request bar fix, and some other small tweaks 2010-07-21 16:38:33 -07:00
maxwell
6f7f82e818 added helpers for photo show page 2010-07-21 15:47:30 -07:00
maxwell
a5f359ef1b MS DG added a safe for viewing photosize 2010-07-21 15:08:00 -07:00
maxwell
0f407b11ed MS DG comments now work on photo show page; full size photos now available 2010-07-21 14:58:06 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -07:00
maxwell
453d2ee827 RS MS fail. totally made a new bug and fixed it re: resizing 2010-07-20 11:50:23 -07:00
maxwell
e856945a94 RS MS photos are no longer ginormous, and also a small bug where photos were going to the status message show page. 2010-07-20 11:41:50 -07:00
danielvincent
55710ffbdb image uploader does two thumbnails 2010-07-17 21:10:21 -07:00
danielvincent
79536dcfb7 all post partials now use object_path for links 2010-07-17 13:59:04 -07:00
danielvincent
b221e19746 every post partial shows a user picture. a post's comments are displayed with a count in its show page 2010-07-17 13:41:54 -07:00
danielvincent
5637ab2a8e added multipart option to new photo form. needed to remove remote true for now. 2010-07-16 21:14:42 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00