Commit graph

126 commits

Author SHA1 Message Date
maxwell
21bd875a3f MS DG request bar fix, and some other small tweaks 2010-07-21 16:38:33 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
danielvincent
aece0fc1c7 removed duplications used for testing 2010-07-21 00:32:38 -07:00
danielvincent
c01e9846cf began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere 2010-07-21 00:24:11 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -07:00
ilya
2345975f22 DG IZ; fixed show photo always expanding to 100% width 2010-07-20 13:31:01 -07:00
ilya
715a6ae770 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 11:50:45 -07:00
ilya
7901791ee3 DG IZ; added simple image picker for edit profile page. currently displays all images uploaded. 2010-07-20 11:50:36 -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
ilya
e08ed8805f DG IZ photo upload form now with all the others 2010-07-20 10:00:02 -07:00
danielvincent
04eb66b2e6 user has a image url field for user picture 2010-07-16 23:02:24 -07:00
Raphael
501620e9fb DG RS; fixed some visual bugs. request link now turns red on new request 2010-07-15 18:40:55 -07:00
maxwell
3a785e24fd removed old jquery ajax form thing we never used but made it into the repo 2010-07-10 10:42:38 -07:00
Raphael
d00798e982 added preventdefault to publisher 2010-07-06 11:49:54 -07:00
ilya
b1ca01edb4 DG IZ text boxes are round in firefox 2010-07-05 20:18:04 -04:00
ilya
e81412f240 fixed header shadows in firefox 2010-07-05 19:59:54 -04:00
danielvincent
b45a72f41b Merge branch 'master' into color-change 2010-07-05 16:40:00 -07:00
ilya
a009bb1565 Added the expected behavior of fading out the publisher field(s) if content type is clicked again 2010-07-05 05:37:23 -04:00
danielvincent
20b056586d warming up the page. colors were too cold and non-human before. 2010-07-05 00:02:16 -07:00
danielvincent
33611abeba Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-03 23:39:20 -07:00
danielvincent
0001797850 moved user's name to the right of their picture 2010-07-03 23:39:05 -07:00
Raphael
0c09445919 RS; blur in clear_form 2010-07-03 23:35:10 -07:00
danielvincent
85cee4064b Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	public/javascripts/publisher.js
2010-07-03 22:45:56 -07:00
danielvincent
e709eba243 publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
Raphael
a0cdd7cb0e RS; Refactored publisher, tested it, it seems to work perfectly, but I could be wrong. 2010-07-03 13:26:11 -07:00
Raphael
cae4f832cf hover fix 2010-07-02 15:28:32 -07:00
Raphael
6ab9904f25 delete js now applies to new things 2010-07-02 15:19:33 -07:00
danielvincent
6ce0f4464f reverted publisher javascript refactor. working again in chrome. 2010-07-01 20:04:31 -07:00
danielvincent
1616f5573d DG MS; fixed position of flash message 2010-07-01 19:55:38 -07:00
Raphael
90b750acb2 Renamed jpegs to jpgs 2010-07-01 18:12:00 -07:00
danielvincent
88f0244353 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:22:30 -07:00
danielvincent
368f550f65 preview text next to diaspora in header 2010-07-01 17:22:24 -07:00
Raphael
80b69fd3ec Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:13:17 -07:00
maxwell
2b2864b78d now its just a message for ie 6, 7 2010-07-01 17:12:21 -07:00
Raphael
d9cff39bed Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 17:09:49 -07:00
Raphael
51e36b9659 RS, merged publisher refactor 2010-07-01 17:09:35 -07:00
danielvincent
d0560e6c74 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:57:58 -07:00
danielvincent
d935db7845 newest message font fix 2010-07-01 16:54:27 -07:00
Raphael
a70fbc6a4a Changed cap script 2010-07-01 16:54:12 -07:00
maxwell
86c6cdcafa Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:38:51 -07:00
maxwell
ba984009f8 added chrome frame 2010-07-01 16:38:32 -07:00
danielvincent
b25880f04a Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-01 16:25:11 -07:00
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
maxwell
6f17e5f28f added chrome frame for ie lameos 2010-07-01 16:17:32 -07:00
danielvincent
c0a744b2ce owner picture selector in application helper 2010-07-01 15:34:35 -07:00
maxwell
38465c350c RS, MS; Forms now clear 2010-07-01 11:19:08 -07:00
Raphael
a7659ae902 Marked the problem area in infieldlabels 2010-06-30 21:53:05 -07:00
danielvincent
df6ea31d3d Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-30 13:36:23 -07:00
Raphael
34400594ec RS, AML; fixed jumping to top of page on comment toggle 2010-06-30 13:29:20 -07:00