Dan Hansen & Sarah Mei
|
792690bb80
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-25 16:07:53 -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 |
|
Raphael
|
a061999e30
|
Don't inspect people in logging statements
|
2010-11-25 18:03:34 -05:00 |
|
Sarah Mei
|
ef2fa21d06
|
person_image_link and object_path return empty strings if parameter is nil.
|
2010-11-25 12:26:46 -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 |
|
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
|
12c049fec2
|
Add logging to inviting
|
2010-11-25 01:06:25 -05:00 |
|
Raphael
|
08ba387311
|
More sane redirect on failing to accept an invitation
|
2010-11-25 00:39:13 -05:00 |
|
Raphael
|
eeac6901b9
|
Revert "Change invite button text"
This reverts commit d443b15c97.
|
2010-11-24 21:01:48 -05:00 |
|
Raphael
|
38a2ea5199
|
Remove auto-friending in db:reset for dev servers
|
2010-11-24 17:55:51 -05:00 |
|
Raphael
|
93ebbbb65f
|
put some logging in the mailer
|
2010-11-24 17:13:28 -05:00 |
|
maxwell
|
062593ee0f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-24 14:06:17 -08:00 |
|
maxwell
|
bd1cbdb297
|
adding drag to add people above friend accept box
|
2010-11-24 14:03:11 -08:00 |
|
Raphael
|
d443b15c97
|
Change invite button text
|
2010-11-24 16:48:24 -05:00 |
|
Sarah Mei
|
fa602cabf2
|
fix messaging around invitation success/failure
|
2010-11-24 09:34:05 -08:00 |
|
MrZYX
|
849072f283
|
this should fix #572
|
2010-11-24 17:48:47 +01:00 |
|
danielvincent
|
d7609ef647
|
fixed issue with photos#index not recognizing an already sent request.
|
2010-11-23 21:03:35 -08:00 |
|
zhitomirskiyi
|
9ca54a2282
|
accepting an invitation correctly adds the request to the user
|
2010-11-23 18:58:26 -08:00 |
|
danielvincent
|
0b36e955fe
|
check if profile exists before fetching profile photo
|
2010-11-23 14:49:32 -08:00 |
|
danielvincent
|
7c6bc7f7ea
|
removed debug info from layout
|
2010-11-23 12:32:39 -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 |
|
zhitomirskiyi
|
546e7876d5
|
correct logging of the invitation acceptance
|
2010-11-23 11:46:45 -08:00 |
|
danielvincent
|
efab6449b3
|
message for closed signups on users#sign_in
|
2010-11-23 11:14:26 -08:00 |
|
maxwell
|
ec41ace9bf
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-23 11:07:48 -08:00 |
|
maxwell
|
52b02176db
|
invited users seed aspects
|
2010-11-23 11:07:33 -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
|
9d98afb94f
|
took out fade on photos#index, because it only displayed all photos half the time.
|
2010-11-23 09:44:58 -08:00 |
|
maxwell
|
dab3725a9c
|
hotlinking image for invite
|
2010-11-23 09:39:53 -08:00 |
|
Raphael Sofaer
|
31a851e787
|
No guarantees on functionality here, editing from a browser.
|
2010-11-23 06:14:36 -08:00 |
|
MrZYX
|
ed3dc10f79
|
various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit
|
2010-11-23 14:02:13 +01: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
|
82d0e193e7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-23 01:17:05 -08:00 |
|
maxwell
|
bd31bc423f
|
MSSM added links to github and blog in header
|
2010-11-23 01:16:51 -08:00 |
|
danielvincent
|
376d403651
|
made publisher semi-hidden on home page
|
2010-11-23 00:34:28 -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
|
32390933e8
|
PALINDROME message for multiple emails
|
2010-11-23 00:14: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 |
|
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
|
7c09117230
|
fixing build
|
2010-11-22 19:05:35 -08:00 |
|
maxwell
|
0965b45f23
|
fixing getting started 2
|
2010-11-22 18:28:04 -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
|
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 |
|