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 |
|
zhitomirskiyi
|
92c777c13d
|
added java for jammit
|
2010-11-22 17:15:53 -08:00 |
|
maxwell
|
08aaccbdf1
|
Revert "--amend"
This reverts commit 7650870502.
|
2010-11-22 17:11:38 -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
|
21a90656fd
|
fixing translations
|
2010-11-22 16:55:06 -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
|
7650870502
|
--amend
|
2010-11-22 16:38:29 -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 |
|
zhitomirskiyi
|
efd9537e33
|
using ruby 1.8.7
|
2010-11-22 15:45:38 -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 |
|
zhitomirskiyi
|
6e1ed78861
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-22 14:55:42 -08:00 |
|
zhitomirskiyi
|
e84ce5591f
|
The discription in several places
|
2010-11-22 14:55:30 -08:00 |
|
zhitomirskiyi
|
edbb0bdf07
|
slightly more discriptive cannot remove the person from the last aspect messagge
|
2010-11-22 14:52:39 -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 |
|
Sarah Mei
|
ab37fd0d98
|
Fix type-o on front page, copy edit a bit.
|
2010-11-22 14:11:27 -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 |
|
zhitomirskiyi
|
7df35ade12
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-22 12:24:34 -08:00 |
|
zhitomirskiyi
|
1519fd46bf
|
Sending a request to someone who requested you autoaccepts the request
|
2010-11-22 12:21:26 -08: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 |
|
maxwell
|
f4ff48f5c0
|
commenting out mobile for now. photos now post from only a users photos
|
2010-11-22 10:26:00 -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
|
108ac9fd7c
|
resolved stray h3 tag in stream
|
2010-11-22 01:31:21 -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 |
|
danielvincent
|
9a18b7e6f3
|
photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level.
|
2010-11-22 00:32:46 -08:00 |
|
maxwell
|
7da5accee8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-21 23:48:44 -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 |
|
danielvincent
|
c841a47a37
|
status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE.
|
2010-11-21 23:42:49 -08:00 |
|
maxwell
|
60dd2f8e60
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-21 23:03:21 -08:00 |
|
danielvincent
|
55952d00c0
|
fixed failing photoscontroller spec.
|
2010-11-21 22:58:24 -08:00 |
|
maxwell
|
ce1768d0d3
|
fixing dropdown, and removing margin on publisher
|
2010-11-21 22:58:01 -08:00 |
|
danielvincent
|
8df864dec1
|
everyone -> 'all contacts' on home page. removed repeated user links.
|
2010-11-21 22:37:22 -08:00 |
|
danielvincent
|
a3ce55c308
|
allow nginx to take uploads up to 4MB. resolves issue when uploading large photos.
|
2010-11-21 22:36:37 -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 |
|
maxwell
|
c4a270ef8b
|
putting mobile interface back in so we can get it cleaned up
|
2010-11-21 17:14:43 -08:00 |
|
maxwell
|
40cc829419
|
fixing final cucumber spec
|
2010-11-21 16:53:09 -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 |
|