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
73c7a1d339
Fix build, add more logging
2010-11-25 11:40:36 -05:00
Raphael
b4297ba858
Add logging statement to receive
2010-11-25 09:39:36 -05:00
Alec Leamas
052f96f48a
Pkg update
2010-11-25 15:01:24 +01:00
Alec Leamas
df31de2898
Generate all content in public/ before server starts.
...
Introduces a delay first time the server is started, but makes all resources
available to jammit. Can be disabled by flag in config/server.sh. Hopefully
silences jammit's messages about application.css et. al. not found
2010-11-25 14:22:21 +01: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
f4f864a4fb
Don't be obnoxious in the chrome frame
2010-11-24 21:36:34 -05:00
Raphael
eeac6901b9
Revert "Change invite button text"
...
This reverts commit d443b15c97
2010-11-24 21:01:48 -05:00
Raphael
bc1b64ced1
Fix magent run command
2010-11-24 18:38:17 -05:00
Raphael
ed35969084
incorrect onClose in WS js
2010-11-24 18:10:49 -05:00
Raphael
38a2ea5199
Remove auto-friending in db:reset for dev servers
2010-11-24 17:55:51 -05:00
MrZYX
86914f3f6d
swedish is perfect again :D, thanks Hexagon and all the others
2010-11-24 23:42:18 +01: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
MrZYX
64f2ec550d
polish is at 100%, thanks jandom
2010-11-24 22:19:14 +01:00
MrZYX
be7d36b7fb
updated locales - added macedonian thanks to stojmenovski
2010-11-24 21:31:01 +01:00
Raphael
a85f47041a
This file is generated by rake fixtures:users
2010-11-24 14:07:00 -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
MrZYX
cc163b13c6
lithuanian is at 100% now, thanks to tahu, Karolis Parfeniukas, Saulius Žemaitaitis and Evaldas Guogis - also some updates to other locales, as always big thank you to all contributors
2010-11-24 15:37:05 +01:00
danielvincent
d7609ef647
fixed issue with photos#index not recognizing an already sent request.
2010-11-23 21:03:35 -08:00
Raphael
9bb44e6cac
My mom cringed when she saw our front page
2010-11-23 23:57:01 -05:00
zhitomirskiyi
9ca54a2282
accepting an invitation correctly adds the request to the user
2010-11-23 18:58:26 -08:00
MrZYX
3a8c82c7b4
italian is at 100%, thanks silviorelli
2010-11-24 01:09:44 +01:00
danielvincent
6a6661d42b
prevent text overflow in stream
2010-11-23 15:58:23 -08:00
zhitomirskiyi
a038b512a0
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-23 15:49:58 -08:00
zhitomirskiyi
a9b503b65e
made the dev. util things pending
2010-11-23 15:49:50 -08:00
MrZYX
3fff04470f
Merge branch '99translations' of ../diaspora-fork
2010-11-24 00:41:52 +01:00
MrZYX
2d3f0b71e9
fixed issue in he.yml
2010-11-24 00:41:23 +01:00
danielvincent
03243a277f
took out slide animation on comments due to sluggish performance
2010-11-23 15:20:36 -08:00
MrZYX
c2e5b539d8
updated locales from 99translations. big thank you to all contributors
2010-11-24 00:08:59 +01:00
danielvincent
0b36e955fe
check if profile exists before fetching profile photo
2010-11-23 14:49:32 -08:00
zhitomirskiyi
8ed1865de8
removing dev util routes
2010-11-23 13:38:05 -08:00
danielvincent
7c6bc7f7ea
removed debug info from layout
2010-11-23 12:32:39 -08:00
danielvincent
d334ffb3fa
batch inviter takes an invite count for new users. default=10
2010-11-23 11:58:00 -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
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
danielvincent
5e8606169d
rolling back twitter gem to 0.9.12 release.
2010-11-23 10:55:40 -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
356d8ab23b
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/views/devise/mailer/invitation.html.haml
2010-11-23 09:40:45 -08:00
