Commit graph

622 commits

Author SHA1 Message Date
Alexandre DE DOMMELIN
b0a123b270 Fix hidden fields issue in Iceweasel 2010-11-26 23:23:32 +01:00
Sarah Mei
f8229d07e8 Adding copyright to js files 2010-11-26 12:16:10 -08:00
Hexagon
f87ac4cb0b Adjusting YT-video size for posts 2010-11-26 17:28:08 +01:00
Hexagon
bd204c554e Fixing errors in application.sass 2010-11-26 16:20:12 +01:00
Hexagon
a520b371e1 Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master-fix 2010-11-26 16:18:41 +01:00
Dan Hansen & Sarah Mei
257d6f414a Top-level Diaspora object for js widget management 2010-11-25 22:24:25 -08:00
Dan Hansen & Sarah Mei
84face159d Removing unused js 2010-11-25 21:44:57 -08:00
Dan Hansen
37c2e52be9 Fixed styling for a video in a comment 2010-11-25 20:53:05 -08:00
danielvincent
7c6d5b8d27 cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating. 2010-11-25 23:14:45 -05:00
Dan Hansen
21fa3fff8c Styling for the youtube iframe 2010-11-25 19:54:09 -08:00
danielvincent
b56af997cb comment streams rendered expanded/collapsed initially by server. 2010-11-25 20:23:33 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00
Dan Hansen & Sarah Mei
eb314aa300 Fix application helper specs around youtube links 2010-11-25 16:29:30 -08:00
Dan Hansen & Sarah Mei
e78a86897a Video links now use data attributes and render in an iframe 2010-11-25 16:07:39 -08:00
Sarah Mei
050918a310 Added link to manage aspects page from sidebar.
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
2010-11-25 10:29:35 -08:00
Raphael
eeac6901b9 Revert "Change invite button text"
This reverts commit d443b15c97.
2010-11-24 21:01:48 -05:00
Raphael
ed35969084 incorrect onClose in WS js 2010-11-24 18:10:49 -05:00
Raphael
d443b15c97 Change invite button text 2010-11-24 16:48:24 -05:00
danielvincent
6a6661d42b prevent text overflow in stream 2010-11-23 15:58:23 -08:00
danielvincent
03243a277f took out slide animation on comments due to sluggish performance 2010-11-23 15:20:36 -08:00
danielvincent
c24150eca0 socketed posts now show up on home page. delete links are back in the stream. 2010-11-23 11:47:54 -08:00
danielvincent
9d98afb94f took out fade on photos#index, because it only displayed all photos half the time. 2010-11-23 09:44:58 -08:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
danielvincent
376d403651 made publisher semi-hidden on home page 2010-11-23 00:34:28 -08:00
danielvincent
97171b3083 resolved press logos 2010-11-22 21:20:03 -08:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
danielvincent
f725641eaf added shadow on diaspora text on landing page. 2010-11-22 20:53:20 -08:00
danielvincent
69cac02ade landing page fix 2010-11-22 20:35:30 -08:00
maxwell
ffedd9fa77 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 17:30:00 -08:00
maxwell
b283f5c579 pulling back needed partial 2010-11-22 17:29:51 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
2010-11-22 17:11:34 -08:00
danielvincent
c63319f127 aspect#show cleanup. added 3 icons. 2010-11-22 17:03:33 -08:00
maxwell
1adf93ace1 Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	config/locales/diaspora/en.yml
2010-11-22 16:40:01 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
Sarah Mei
bedc7ca41b Made landing page and log in views content-type agnostic.
Added an un-minified version of jquery-mobile for debugging.
2010-11-22 15:02:25 -08:00
danielvincent
26a11f7ab6 firefox bugfix on photo#show 2010-11-22 14:52:13 -08:00
danielvincent
0e7b1f5eb7 status messages and comments made by user will ajax onto the current page, and websocket everywhere else. 2010-11-22 14:52:13 -08:00
MrZYX
e72f4e1da7 translatable status is good again
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
2010-11-22 22:30:37 +01:00
danielvincent
8c6f3bddc3 added diaspora handle to home page with help text. added email address to account settings page. 2010-11-22 11:19:50 -08:00
danielvincent
857a4b5f11 photo large is now at 300px. a person's profile photo now references the larger size instead of medium. 2010-11-22 10:32:14 -08:00
danielvincent
c7ac90538a added some spacing between photos and text on stream 2010-11-22 01:57:51 -08:00
maxwell
cdbd9df15e Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 01:50:23 -08:00
maxwell
ae2b3d75c2 added some copy to the landing page, and some basic styling 2010-11-22 01:50:15 -08:00
danielvincent
cb837f5fd7 moved photo controls on photos#show to bottom of poloroid. make profile photo action gives feedback while loading. 2010-11-22 01:24:04 -08:00
maxwell
5c2d161146 small changes to mobile 2010-11-22 01:19:11 -08:00
maxwell
f0b9f0f406 making width of checkbox smaller 2010-11-21 23:48:36 -08:00
maxwell
3a99ec3f8c uploader now shows current file uploading, and progress 2010-11-21 23:44:20 -08:00
maxwell
ce1768d0d3 fixing dropdown, and removing margin on publisher 2010-11-21 22:58:01 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
752d50a6a9 editing captions on photos uses remote forms. removed photo in album from WSR. 2010-11-21 19:51:20 -08:00