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 |
|
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 |
|
sennewood
|
dcedc5d505
|
Added the missing lines of code and translated them.
|
2010-09-25 06:39:59 +08:00 |
|
sennewood
|
16e5f972d1
|
Translation correction
|
2010-09-25 06:39:59 +08:00 |
|
sennewood
|
e2db21d7b0
|
Use double quotes in locale files
|
2010-09-25 06:39:59 +08:00 |
|
Daniele Di Sarli
|
8323e7dcb2
|
Added Italian translation
|
2010-09-25 06:35:43 +08:00 |
|
Raphael
|
70a22ae839
|
Merge branch 'master' into HEAD
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
|
2010-09-24 09:15:10 -07:00 |
|
Raphael
|
8690967509
|
defaults doesn't really make sense when there's nothing else
|
2010-09-23 14:58:17 -07:00 |
|
Raphael
|
972cb54828
|
Move locale files, fix syntax error in fr-informal
|
2010-09-23 14:52:06 -07:00 |
|
Raphael
|
82bc5b097d
|
Use double quotes in locale files
|
2010-09-23 14:43:38 -07:00 |
|
UserAd
|
cfd3523030
|
Stupid error fix
|
2010-09-24 05:02:30 +08:00 |
|
UserAd
|
7a9e347b28
|
Improved russian locale
|
2010-09-24 05:02:30 +08:00 |
|
Maël Soucaze
|
49162a6ead
|
The underscore (fr_informal) is replaced by the hyphen (fr-informal).
|
2010-09-24 04:51:49 +08:00 |
|
Maël Soucaze
|
4cd83f9ae9
|
Change the file organization, and Casual Honorifics is now Informal Honorifics.
|
2010-09-24 04:51:49 +08:00 |
|
Maël Soucaze
|
d7eb828064
|
Language fix.
|
2010-09-24 04:51:48 +08:00 |
|
Maël Soucaze
|
c243304c97
|
Welcome to the French Casual Honorifics localization thanks to the brainchild of michael-k!
|
2010-09-24 04:51:03 +08:00 |
|
ilya
|
c31489b42b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 12:31:40 -07:00 |
|
ilya
|
04e670f0d0
|
deploy script now uses public url
|
2010-09-23 12:31:19 -07:00 |
|
Raphael
|
cfe019d7a9
|
Take out async controller until we actually put it in the app
|
2010-09-23 12:19:28 -07:00 |
|
danielvincent
|
af91eb51b4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:49:41 -07:00 |
|
maxwell
|
457be4385b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:39:04 -07:00 |
|
danielvincent
|
5d0f4dd587
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:29:50 -07:00 |
|
danielvincent
|
e6d1b8b808
|
fixed syntax in welsch translation
|
2010-09-23 10:29:36 -07:00 |
|
Dan Cirnat
|
4be2fdef8f
|
Removed "sample" message from Romanian locale
|
2010-09-24 01:26:31 +08:00 |
|
Dan Cirnat
|
3d1ca6adc8
|
Romanian locale added
|
2010-09-24 01:26:31 +08:00 |
|
Alec Leamas
|
c1242a0984
|
typo fix
|
2010-09-24 01:16:08 +08:00 |
|
mousey
|
b1dd054fdb
|
More Welsh Localization
|
2010-09-24 01:14:33 +08:00 |
|
mousey
|
1625f6b131
|
Welsh Language Localization.
|
2010-09-24 01:14:33 +08:00 |
|
Raphael
|
1964bd5ecf
|
Hit the right thing in aspects move friend
|
2010-09-22 21:57:00 -07:00 |
|
Raphael
|
2489f8503f
|
Merge branch 'master' into HEAD
Conflicts:
app/controllers/albums_controller.rb
app/controllers/aspects_controller.rb
app/controllers/photos_controller.rb
app/controllers/registrations_controller.rb
app/controllers/requests_controller.rb
app/helpers/dashboards_helper.rb
app/views/albums/show.html.haml
app/views/aspects/manage.html.haml
app/views/shared/_aspect_nav.haml
app/views/shared/_sub_header.haml
app/views/status_messages/_status_message.html.haml
app/views/status_messages/show.html.haml
config/locales/de.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
|
2010-09-22 21:32:03 -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 |
|
maxwell
|
23e9520a9e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-22 11:33:26 -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 |
|
maxwell
|
63ed6a3a95
|
MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems
|
2010-09-21 21:31:53 -07: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 |
|
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 |
|