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 |
|
Sarah Mei
|
287b79ab17
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-24 22:09:25 -08:00 |
|
Sarah Mei
|
aa4a61870c
|
you can click on photos in manage aspects to see profiles
|
2010-11-24 22:09:14 -08:00 |
|
Raphael
|
08ba387311
|
More sane redirect on failing to accept an invitation
|
2010-11-25 00:39:13 -05:00 |
|
Raphael
|
a85f47041a
|
This file is generated by rake fixtures:users
|
2010-11-24 14:07:00 -05:00 |
|
zhitomirskiyi
|
9ca54a2282
|
accepting an invitation correctly adds the request to the user
|
2010-11-23 18:58:26 -08:00 |
|
zhitomirskiyi
|
a9b503b65e
|
made the dev. util things pending
|
2010-11-23 15:49:50 -08:00 |
|
zhitomirskiyi
|
3f737116d6
|
since there is only one person with that name in the db, it returns a redirect
|
2010-11-23 11:02:17 -08:00 |
|
zhitomirskiyi
|
ebaf2c081e
|
returning nothing on empty query and limit the returning of the query to 90
|
2010-11-23 10:02:01 -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 |
|
maxwell
|
709e348457
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
spec/fixtures/users.yaml
|
2010-11-23 00:15:26 -08:00 |
|
maxwell
|
da16e3ee1e
|
PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once
|
2010-11-23 00:08:30 -08:00 |
|
Dan Goldenberg
|
bfc1fa4da0
|
added getting_started text and new press logos
|
2010-11-22 21:07:01 -08:00 |
|
maxwell
|
7c09117230
|
fixing build
|
2010-11-22 19:05:35 -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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
4ce337bbed
|
display a users username in the final step
|
2010-11-21 16:13:02 -08:00 |
|
maxwell
|
9b7d2ed0f6
|
DG MS; status messages can now have photos.
|
2010-11-21 16:13:01 -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 |
|
Raphael
|
b991df9d3a
|
WSR spec working
|
2010-11-21 16:19:25 -05:00 |
|
Raphael
|
6f0d008914
|
Move WebSocketReceiver out to a js file
|
2010-11-21 16:14:36 -05:00 |
|
Raphael
|
0daffb7fed
|
Add a couple specs, refactor in connecting
|
2010-11-21 14:09:39 -05:00 |
|
Raphael
|
4ce2de55e2
|
Fix photo show, js on people search page
|
2010-11-21 13:29:50 -05:00 |
|
zhitomirskiyi
|
3d5cf8f625
|
added a panding cross path request spec
|
2010-11-19 18:53:46 -08:00 |
|
Raphael
|
655e92ebdd
|
Add some scopes for Request, take putses out of specs
|
2010-11-18 18:04:29 -08:00 |
|
zhitomirskiyi
|
c2dcf9a074
|
fixed the invite spec
|
2010-11-18 16:55:44 -08:00 |
|
zhitomirskiyi
|
d0d261fdae
|
zero default invites, the rake task starts people with 5 invites
|
2010-11-18 16:23:35 -08:00 |
|
maxwell
|
c0d10ef174
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-18 15:36:47 -08:00 |
|
maxwell
|
747ab761a0
|
pushing mailer spec for ilya
|
2010-11-18 15:36:30 -08:00 |
|
zhitomirskiyi
|
0e171e8504
|
added a fixed the pending request query
|
2010-11-18 15:22:14 -08:00 |
|
Raphael
|
61692c1da6
|
Fix translation missing in inv mailer
|
2010-11-18 12:50:46 -08:00 |
|
Raphael
|
be55384628
|
Add pending spec to invitations
|
2010-11-18 11:21:35 -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
|
f01fca1877
|
letting jammit do its default thing
|
2010-11-17 22:18:15 -08:00 |
|
danielvincent
|
1a9041a3c0
|
DG MS; fixed cucumber tests to work with new landing page flow
|
2010-11-17 19:49:01 -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 |
|
Raphael
|
4853a55d9b
|
Don't expect raises from user receive
|
2010-11-17 15:35:25 -08:00 |
|
maxwell
|
2c627cdb2b
|
updating jas
|
2010-11-17 00:16:11 -08:00 |
|
maxwell
|
f81bb1d7e7
|
i broke the jasmine tests. this is me fixin them
|
2010-11-16 22:02:18 -08:00 |
|