MrZYX
6357cd3b95
updated locales - added slovenian and hungarian to languages.yml
2010-12-19 15:01:59 +01:00
MrZYX
b52718e913
small translation fix
2010-12-19 14:41:47 +01:00
MrZYX
6afba8fb7b
updated locales
2010-12-18 16:07:49 +01:00
MrZYX
c3a79f7298
some fixes to translations
2010-12-18 15:25:21 +01:00
maxwell
bcca61af6b
infinate scroll
2010-12-18 01:33:33 -08:00
maxwell
84c041ba6a
aspects streams now ajax
2010-12-17 19:41:42 -08:00
danielvincent
f6701f2262
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-17 19:29:17 -08:00
maxwell
b3c63a3cc0
you can now unset the year of your birthday"
2010-12-17 18:05:13 -08:00
maxwell
2e85a9fe66
notifications now can be read
2010-12-17 17:06:49 -08:00
Raphael
2545de6470
Revert "i can haz right timezone?"
...
This reverts commit 6d233e5eed
2010-12-17 16:44:57 -08:00
danielvincent
6afb7a6bd5
Revert "added configuration for cloudfile cdn"
...
This reverts commit 0d5ac3bd36
2010-12-17 14:30:02 -08:00
danielvincent
0d5ac3bd36
added configuration for cloudfile cdn
2010-12-17 12:26:20 -08:00
maxwell
6d233e5eed
i can haz right timezone?
2010-12-17 11:52:52 -08:00
maxwell
3c3e03993a
make the two links on comment notifications clearer
2010-12-17 11:48:08 -08:00
maxwell
92bbe4cd4c
added link to changelog, updated notifications
2010-12-16 18:28:22 -08:00
maxwell
b8a0abd122
updating notification views
2010-12-16 18:07:43 -08:00
danielvincent
28a22d9fc3
increase session timeout from 10 minutes to 1 day
2010-12-16 17:24:25 -08:00
danielvincent
b4b6189321
time out a user session via devise after 10 minutes of inactivity
2010-12-16 15:50:00 -08:00
danielvincent
f821f49db1
added similar contacts to contact pages
2010-12-16 11:49:08 -08:00
maxwell
d5ba34f245
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 18:05:54 -08:00
Raphael
3b727dc887
Add share_with fancybox on search page, fix a couple of queries
2010-12-15 17:45:12 -08:00
maxwell
8ec85d3b12
basic notifications
2010-12-15 17:31:36 -08:00
Raphael
b22398951e
Send requests from the aspect list on the person show page
2010-12-15 14:48:14 -08:00
MrZYX
14f2341ae1
updated locales
2010-12-15 21:26:27 +01:00
Dan Hansen & Sarah Mei
82e2f23f91
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 14:29:33 -05:00
Raphael
bd31ff3ee3
Fix request validations, build.
2010-12-15 10:48:29 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa
added vimeo method, still needs support from lib/youtube_titles.rb. updated locales
2010-12-15 01:20:53 -05:00
maxwell
0119de4afc
adding task to fix users with periods
2010-12-14 18:45:10 -08:00
maxwell
5d336d20e8
spelling fix
2010-12-14 17:36:27 -08:00
danielvincent
b1c0facfe6
initiating a request now just creates a pending contact instead of persisting a request
2010-12-14 17:11:43 -08:00
maxwell
2bc849fa90
only show permalink if the post is infact public. also, make destroy delete
2010-12-13 18:45:54 -08:00
danielvincent
d6bb5291bc
Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"
...
This reverts commit 2ac54eeffe3a13657087
2010-12-13 17:16:56 -08:00
maxwell
bcaeabdb87
remove some fields from our log that I dont want to see and dont help with managing a seed
2010-12-13 15:50:01 -08:00
mblog
d0355fdd43
Feature #348 : Change Email
2010-12-13 22:14:52 +01:00
MrZYX
c97af9cd03
pulled locals from 99translations
2010-12-13 16:20:05 +01:00
MrZYX
8c234fbaa4
forgot to add a new file
2010-12-13 15:19:16 +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
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
52a3996ad0
textareas auto expand
2010-12-11 22:18:03 -08:00
MrZYX
0d70f78a12
small translation fix
2010-12-11 22:03:06 +01:00
danielvincent
fd2cbc1cf4
added invite link to search page
2010-12-10 18:28:51 -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
MrZYX
1c306289f1
pulled locales. thank you contributors
2010-12-10 18:31:39 +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
3625a5f2f1
display a basic message for when nothing was searched for
2010-12-09 16:51:58 -08:00
Raphael
3a4caca397
Fix photo uploading in profile photos, style photo upload button better
2010-12-09 13:06:31 -08:00
