MrZYX
bb49c227cd
updated locales, thank you all
2010-11-26 16:56:51 +01:00
MrZYX
16df4e5d94
Merge branch '602-add-i18n-to-make_public-in-publisher' of https://github.com/siefca/diaspora into siefca-602-add-i18n-to-make_public-in-publisher
2010-11-26 16:41:38 +01:00
Hexagon
3f8383cfd8
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-26 16:27:54 +01:00
Hexagon
2efb99adf5
Merge branch 'OhaiBBQ-master-fix'
2010-11-26 16:27:24 +01:00
MrZYX
57a7a0fe23
fixed some missing translations
2010-11-26 16:26:52 +01:00
Hexagon
bd204c554e
Fixing errors in application.sass
2010-11-26 16:20:12 +01:00
Hexagon
a520b371e1
Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master-fix
2010-11-26 16:18:41 +01:00
Paweł Wilk
7e2e95df76
Added i18n for 'make public' message in views/shared/_publisher.haml
2010-11-26 16:09:19 +01:00
Michael Sofaer and Raphael Sofaer
6eb1e461fb
nginx logs for splunk
2010-11-26 10:03:59 -05:00
MrZYX
4f67b72801
fixed build
2010-11-26 15:52:39 +01:00
MrZYX
e916e33482
pulled and merged request 509, thanks siefca
2010-11-26 15:48:08 +01:00
MrZYX
8cc57aed82
Merge branch '597-add-i18n-to-sign-up-button' of https://github.com/siefca/diaspora into siefca-597-add-i18n-to-sign-up-button
2010-11-26 15:34:46 +01:00
Dan Hansen & Sarah Mei
257d6f414a
Top-level Diaspora object for js widget management
2010-11-25 22:24:25 -08:00
Raphael
78fb5fec73
Absolute logpath for magent
2010-11-26 00:57:19 -05:00
danielvincent
417301088f
fixed build
2010-11-26 00:56:53 -05:00
Dan Hansen & Sarah Mei
84face159d
Removing unused js
2010-11-25 21:44:57 -08:00
Raphael
9a828f5215
Remove nginx logs unless we get a license for splunk
2010-11-26 00:37:29 -05:00
danielvincent
94d08954d9
401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation.
2010-11-26 00:19:19 -05:00
Dan Hansen & Sarah Mei
5075a7384b
allow hyphens in YouTube video IDs
2010-11-25 21:05:54 -08:00
Raphael
690951dcd1
Take a query out of the views
2010-11-25 23:53:45 -05:00
Raphael
33ba00377e
Add performance spec
2010-11-25 23:53:45 -05:00
Dan Hansen
37c2e52be9
Fixed styling for a video in a comment
2010-11-25 20:53:05 -08:00
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
Dan Hansen
21fa3fff8c
Styling for the youtube iframe
2010-11-25 19:54:09 -08: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
Paweł Wilk
c7059a58da
Added i18n for "Sign up for invite" button.
2010-11-26 01:38:08 +01: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
Paweł Wilk
8138473b91
Unscoped 'contacts' and 'new_requests' translation keys and modified en.yml accordingly.
2010-11-26 00:47:02 +01:00
Paweł Wilk
e1a965c2fb
Added multiple plurals for translations of 'contacts' and 'requests'.
...
- Added multiple plurals handling for .contacts token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .new_requests token in views/shared/_aspect_contacts.haml,
- Added multiple plurals handling for .contacts token in views/aspects/show.html.haml.
2010-11-26 00:47:02 +01: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
