danielvincent
e56df5c159
fixed issue rendering partial for a comment in comments#create
2010-11-25 23:34:59 -05:00
Michael Sofaer and Raphael Sofaer
502b4dde30
Merge branch 'invitation_flow'
2010-11-25 23:18:01 -05:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd
Make the getting_started aspects page more like the manage page
2010-11-25 23:17:27 -05: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
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
Raphael
6e14018abb
Fixing http referer
2010-11-25 19:50:14 -05:00
Raphael
1fb58c53fb
Monkeypatching to change rails default logging to something more useful
2010-11-25 19:37:05 -05:00
zhitomirskiyi
037f822287
removed the puts
2010-11-25 19:37:05 -05:00
zhitomirskiyi
421078bd0b
if you create an aspect from the aspect manage page it redirects back there
2010-11-25 19:37:05 -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
e5673b304d
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-25 16:29:00 -08:00
zhitomirskiyi
a2d3a940a6
removed the puts
2010-11-25 16:20:09 -08:00
zhitomirskiyi
de75617070
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-25 16:19:30 -08:00
zhitomirskiyi
16d023e800
if you create an aspect from the aspect manage page it redirects back there
2010-11-25 16:18:39 -08:00
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
Dan Hansen & Sarah Mei
20cc5ac1f9
adding sarah & dan to the pairs file
2010-11-25 16:06:24 -08:00
Raphael
a061999e30
Don't inspect people in logging statements
2010-11-25 18:03:34 -05:00
MrZYX
24d4ea48ac
Merge branch 'russian_locale_corrections' of https://github.com/Vanuan/diaspora into Vanuan-russian_locale_corrections
2010-11-25 23:22:58 +01:00
Alec Leamas
2224e62cfe
Now, really pull pkg update :(
2010-11-25 23:17:46 +01:00
John Yani
7f64bf052f
Small russian locale fixes
2010-11-25 23:58:56 +02:00
MrZYX
72f8747c51
pulled locales, big thank you all contributors
2010-11-25 22:10:34 +01: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
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
