ilya
|
5857838a0a
|
adding the new files
|
2010-09-23 12:29:00 -07:00 |
|
ilya
|
48c212c1ab
|
made a public view, copied the fb publisher there
|
2010-09-23 12:18:26 -07:00 |
|
danielvincent
|
0c2480c9be
|
DG IZ; quick form in user edit
|
2010-09-22 17:34:57 -07:00 |
|
danielvincent
|
26478403e2
|
DG IZ; connecting/disconnecting from fb
|
2010-09-22 17:14:58 -07:00 |
|
danielvincent
|
53c0aff23d
|
deploy from the right branch
|
2010-09-22 16:34:42 -07:00 |
|
danielvincent
|
8ed98270a6
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
config/routes.rb
|
2010-09-22 16:09:25 -07:00 |
|
danielvincent
|
81250c0e9d
|
Merge branch 'master' of github.com:diaspora/diaspora into reposting
|
2010-09-22 15:49:13 -07:00 |
|
danielvincent
|
e9d16cc09b
|
DG IZ; cleanup
|
2010-09-22 15:48:50 -07:00 |
|
Raphael
|
695e5fe396
|
Don't log huge encrypted params
|
2010-09-22 15:19:26 -07:00 |
|
danielvincent
|
5ef32b7d55
|
DG IZ; a user can repost. aspects are not sent through the websocket. post does not show where it curently is going in its partial
|
2010-09-22 12:03:25 -07:00 |
|
danielvincent
|
8941975224
|
DG IZ; example extension convention for app_config
|
2010-09-22 10:59:23 -07:00 |
|
Diógenes
|
c87ad060ab
|
Add translation (from English locale) to Brazilian Portuguese
|
2010-09-23 01:15:10 +08:00 |
|
ilya
|
6d6ca3d8bc
|
added terse_pod_url to the APP_CONFIG hash
|
2010-09-21 20:01:56 -07:00 |
|
ilya
|
d60dc03d35
|
removed app_config from repo
|
2010-09-21 18:10:26 -07:00 |
|
ilya
|
96aaf3093c
|
Make load_app_config more robust, point to the right folder in db seed
|
2010-09-21 18:04:36 -07:00 |
|
ilya
|
b01928af4b
|
RS IZ if yaml fails to load (empty config) file load the example
|
2010-09-21 17:52:23 -07:00 |
|
ilya
|
74a92a2637
|
tiny typo
|
2010-09-21 17:40:43 -07:00 |
|
ilya
|
e3d52bb467
|
putting the config file in a shared directory for in the deploy scripts
|
2010-09-21 17:39:44 -07:00 |
|
ilya
|
020ff603bd
|
terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml.
|
2010-09-21 16:59:06 -07:00 |
|
ilya
|
efd901dcd9
|
RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG
|
2010-09-21 15:46:57 -07:00 |
|
danielvincent
|
0a99b82bd3
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
|
2010-09-21 13:40:17 -07:00 |
|
danielvincent
|
9571ade89c
|
basic setup
|
2010-09-21 12:29:39 -07:00 |
|
ilya
|
5ffb5adb65
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 10:05:33 -07:00 |
|
danielvincent
|
e588d7ab6a
|
DG IZ moving friends is now ajaxy
|
2010-09-20 17:26:20 -07:00 |
|
Michael Kaeufl
|
3b59175f43
|
fix in header
|
2010-09-21 04:17:04 +08:00 |
|
Michael Kaeufl
|
12f667e1b6
|
de: Ausloggen -> Abmelden
|
2010-09-21 04:17:04 +08:00 |
|
Michael Kaeufl
|
3f12b8b675
|
de translation: abgemeldet -> gekündigt
|
2010-09-21 04:16:19 +08:00 |
|
Michael Kaeufl
|
782373cc51
|
de translation: wieder -> erneut
|
2010-09-21 04:16:18 +08:00 |
|
Raphael
|
747f7d11a0
|
Move thin yml back to development mode
|
2010-09-20 12:51:47 -07:00 |
|
gattytto
|
813dfae059
|
just a few 's' missing. :)
|
2010-09-21 02:01:48 +08:00 |
|
Alec Leamas
|
5e69292954
|
Typo fix
|
2010-09-21 01:50:56 +08:00 |
|
Alec Leamas
|
d1822d3dc8
|
Swedish translation
|
2010-09-21 01:50:46 +08:00 |
|
Ariel Zavala
|
1f78c3400b
|
Started Spanish Locale
|
2010-09-21 01:48:54 +08:00 |
|
MrBison
|
1e5fc556a3
|
oops, a stupid error fixed
|
2010-09-21 01:48:13 +08:00 |
|
MrBison
|
6294cf502d
|
oops, a stupid error.
|
2010-09-21 01:48:13 +08:00 |
|
Felix Gruber
|
88bb50660a
|
better translation from sennewood
|
2010-09-21 01:47:46 +08:00 |
|
Felix Gruber
|
83520f593c
|
some corrections from sennewood
|
2010-09-21 01:46:50 +08:00 |
|
Felix Gruber
|
852022ca79
|
change 'en' to 'de' in devise.de.yml
|
2010-09-21 01:46:50 +08:00 |
|
Felix Gruber
|
4c9ac0e5f6
|
initial german translation
|
2010-09-21 01:46:15 +08:00 |
|
Claudius Coenen
|
b8dc20e4bb
|
adding german translation
|
2010-09-21 01:42:16 +08:00 |
|
Mikhail Zubrov
|
718b0715b3
|
add a Russian translation
|
2010-09-21 01:41:01 +08:00 |
|
Maël Soucaze
|
c884a25da6
|
French localization updated with arielo's changes.
|
2010-09-21 01:40:25 +08:00 |
|
Maël Soucaze
|
77acb6268e
|
English localization updated with arielo's changes.
|
2010-09-21 01:40:25 +08:00 |
|
Maël Soucaze
|
aff4d783a6
|
French localisation.
|
2010-09-21 01:39:25 +08:00 |
|
Marcin Karpezo
|
a0a7d28e6d
|
fixed translation
|
2010-09-21 01:22:05 +08:00 |
|
Marcin Karpezo
|
9130c85718
|
Translated en.yml
|
2010-09-21 01:21:37 +08:00 |
|
Marcin Karpezo
|
445c6784eb
|
Translated devise.en.yml
|
2010-09-21 01:21:37 +08:00 |
|
moziz
|
850961f22e
|
Corrected a typo and switched a few words so that the it sounds more 'official' and not slang.
|
2010-09-21 01:20:20 +08:00 |
|
Daniele Di Sarli
|
5b75c1634d
|
corrected some Italian phrases
|
2010-09-21 01:04:49 +08:00 |
|
Raphael
|
60e29f6572
|
Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better.
|
2010-09-19 16:37:34 -07:00 |
|