danielvincent
ee47a2ffda
fixed diaspora logo asset on landing page
2010-12-01 16:18:13 -08:00
root
5d31a24e9e
fixed spec, jquery event binding doesnt call the function itself, but a 'clone' of the function
2010-12-02 02:54:38 +03:00
root
5cd0a60073
Moved to it's own file, added specs
2010-12-02 02:22:05 +03:00
danielvincent
d392239355
removed brandongrotesque from repo, logos are now assets.
2010-12-01 11:45:54 -08:00
Dan Hansen & Sarah Mei
b2f4e064fc
stream.js now semi-split into functions (still needs work); specs for toggling comments
2010-11-30 16:24:11 -08:00
root
bfcb7b48b3
4realz4realz
2010-11-30 16:24:11 -08:00
root
faf5baf4c5
Remove expand comments from the window namespace
2010-11-30 16:24:11 -08:00
danielvincent
601284a171
make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo.
2010-11-30 15:58:26 -08:00
Raphael
57485e7093
Move aspect contacts pane js to public
2010-11-30 13:55:37 -08:00
maxwell
0f6b322333
Merge https://github.com/OhaiBBQ/diaspora into OhaiBBQ-06464cb
2010-11-29 17:17:01 -08:00
maxwell
96776f93f9
we need this for socketing... sorry
2010-11-29 16:19:36 -08:00
root
06464cbfe8
Youtube videos now show themselves after the rest of the messages
2010-11-29 23:25:34 +03:00
danielvincent
2c22941e2f
fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show.
2010-11-28 20:16:57 -05:00
danielvincent
05174436c0
comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner).
2010-11-28 18:51:27 -05:00
danielvincent
d7c5e12d64
move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again.
2010-11-28 02:30:25 -05:00
danielvincent
3ada121d0b
contact-js as its own file
2010-11-28 00:29:22 -05:00
Raphael
8f67f90307
wtf weird chars in the JS
2010-11-27 22:32:20 -05:00
danielvincent
d65ba2f291
removing contact pictures from contact list re aspects#show
2010-11-27 17:25:40 -05:00
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
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
danielvincent
069b372c19
photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http.
2010-11-21 16:30:47 -08:00
danielvincent
bd0c21a634
button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test.
2010-11-21 16:30:46 -08:00
danielvincent
d16a4601c2
contact list on aspect#show is ajaxy
2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2
user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion.
2010-11-21 16:30:45 -08:00
maxwell
4742f61925
made the rss button a link to the feed, and aligned correctly
2010-11-21 16:13:03 -08:00
danielvincent
a9a91c436a
user menu is a button. fixed remove aspect button on aspect#show
2010-11-21 16:13:03 -08:00
maxwell
16141bf1ff
removed ... from user name, spread out menu, added a hover state to dropdown elements
2010-11-21 16:13:02 -08:00
maxwell
4ce337bbed
display a users username in the final step
2010-11-21 16:13:02 -08:00
maxwell
0b13168ba2
remove zindex on photo uploader so the dropdown menu is above it
2010-11-21 16:13:02 -08:00
maxwell
f4445a1a0d
removed ... from user name, spread out menu, added a hover state to dropdown elements
2010-11-21 16:13:02 -08:00
danielvincent
6e603bf2af
aspect#show does not display search for contacts if user does not have any. aspect#index displays search box where all contact pictures go if user does not haveany contacts.
2010-11-21 16:13:02 -08:00
maxwell
39f596462e
saying sent on requests via js
2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6
DG MS; status messages can now have photos.
2010-11-21 16:13:01 -08:00
maxwell
7f97b6f812
MS DG form now works reasonably well. still need to limit number of photos
2010-11-21 16:13:00 -08:00
maxwell
fb0dc2db7e
added photos to status messages
2010-11-21 16:13:00 -08:00
danielvincent
f6491816a3
adding a contact on an aspect page does not produce a fancybox anymore. more ui fixing.
2010-11-21 16:13:00 -08:00
maxwell
7fb751b00c
making photo uploader work better
2010-11-21 16:11:55 -08:00
danielvincent
242d0ab9c5
a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box.
2010-11-21 16:11:55 -08:00
danielvincent
52cde14221
more touchups
2010-11-21 16:11:54 -08:00
danielvincent
2b54d9a0c5
adjusting more page structure. drafting about there.
2010-11-21 16:10:54 -08:00
danielvincent
7a259d6d53
drafted a basic structure
2010-11-21 16:09:27 -08:00
Raphael
6f0d008914
Move WebSocketReceiver out to a js file
2010-11-21 16:14:36 -05:00
Raphael
7db1da935a
Stream is a class
2010-11-21 13:21:42 -05:00
zhitomirskiyi
9a31d15c92
added icons for the connected services and to indicate the rss feed
2010-11-18 12:19:58 -08:00
maxwell
9882fa183d
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 23:19:27 -08:00
maxwell
2ffd2d93e3
made mailchimp form ssl
2010-11-17 23:19:12 -08:00
Sarah Mei
64237534fd
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 22:31:21 -08:00
Sarah Mei
c19ebcece3
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
2010-11-17 22:28:24 -08:00
maxwell
c6778b942f
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/views/layouts/application.html.haml
2010-11-17 21:57:48 -08:00
maxwell
31d33054ef
added jammit, now js and css compress for production
2010-11-17 21:51:59 -08:00
danielvincent
9041a81fea
cleaned up meta and link tags in layout, added retina iOS icon, fixed error caused in stream_element when socketing
2010-11-17 21:21:00 -08:00
danielvincent
056dc7d3ba
DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.
2010-11-17 19:37:08 -08:00
danielvincent
a7c1733093
firefox fixes and added links to press articles on landing page
2010-11-17 19:37:08 -08:00
danielvincent
f59f6be4b0
users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp.
2010-11-17 19:37:08 -08:00
maxwell
e959e529ff
ga looks like it only likes if the code is pasted...hrmpf
2010-11-17 12:29:58 -08:00
maxwell
ba620e5400
spell vendor correctly
2010-11-17 12:25:09 -08:00
maxwell
643950cf52
added google a
2010-11-17 12:16:44 -08:00
maxwell
6a695479f7
adding updated jquery UI for compatability
2010-11-16 23:58:16 -08:00
maxwell
f55509085a
upgraded jquery, and deleted a second version of both jqueries
2010-11-16 21:41:20 -08:00
Raphael
e2412d2e43
Add error messages for friending from aspect-manage
2010-11-16 18:00:55 -08:00
Raphael
c0414b8184
Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts
2010-11-16 16:18:16 -08:00
Sarah Mei
45e47513c2
AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly
2010-11-14 21:49:36 -08:00
danielvincent
969c668518
translation fix on _person.haml. button tweak
2010-11-13 12:10:09 -08:00
danielvincent
988e2afe3d
resolved missing translation, tweaked button css, commented out mobile_fu in application controller
2010-11-13 00:26:55 -08:00
danielvincent
ed50fe7f1f
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08:00
Sarah Mei
6c439608f0
started specs for AspectEdit.deletePersonFromAspect
2010-11-12 17:04:15 -06:00
Sarah Mei
506d13335a
Finally have complete specs for AspectEdit.onDropMove.
2010-11-12 16:05:17 -06:00
Sarah Mei
b77547e940
Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend
2010-11-12 14:51:16 -06:00
Sarah Mei
feec6d971d
More specs for aspect edit JS
2010-11-12 13:40:23 -06:00
danielvincent
3b303e1cf2
adding fancybox assets back
2010-11-11 19:42:11 -08:00
danielvincent
85e2316280
Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect
2010-11-11 19:41:12 -08:00
Sarah Mei
ca9331970a
Renaming image_picker to image-picker since js likes dashes better than underscores
2010-11-10 10:52:33 -07:00
maxwell
f7cc01ceb2
more work done. much more to go
2010-11-09 15:29:43 -08:00
maxwell
034d7ee2b1
first commit
2010-11-09 15:29:43 -08:00
maxwell
bc0263f16e
added white background for search box, so at least it shows up in opera. thx Pistos
2010-11-09 12:14:46 -08:00
maxwell
7ca6677b33
making publisher submit button have a higher zindex
2010-11-08 10:18:00 -08:00
danielvincent
d7172767ba
moved fancybox assets to vendor/css
2010-11-07 12:24:54 -08:00
danielvincent
58ce81f674
Add a person to aspect contains a searchable list as opposed to a dropdown.
2010-11-07 12:20:33 -08:00
danielvincent
0127c9eb6f
people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif
2010-11-07 11:07:37 -08:00
Sarah Mei
32d953f457
Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.
2010-11-06 16:50:07 -07:00
danielvincent
020cd90341
aspect labels on people#show view
2010-11-06 11:09:11 -07:00
danielvincent
ecfcc96f8e
Post a message to aspect dialog will only display if people are present.
2010-11-05 21:14:00 -07:00
danielvincent
9a055b6cba
Photo partial now has a description and a link to view all photos by that person.
2010-11-05 17:27:36 -07:00
maxwell
e4f8f558a0
aspects now have a max length of 20 characters
2010-11-05 17:18:20 -07:00
danielvincent
bd9aa90278
User receives notification on new comment on post on any page.
2010-11-05 14:18:22 -07:00
maxwell
997f9ad8d0
making profile not look so bad
2010-11-05 00:54:09 -07:00
Raphael
aac9080299
smells like... greenery
2010-11-04 19:45:23 -07:00
Raphael
abebd18c98
Move getting_started self link color to a css class
2010-11-04 19:29:15 -07:00
danielvincent
be916384a1
collapsed remove from aspect and remove person into one function on aspects#manage
2010-11-04 17:50:48 -07:00
danielvincent
2c24eba49c
make profile photo button on photos#show works again
2010-11-04 16:04:58 -07:00
Raphael
152025f912
Update flashsocket
2010-11-04 12:01:39 -07:00
Sarah Mei
dbdd6884a7
SM MS jasmine specs for aspect edit
2010-11-03 22:19:20 -07:00
danielvincent
a995d250f1
added white text on grey asset to mailer
2010-11-02 17:19:49 -07:00
danielvincent
fff43bf650
profile defaults key searchable to true. search takes searchable into account.
2010-11-02 16:12:42 -07:00
Sarah Mei
fad9c09212
refactor aspect-edit.js in prep for jasmine testing
2010-11-02 13:37:27 -07:00
Raphael
fd0f3a9a1c
Fix reshare, user_menu
2010-11-01 17:30:10 -07:00
Raphael
47f040f740
Use jquery id selector
2010-11-01 16:45:09 -07:00
OhaiBBQ
a548ab1345
Small optimizations
2010-11-01 14:58:53 -07:00
OhaiBBQ
8b0d20dec7
Small optimizations
2010-11-01 14:45:51 -07:00
OhaiBBQ
94e4c22fcf
Fixed some tabbing
...
Removed some more unneeded jQuery object constructors for the button fancyboxes
Replaced event.target with the this keyword
2010-11-01 14:23:16 -07:00
OhaiBBQ
175e5bdc30
Added strict equality operator to #publisher and #stream keydown event
...
Added caching of the $container jQuery object
Added caching of $controls and $this in the .make_profile_photo click event
changed the success callback to use this.src = photo_url; instead of creating a new jQuery object
2010-11-01 10:37:07 -07:00
