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
maxwell
23e635bf20
i am an idiot
2010-12-09 20:30:38 -08:00
maxwell
78979bca6a
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-09 20:25:00 -08:00
maxwell
645519be32
require twitter and facebook?
2010-12-09 20:24:45 -08:00
danielvincent
abcd3ca5b0
time ago in words down to seconds
2010-12-09 20:13:46 -08:00
danielvincent
624cb45ee2
fixed aspect nav FF bug
2010-12-09 20:09:21 -08:00
danielvincent
5731f32cfe
add correct page titles
2010-12-09 20:09:20 -08:00
Raphael
fc73c02c3a
Fix hashes_for_person spec
2010-12-09 20:01:37 -08:00
maxwell
58dafd6792
get rid of post in service
2010-12-09 20:00:56 -08:00
maxwell
1ad3dee0dc
another warning message in migration
2010-12-09 19:29:25 -08:00
maxwell
30e86c9d6a
add further warning
2010-12-09 19:29:25 -08:00
maxwell
dfbc01ca7a
added a test for the converter rake task
2010-12-09 19:29:25 -08:00
maxwell
bf56364019
tests for post to services resque job
2010-12-09 19:29:25 -08:00
maxwell
d81aa7dfe1
added specs for push_to_services, also rename the socket webfinger job spec because since it did not end with '_spec' it was not getting run
2010-12-09 19:29:25 -08:00
maxwell
9d37b2a749
small bugfixes for services refactor
2010-12-09 19:29:25 -08:00
maxwell
8fe2eb3180
starting migrations
2010-12-09 19:29:25 -08:00
maxwell
a4336a8e72
moar tests for services
2010-12-09 19:29:25 -08:00
maxwell
041e747db6
MSSM services are now broken out into seperate classes, and we cleaned up posting to them
2010-12-09 19:29:25 -08:00
Raphael
2be0666d80
Remove query from aspects manage, correct spec in User spec
2010-12-09 19:11:47 -08:00
Raphael
778c62e0b0
Use mail css partial
2010-12-09 19:11:47 -08:00
danielvincent
eaeb55f65b
make aspect tabs look less cluttered
2010-12-09 19:04:03 -08:00
maxwell
3625a5f2f1
display a basic message for when nothing was searched for
2010-12-09 16:51:58 -08:00
