Raphael
|
a315b489f1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-06 18:19:38 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -07:00 |
|
Raphael
|
caffd8f9ff
|
Don't check for servers that aren't there
|
2010-10-05 17:58:48 -07:00 |
|
Raphael
|
79f19b6870
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:46:25 -07:00 |
|
Raphael
|
de9cdfbe7b
|
Always set the FACEBOOK constant
|
2010-10-05 17:46:14 -07:00 |
|
Yaron Shahrabani
|
77d5b68e15
|
Fixed some typos
|
2010-10-06 08:29:58 +08:00 |
|
Daniele Di Sarli
|
5074d2f8f2
|
Updated Italian translation
|
2010-10-06 08:25:29 +08:00 |
|
Raphael
|
22f90086ca
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 16:58:06 -07:00 |
|
Raphael
|
37fb2bfd32
|
Don't require a facebook yml
|
2010-10-05 16:57:22 -07:00 |
|
UserAd
|
1d0a4579f6
|
Add missing localization for aspect managment
|
2010-10-06 07:56:23 +08:00 |
|
UserAd
|
e7c153df4e
|
Add translation support in profile ('or' between buttons). Fix Russian locale
|
2010-10-06 07:56:23 +08:00 |
|
danielvincent
|
33e478229e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 13:40:10 -07:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
ilya
|
45d40f27d9
|
changed the deploy config back to master
|
2010-10-05 13:06:55 -07:00 |
|
ilya
|
85f71aa4aa
|
added the deploy task to symlink the fb_config
|
2010-10-05 12:38:20 -07:00 |
|
ilya
|
82455981b8
|
added fb_config to gitignore
|
2010-10-05 12:21:33 -07:00 |
|
Raphael
|
1fa732498b
|
Update sprinkle script
|
2010-10-05 11:55:47 -07:00 |
|
Raphael
|
bb88a6fb8c
|
Merge branch 'salmon-refactor'
|
2010-10-05 09:47:10 -07:00 |
|
Raphael
|
be909e27d6
|
Deleting adams
|
2010-10-04 14:49:27 -04:00 |
|
Raphael
|
2cd8cf0621
|
Remove a bunch of deleted backer servers
|
2010-10-02 20:30:37 -04:00 |
|
ilya
|
88dafbf5cc
|
changed deploy branch
|
2010-10-02 13:29:36 -07:00 |
|
danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
danielvincent
|
44c29cf8e6
|
deploy_config back to master
|
2010-09-27 21:57:52 -07:00 |
|
danielvincent
|
eb7244e07c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 19:07:01 -07:00 |
|
danielvincent
|
26a4dc76a6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 18:34:55 -07:00 |
|
danielvincent
|
3b8ddf76a3
|
temp route for atom feed. also, public atom currently displays all posts.
|
2010-09-27 18:34:47 -07:00 |
|
ilya
|
a8f05244ba
|
localization should be fixed
|
2010-09-27 16:07:24 -07:00 |
|
ilya
|
50234b095b
|
had to move translation around slightly, now the profile edit will be missing a template
|
2010-09-27 16:02:08 -07:00 |
|
ilya
|
08b9aa864a
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
|
2010-09-27 15:39:50 -07:00 |
|
ilya
|
8f55852ea9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 15:30:27 -07:00 |
|
ilya
|
b823213c0d
|
added a generate:secret_token task, and added an initializer to generate one if the file does not exist
|
2010-09-27 15:29:55 -07:00 |
|
Guillermo
|
1a876355d5
|
Some fixes in spanish locale
|
2010-09-28 03:02:47 +08:00 |
|
Daniele Di Sarli
|
6b9bcfda63
|
Corrected Italian translation
|
2010-09-28 02:41:59 +08:00 |
|
Raphael
|
2f31e036e3
|
Merge branch 'cz' of http://github.com/koo5/diaspora
|
2010-09-27 11:36:04 -07:00 |
|
Raphael
|
ef2647c188
|
Merge branch 'master' of http://github.com/yarons/diaspora
|
2010-09-27 10:52:32 -07:00 |
|
Raphael
|
1e495c676c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 10:39:41 -07:00 |
|
Raphael
|
139102e488
|
Merge branch 'master' of http://github.com/bastos/diaspora
|
2010-09-27 10:11:28 -07:00 |
|
Yaron Shahrabani
|
08c0c345f5
|
Updated Hebrew translation
|
2010-09-27 09:49:38 +02:00 |
|
ilya
|
f36b99b03c
|
changed the deploy_config to play on remote
|
2010-09-26 22:13:28 -07:00 |
|
Dorian
|
611852bb74
|
Use rake whitespace:cleanup
|
2010-09-26 12:53:22 -04:00 |
|
Dorian
|
e792344c0e
|
Use improved whitespace:scrub_gratuitous_newlines
|
2010-09-26 12:52:39 -04:00 |
|
Dorian
|
6ffc03a4c9
|
Big clean up: delete trailing whitespace
|
2010-09-26 12:48:40 -04:00 |
|
Stephen Caudill
|
fd69f0201f
|
User creates an aspect
|
2010-09-26 12:05:39 -04:00 |
|
Stephen Caudill
|
05c2da81e5
|
Add cucumber and run the generator
|
2010-09-26 11:35:50 -04:00 |
|
koo5
|
28e925e40a
|
More czech translation goodness. I've added distance_in_words translations, feel free to delete it if it belongs somewhere/sometime else.
|
2010-09-26 06:01:39 +02:00 |
|
Yuval Adam
|
f2ddb8a39c
|
added Hebrew (he) locale files
|
2010-09-26 04:49:39 +08:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Tiago Bastos
|
5a4f40591d
|
Added missing translations.
|
2010-09-25 11:25:45 -03:00 |
|
Raphael
|
beda67aca6
|
Shorten git show stuff
|
2010-09-24 17:51:51 -07:00 |
|
danielvincent
|
d59330264d
|
fixed syntax error in italian locale
|
2010-09-24 16:18:41 -07:00 |
|