nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4872 commits 4 branches 0 tags 121 MiB
Commit graph

456 commits

Author SHA1 Message Date
danielvincent
9ac13ccb3e fixed reshare a bit 2010-10-08 15:47:06 -07:00
danielvincent
edd8f0ba6d links now have active state 2010-10-08 15:35:22 -07:00
danielvincent
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07:00
danielvincent
a3aab92212 fixed photo partial 2010-10-08 12:25:42 -07:00
danielvincent
3a876770f3 minor tweaks 2010-10-08 00:36:55 -07:00
danielvincent
894d6654b2 only selected nav element should be a tab on aspect_nav, preventing tab overload. 2010-10-07 23:35:55 -07:00
danielvincent
8f741795fb aspect manage margin fix 2010-10-07 23:27:31 -07:00
danielvincent
5b66a191cd more stream tweaks 2010-10-07 23:25:49 -07:00
danielvincent
b314ee22ec intermediate misc ui polish 2010-10-07 22:51:08 -07:00
danielvincent
ed1cb5a0e7 DG MS; moved change password to account page; fixed the styling on password inputs 2010-10-07 18:52:46 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Alec Leamas
e9252e8aec After applying known rules in diaspora-bundle.spec, perm-fix patch + *.png 2010-10-07 14:59:13 +02:00
Alec Leamas
a9806ddad0 Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc. 2010-10-06 04:59:46 +08:00
danielvincent
e145cbab5b tar the app's source and throw it in the public folder on server boot. 2010-09-29 17:42:56 -04:00
danielvincent
fa8cc5b876 moz box shadow does not like negative blur 2010-09-28 23:24:04 -04:00
danielvincent
e0159aaaeb small visual tweaks 2010-09-28 12:58:34 -07:00
danielvincent
4627c5338e found placement of all aspects tab confusing; moved it to be the first tab 2010-09-28 12:29:35 -07:00
danielvincent
0a34c24f22 tag fix 2010-09-28 11:51:52 -07:00
danielvincent
577b5545bf comment blocks slide 2010-09-28 11:50:13 -07:00
danielvincent
b068eaf15c limit content width to 600px 2010-09-28 10:48:45 -07:00
danielvincent
241ea4559a gradients on aspect tags on status messages 2010-09-28 10:41:38 -07:00
danielvincent
263615ad14 all status messages have labels 2010-09-27 23:51:20 -07:00
danielvincent
cb7c35af73 fixed thumbnail positioning 2010-09-27 23:15:48 -07:00
danielvincent
bf587be461 public indicator tag on status message partial. 2010-09-27 22:50:11 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
danielvincent
265753b5fe user edit is now divided into real sections 2010-09-23 20:13:07 -07:00
Raphael
264555e63b Update css 2010-09-23 15:15:19 -07:00
Raphael
c6c361b5e6 Add lucida sans, thanks danieleds 2010-09-23 15:14:44 -07:00
danielvincent
b9be543ef6 DG IZ; reshare redirects to specific page 2010-09-22 15:32:11 -07:00
danielvincent
474cf77708 DG IZ; reposting now works. redirects to a template missing page, though. 2010-09-22 15:05:51 -07:00
danielvincent
b019ade588 minor changes from production 2010-09-20 21:50:06 -07:00
danielvincent
40c96fc619 DG IZ; click to edit rollover text on aspect manage page 2010-09-20 15:53:56 -07:00
danielvincent
5a9b0fbd03 tabs rounded 2010-09-19 22:16:58 -07:00
danielvincent
14ad24ba7e visual tweaks on header. moved upload a file button to header on album#show 2010-09-19 14:27:20 -07:00
danielvincent
b5a2971302 search results for people now look like the stream 2010-09-18 17:49:52 -07:00
danielvincent
292a38e694 DG IZ; arrow keys work in fancybox. removed background color change on close button on hover 2010-09-16 18:55:54 -07:00
danielvincent
755e2a744c DG IZ; dropzones now light up when dragging on aspect page 2010-09-16 17:30:49 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Daniel Vincent Grippi
c1414c5207 flash messages are now colored on session wall 2010-09-15 16:59:44 -07:00
Daniel Vincent Grippi
fe35d60b13 hack on aspect nav for ff & chrome compatability 2010-09-15 11:44:56 -07:00
Daniel Vincent Grippi
ac7fb673c5 show add new friend links on aspect manage page 2010-09-15 11:25:39 -07:00
Raphael
89ac38f630 Sass licenses changed 2010-09-15 11:00:55 -07:00
Raphael
d9eb3abd9d Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 10:59:00 -07:00
Daniel Vincent Grippi
73dab4b3ef fixed stream elements 2010-09-15 10:17:37 -07:00
Raphael
5d303518c2 Adding in COPYRIGHT, AUTHORS, and blueprint attribution 2010-09-15 10:09:42 -07:00
Daniel Vincent Grippi
1d04c89b48 header tweak 2010-09-15 00:39:48 -07:00
Daniel Vincent Grippi
8a59f3b26e aspect manage less rounded 2010-09-14 20:42:08 -07:00
Daniel Vincent Grippi
c763a663ac z-index fix 2010-09-14 20:37:31 -07:00
Daniel Vincent Grippi
f2c6e7b820 made group manage a little nicer 2010-09-14 20:35:30 -07:00
Daniel Vincent Grippi
5ecbb28dc7 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-13 17:57:59 -07:00
Daniel Vincent Grippi
c059069144 albums don't show publisher, refactored css 2010-09-13 17:57:30 -07:00
maxwell
63b3513a12 MS IZ removed the links to the requests index 2010-09-13 16:53:33 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Daniel Vincent Grippi
3be86c2b5c fixed tab bug in ff 2010-09-13 11:51:25 -07:00
Daniel Vincent Grippi
200b0045f7 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-09-13 11:22:05 -07:00
Daniel Vincent Grippi
8c80174e73 removed some unneeded sass 2010-09-13 11:16:59 -07:00
Raphael
1312728b88 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-09-13 11:16:45 -07:00
Raphael
aa0a00d9cb Finish moving to aspects, DB reset required 2010-09-13 11:15:08 -07:00
Daniel Vincent Grippi
7579c0ec50 more cleanup 2010-09-13 11:05:10 -07:00
Daniel Vincent Grippi
f5565025cb removed glyphish icons 2010-09-13 10:44:20 -07:00
Daniel Vincent Grippi
a74e00c159 removed hover user menu 2010-09-13 10:40:09 -07:00
Raphael
44a1f82da9 Rename group to aspect 2010-09-13 10:38:38 -07:00
Daniel Vincent Grippi
ede03fe1d5 added graident back into firefox 2010-09-13 10:23:24 -07:00
ilya
0896efa5d6 now requests are called requested people, same css but less hacky selection 2010-09-12 22:54:53 -07:00
Daniel Vincent Grippi
1874ebe51d forgot to map to group ids in retraction 2010-09-12 21:33:39 -07:00
ilya
6b7f0888d0 Testing ignore friend request on remote 2010-09-12 19:56:23 -07:00
Daniel Vincent Grippi
db5d000757 made a sticky request link on the bottom of every page 2010-09-11 12:09:55 -07:00
Daniel Vincent Grippi
7fefdd3753 minor cleanup 2010-09-11 08:59:25 -07:00
Daniel Vincent Grippi
266a896bde mtweaking comments in stream 2010-09-10 23:55:33 -07:00
Daniel Vincent Grippi
95765139d6 link color less morbid. 2010-09-10 23:37:16 -07:00
Daniel Vincent Grippi
9c7e0e3bcb minor sass tweaks 2010-09-10 23:16:46 -07:00
Daniel Vincent Grippi
d3a8e27833 DG IZ; selector fix 2010-09-10 15:37:59 -07:00
Daniel Vincent Grippi
8afb590128 small fix 2010-09-10 15:28:11 -07:00
Daniel Vincent Grippi
4770616a26 DG IZ; small fix 2010-09-10 15:19:04 -07:00
Daniel Vincent Grippi
82a31228fa DG IZ; requests bar added to group/edit 2010-09-10 15:07:55 -07:00
Daniel Vincent Grippi
136eb61b02 DG IZ; groups = relations. now you can rename groups in the manage relation page 2010-09-10 14:52:11 -07:00
Daniel Vincent Grippi
a15bf73287 minor textbox css fix 2010-09-08 23:35:07 -07:00
Daniel Vincent Grippi
1c2bfa64a1 cleaned login page resources 2010-09-08 23:30:08 -07:00
Daniel Vincent Grippi
bb30b69685 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-08 20:52:43 -07:00
Daniel Vincent Grippi
134bdab49d group header now has a page_title field. 2010-09-08 20:52:35 -07:00
maxwell
3cf7938028 MS fixing pagination numbers and couple of other things 2010-09-08 20:51:46 -07:00
maxwell
2ce4fb27fa MS; removing some dumb user stuff 2010-09-08 20:39:05 -07:00
maxwell
2a9e988b1f MS fixing the zindex on the search 2010-09-08 20:03:01 -07:00
Daniel Vincent Grippi
e6114e76f5 MS DG more tweaking 2010-09-08 19:39:24 -07:00
Daniel Vincent Grippi
ca780f3560 DG MS; hide debug info by default. also, made the text lighter. 2010-09-08 16:35:30 -07:00
Daniel Vincent Grippi
1e6b309163 DG MS; tweaking top nav and publisher. 2010-09-08 14:34:42 -07:00
Daniel Vincent Grippi
20d5043e81 DG MS; moved tabs around up top 2010-09-08 12:52:28 -07:00
Daniel Vincent Grippi
f7dd0b10b9 DG MS; changed the gear on top nav to not be a tab 2010-09-08 12:34:08 -07:00
Daniel Vincent Grippi
36730978ca login page is more elegant 2010-09-08 11:37:54 -07:00
Daniel Vincent Grippi
20d9334ce1 DG IZ; changed the photo uploader to drag and drop. now works in firefox. 2010-09-07 17:20:48 -07:00
Daniel Vincent Grippi
41afd86fe7 DG IZ; fixed photos. 2010-09-07 12:03:43 -07:00
Daniel Vincent Grippi
2daa31b7bf added a line to the bottom of the publisher 2010-09-06 17:28:09 -07:00
Daniel Vincent Grippi
39c366e2e9 group edit button up top. 2010-09-06 17:22:57 -07:00
Daniel Vincent Grippi
48415b4de8 cleaned up group edit a little 2010-09-06 13:01:24 -07:00
Daniel Vincent Grippi
f9c2e0e76d moved publisher down.wn. header is now a dark grey instead of black. 2010-08-31 13:07:11 -07:00
Daniel Grippi & Raphael Sofaer
cf161cb8cf publisher box back up top 2010-08-27 16:09:10 -07:00
danielvincent
a886b8ddbc made photos for album previews 200x200, small thumbnails now at 50x50 2010-08-26 15:13:33 -07:00
danielvincent
239ae048cc group names are now editable 2010-08-26 15:02:13 -07:00
Raphael
17636f4fd2 View modifications, refactored stream javascript to another file 2010-08-25 13:51:16 -07:00
Raphael
3121cf57d3 Refactored top nav haml, added non-functional gear link next to group 2010-08-25 11:35:50 -07:00
danielvincent
f4b3a2eb3a more cleaning up of comment box. javascript stuff. 2010-08-24 20:49:32 -07:00
danielvincent
501f98b9e1 fixed comments from not showing. also, touched them up a bit. 2010-08-24 20:13:37 -07:00
Raphael
d3c10f8777 made left column in layout a little wider 2010-08-24 19:02:00 -07:00
Raphael
5779610659 messed with the views 2010-08-24 18:31:16 -07:00
Raphael
3f5df61810 minor tab tweaks 2010-08-24 16:38:42 -07:00
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
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
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
danielvincent
261a7d177d fixed for real 2010-07-24 11:09:25 -07:00
danielvincent
9ad8e80982 fixed now? 2010-07-24 11:00:35 -07:00
danielvincent
1a51d99ad7 fixed sidebar? 2010-07-24 10:49:01 -07:00
danielvincent
eb15dcb4ce fixed images on friend sidebar 2010-07-24 10:35:47 -07:00
danielvincent
03e06cb279 person sidebar has a view all; displays user images with names in tooltips instead of text 2010-07-24 10:24:43 -07:00
maxwell
c9709dd1e7 MS put current status back on page 2010-07-24 01:39:15 -07:00
maxwell
8a174d37c7 MS trying a dan-like thing in the publisher 2010-07-23 23:56:41 -07:00
danielvincent
2646a52cbb header padding fix 2010-07-23 22:40:23 -07:00
danielvincent
4c3a51833f user name is bigger 2010-07-23 22:35:12 -07:00
danielvincent
e5d298040d little things 2010-07-23 21:11:21 -07:00
danielvincent
f6fd6bc9e6 added breadcrumb to albums 2010-07-23 20:28:10 -07:00
danielvincent
d93c331615 moved publisher 2010-07-23 20:12:28 -07:00
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
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
20b056586d warming up the page. colors were too cold and non-human before. 2010-07-05 00:02:16 -07:00
danielvincent
e709eba243 publisher as a faux nav element. 2010-07-03 22:43:11 -07:00
danielvincent
1616f5573d DG MS; fixed position of flash message 2010-07-01 19:55:38 -07:00
danielvincent
368f550f65 preview text next to diaspora in header 2010-07-01 17:22:24 -07:00
danielvincent
d935db7845 newest message font fix 2010-07-01 16:54:27 -07:00
danielvincent
03e7071aae fixed nav list/link deal for firefox, html compliance 2010-07-01 16:24:51 -07:00
danielvincent
f7e4f1db32 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-30 13:12:09 -07:00
danielvincent
74aa0debc8 stupid sans-serif bug finally squashed 2010-06-30 00:30:43 -07:00
maxwell
6bc68fb42e Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-30 00:27:30 -07:00
maxwell
dc5b321b62 sorry for the monster commit.... 4 small chores...1) moved tons of dynamic javascript to haml partials in the new js view folder, and moved some of the js that got put in the application layout into view.js 2. set up a static config prefrence loader in initializers, loaded from yaml 3) fixed the top right login text from being pushed over. 4) fixed a bug when no user is on the node and someone hits the landing page.... you still cant create a new user from there, but now at least it doesnt blow up. 2010-06-30 00:27:11 -07:00
danielvincent
a15cd932b6 nevermind, nevermind 2010-06-29 23:47:39 -07:00
danielvincent
8725ea2d57 high box shadow blur kills the client 2010-06-29 23:28:15 -07:00
danielvincent
cf8c669e83 login screen now black. 2010-06-29 23:24:31 -07:00
danielvincent
984f5f62b6 DG IZ; publisher reflects what type is selected 2010-06-29 19:55:50 -07:00
danielvincent
8ff241cdde DG IZ; all comments hidden by default. linking anchor issue. 2010-06-29 19:00:54 -07:00
danielvincent
7d6783e446 DG IZ; more little changes to UI 2010-06-29 18:00:01 -07:00
danielvincent
0c16038e2d Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
	public/stylesheets/application.css
	public/stylesheets/sass/application.sass
 2010-06-29 17:30:29 -07:00
danielvincent
acc782d5b2 DG IZ; cool labels fade in 2010-06-29 17:27:09 -07:00
maxwell
eebed9d457 fixed publisher in chrome and broke it out to a seperate js file 2010-06-29 17:04:46 -07:00
danielvincent
39a1874ce3 DG IZ; all input fields are now textareas on dashboard page 2010-06-29 16:28:12 -07:00
maxwell
a0a0b9d0ad fixed stream bull 2010-06-29 15:05:09 -07:00
danielvincent
67123c664a Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
 2010-06-29 14:36:46 -07:00
danielvincent
5193a20458 DG IZ; getting there. 2010-06-29 14:34:33 -07:00
danielvincent
260805af64 DG IZ; publisher box & profile picture placeholder 2010-06-29 12:25:36 -07:00
danielvincent
01f048b0a6 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	public/stylesheets/sass/application.sass
 2010-06-28 22:18:47 -07:00
danielvincent
08d6a46bd8 login page 2010-06-28 22:18:05 -07:00
maxwell
45a9d9e342 moved the silly destory link over a bit 2010-06-28 22:15:52 -07:00
danielvincent
5be5d82eb7 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-28 20:42:12 -07:00
ilya
775aab996a DG IZ picture in the profile 2010-06-28 23:39:55 -04:00
danielvincent
fd082f52bc fixed stream's sans font showing up on linux. 2010-06-28 12:35:31 -07:00
danielvincent
462bd96189 ui fixup 2010-06-27 16:17:42 -07:00
danielvincent
5be27f33ec Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/status_messages/_status_message.html.haml
 2010-06-27 10:32:23 -07:00
danielvincent
39e85754d8 nav should be collapsed into a filter list. comments are more clear. 2010-06-26 00:07:21 -07:00
maxwell
4d65cfab09 MS^2 Added the friends panel to application layout 2010-06-25 19:22:05 -07:00
maxwell
fba4ce9e3b DG MS; fixed flash message visual bug 2010-06-23 11:11:58 -07:00
maxwell
3064d208eb added firefox websocket stuffs, only loads if it is not safari or chrome 2010-06-22 14:31:16 -07:00
maxwell
f696ffc3a6 fixed up some views, but some stuff feels like it broke 2010-06-21 16:46:19 -07:00
danielvincent
06271d5821 added dumb partial switcher function in dashboard controller 2010-06-21 14:23:59 -07:00
danielvincent
26d675af11 some sass cleanup 2010-06-20 18:36:01 -07:00
danielvincent
c542c08e38 simpler 2010-06-20 17:06:10 -07:00
danielvincent
6647ce34ab status message and bookmark page 2010-06-20 14:52:04 -07:00
danielvincent
aee5f7f04f took out filler elements 2010-06-20 11:49:05 -07:00
danielvincent
df2b9d6ad4 more shuffling 2010-06-19 14:44:08 -07:00
danielvincent
0c392a0cce moved nav to bottom header 2010-06-19 03:01:39 -07:00
danielvincent
d1630b6c45 shrink that header 2010-06-19 00:53:42 -07:00
danielvincent
1223011a4f more semi-drastic changes. 2010-06-19 00:01:25 -07:00
danielvincent
de8d8d5cb5 in the shit 2010-06-18 23:32:47 -07:00