MrZYX
8c234fbaa4
forgot to add a new file
2010-12-13 15:19:16 +01:00
MrZYX
a89aa9c5ab
Merge branch 'bug_659_cross_browser_charcode' of https://github.com/themasch/diaspora into themasch-bug_659_cross_browser_charcode
2010-12-13 15:16:49 +01:00
MrZYX
a8d0d50173
pulled locales from rails-i18n. This overides the fix made to en-US.yml, please send it upstream
2010-12-13 15:11:22 +01:00
MrZYX
1284fcc92d
fix for #699
2010-12-13 15:04:11 +01:00
Mark Schmale
f5038cdc3c
replaced charCode by keyCode. On every browser, keyCode is filled
...
with the Unicode Character Code when used in keypress.
charCode is only supported in some browsers.
2010-12-13 11:55:54 +01:00
Dan Hansen
390587777f
more vendor prefix fixes
2010-12-13 01:21:54 -05:00
Dan Hansen
7c7254bf64
Vendor prefix police
2010-12-13 01:08:03 -05:00
Sarah Mei
3eaf7c48e6
white space police
2010-12-12 13:43:01 -08:00
Sarah Mei
7cd8e0f16b
Fix jasmine specs so that they fail when they're supposed to.
2010-12-12 12:57:11 -08:00
MrZYX
f2719e4c94
updated locales - as always all the honor goes to the people at 99translations
2010-12-12 17:11:31 +01:00
MrZYX
6cacfde6a6
two fixes to translations
2010-12-12 15:55:51 +01:00
danielvincent
2f2f8fef8a
delete/reshare only if current_user on stream_element
2010-12-12 01:41:54 -08:00
danielvincent
f7a7dff53b
allow for newlines in profile bio
2010-12-12 00:50:30 -08:00
danielvincent
d19353ed8f
added newline support to markdownify
2010-12-12 00:44:54 -08:00
Dan Hansen
6353f5f035
in firefox if you clicked the A with your handle and didnt hover over it it'd turn black because of screen.css:39
2010-12-12 01:49:13 -05:00
Dan Hansen
02bb2fa19f
hide reshare menu if you click somewhere it's not
2010-12-12 01:38:28 -05:00
Dan Hansen
8b1c8d6a1b
moz vendor prefix typo fix for .circle
2010-12-12 01:33:38 -05:00
Dan Hansen
c843b508c9
add vendor prefixes for the border radius on #new_request_pane
2010-12-12 01:29:05 -05:00
Dan Hansen
be9a7edf4d
vendor prefixes for border radius on #new_request_pane
2010-12-12 01:17:20 -05:00
Dan Hansen
55b16b00f4
Firefox sends charCode 0 when backspace is pressed
2010-12-12 01:09:47 -05:00
danielvincent
52a3996ad0
textareas auto expand
2010-12-11 22:18:03 -08:00
Dan Hansen
3b5ee72ed8
added that in the wrong place
2010-12-12 00:09:15 -05:00
Dan Hansen
20e2c2ed25
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-12 00:06:10 -05:00
Dan Hansen
aa40af24c9
fix http://bit.ly/fQLxaK ugliness
2010-12-12 00:05:55 -05:00
danielvincent
6c4ead4ac7
make favicon more like apple-touch-icon
2010-12-11 21:00:34 -08:00
Raphael
627561737c
Just get rid of some whitespace
2010-12-11 20:34:25 -08:00
danielvincent
b4170dc991
badges on stream elements. say 'all aspects' instead of listing out all user's aspect names
2010-12-11 20:28:40 -08:00
maxwell
91c331d630
fix to limit size of request box
2010-12-11 16:28:37 -08:00
MrZYX
0d70f78a12
small translation fix
2010-12-11 22:03:06 +01:00
Sarah Mei
0230a9bd37
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-11 12:32:44 -08:00
Sarah Mei
646603ffe0
Don't show rake output when running migrations_spec
2010-12-11 12:32:33 -08:00
danielvincent
c9b498d59c
resolved 500 page on getting_started#step_3
2010-12-11 12:05:58 -08:00
danielvincent
fd2cbc1cf4
added invite link to search page
2010-12-10 18:28:51 -08:00
danielvincent
6f62161442
invitation emails stripped of whitespace from form
2010-12-10 18:10:24 -08:00
danielvincent
2c5d5d9328
show already invited users on invitation#new
2010-12-10 18:05:08 -08:00
MrZYX
0b57ccd47f
fixed require
2010-12-10 21:49:09 +01:00
Raphael
2c141baf78
Capitalization...
2010-12-10 12:12:34 -08:00
Raphael
4bb9370c5d
Correctly stub the websocket redis method
2010-12-10 11:53:18 -08:00
maxwell
076d0e5edd
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-10 11:47:20 -08:00
maxwell
c774685d52
users can now disable email notfications
2010-12-10 11:47:10 -08:00
Raphael
461171f6d6
Take magent out of the initializer
2010-12-10 11:28:55 -08:00
Raphael
0e77577fbd
Websocket now uses redis
2010-12-10 11:25:38 -08:00
danielvincent
8de5c5babd
fixing request bar on aspects#manage
2010-12-10 10:12:30 -08:00
maxwell
95c31b18e2
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-10 09:58:03 -08:00
maxwell
533b2e45f2
updating queue order to have socket webfinger
2010-12-10 09:57:49 -08:00
MrZYX
1c306289f1
pulled locales. thank you contributors
2010-12-10 18:31:39 +01:00
MrZYX
36043845ca
fixed requires for ruby 1.9
2010-12-10 17:25:02 +01:00
MrZYX
0374ee436e
fixed untranslatable strings
2010-12-10 16:52:35 +01:00
Alec Leamas
eacee54846
Replace APP_CONFIG[:terse_pod_url] with uri object.
...
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684 ,
using the well-defined semantics of the uri object.
The pod_url is normalized using module URI's functions, always with a
trailing /.
The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se ;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
2010-12-10 14:29:19 +01:00
maxwell
416a36ea9a
ugh
2010-12-09 20:32:39 -08:00