Ariel Zavala
|
a77575bb6e
|
Merge branch 'master' of http://github.com/Darkmagister/diaspora into i18n
|
2010-09-18 11:18:45 -04:00 |
|
Ariel Zavala
|
216cf8ccd7
|
Moved devise.ru to devise locale folder
|
2010-09-18 11:14:39 -04:00 |
|
Ariel Zavala
|
d84e33390a
|
Merge branch 'master' of http://github.com/MrBison/diaspora into i18n
|
2010-09-18 11:12:24 -04:00 |
|
Ariel Zavala
|
bf98ec38d0
|
Moved devise.pl to devise locale folder
|
2010-09-18 11:09:21 -04:00 |
|
Ariel Zavala
|
8ab5aeb6fb
|
Merge branch 'production' of http://github.com/sirmacik/diaspora into i18n
|
2010-09-18 11:08:40 -04:00 |
|
Marcin Karpezo
|
ecadeac86c
|
fixed translation
|
2010-09-18 14:27:52 +02:00 |
|
Marcin Karpezo
|
0ce90b4b71
|
Translated en.yml
|
2010-09-18 13:34:02 +02:00 |
|
Marcin Karpezo
|
9965140874
|
Translated devise.en.yml
|
2010-09-18 13:32:17 +02:00 |
|
Darkmagister
|
32957658ba
|
adding Italian locale
|
2010-09-18 12:04:35 +02:00 |
|
MrBison
|
a049cabc2d
|
oops, a stupid error fixed
|
2010-09-18 02:18:35 -07:00 |
|
MrBison
|
7e20f42422
|
oops, a stupid error.
|
2010-09-18 02:18:07 -07:00 |
|
Ariel Zavala
|
58c2d0dd28
|
merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two)
|
2010-09-18 02:21:45 -04:00 |
|
Mikhail Zubrov
|
08bdaf7340
|
add a Russian translation
|
2010-09-18 09:58:29 +04:00 |
|
ZTurtleMan
|
7d0db11444
|
Lithuanian local should use 'lt' not 'en'
|
2010-09-18 13:07:34 +08:00 |
|
Vytautas Jakutis
|
211bc1b59a
|
adding Lithuanian locale, thanks to my friends and typewith.me :)
|
2010-09-18 08:14:51 +08:00 |
|
Ariel Zavala
|
6c3882ce57
|
Added devise spanish locale
|
2010-09-18 08:08:32 +08:00 |
|
Ariel Zavala
|
0b91a2c186
|
Added I18n initializer
|
2010-09-18 08:08:32 +08:00 |
|
Ariel Zavala
|
4558f9901e
|
Added translations to photos and registrations controllers
|
2010-09-17 18:25:36 -04:00 |
|
Raphael
|
5b29c2700a
|
Restore thin yml
|
2010-09-17 15:03:16 -07:00 |
|
Raphael
|
f5c10bb24c
|
Put master deploy info back in master
|
2010-09-17 14:39:15 -07:00 |
|
Ariel Zavala
|
ce3284f1a1
|
Merge branch 'master' into i18n
|
2010-09-17 17:28:55 -04:00 |
|
Ariel Zavala
|
7bb3d9c87a
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-17 17:21:29 -04:00 |
|
Ariel Zavala
|
c1c20e14f7
|
Added translations to requests controller
|
2010-09-17 17:05:54 -04:00 |
|
Ariel Zavala
|
f95cebcb8b
|
Added translations to new requests view and aspects controller
|
2010-09-17 16:38:50 -04:00 |
|
Ariel Zavala
|
cb145c346a
|
Added I18n translations to helpers
|
2010-09-17 15:30:02 -04:00 |
|
Ariel Zavala
|
0014024870
|
Added I18n translations to helpers
|
2010-09-17 15:26:31 -04:00 |
|
Raphael
|
a96a52def7
|
Run 3 thins
|
2010-09-17 11:58:34 -07:00 |
|
Raphael
|
ce2260b747
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-17 11:57:36 -07:00 |
|
Raphael
|
5df33a6fd0
|
Take out users/show, use current_user in update
|
2010-09-17 10:50:18 -07:00 |
|
Ariel Zavala
|
271925a7f6
|
added photo view translations
|
2010-09-17 11:34:45 -04:00 |
|
Ariel Zavala
|
c6b34be63d
|
Added people views translations
|
2010-09-17 11:27:08 -04:00 |
|
Ariel Zavala
|
1384b65565
|
added more translations missing on views
|
2010-09-17 10:46:03 -04:00 |
|
Ariel Zavala
|
c6cdf65fc8
|
updated local configuration
|
2010-09-17 10:26:57 -04:00 |
|
Raphael
|
2e8ecceaf7
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 21:53:34 -07:00 |
|
Raphael
|
7c02200a67
|
Finish moving out websocket server, add task to start it
|
2010-09-16 21:42:16 -07:00 |
|
Raphael
|
c520fb71a7
|
Moved socket out to separate process. Multiple thins should now be possible
|
2010-09-16 21:34:15 -07:00 |
|
Ariel Zavala
|
9adcb3a48d
|
French locale included
|
2010-09-16 23:53:09 -04:00 |
|
Ariel Zavala
|
07138041b0
|
Fixed album controller errors
|
2010-09-16 23:35:57 -04:00 |
|
Ariel Zavala
|
34d784bbbc
|
Merge branch 'master' of http://github.com/maelsoucaze/diaspora
|
2010-09-16 21:18:50 -04:00 |
|
Ariel Zavala
|
db41bcc144
|
Merge branch 'locale-de' of http://github.com/ccoenen/diaspora
|
2010-09-16 21:09:11 -04:00 |
|
Ariel Zavala
|
0be3314e0a
|
merge with diaspora and resolved a conflict
|
2010-09-16 20:42:45 -04:00 |
|
danielvincent
|
ae83dae1ca
|
added git info (branch,date,author) to debug partial
|
2010-09-16 17:03:14 -07:00 |
|
cryptix
|
c80a79dea5
|
Unified require quotes
|
2010-09-17 07:44:47 +08:00 |
|
Steve Klabnik
|
22edec5776
|
Adding Haml html escaping.
Haml's HTML escaping option was not on, leaving the site open for xss
attacks. This would seem to fix it.
|
2010-09-17 07:44:23 +08:00 |
|
Claudius Coenen
|
5197c1b3ec
|
adding localisation for controller's flash messages'
|
2010-09-17 00:23:35 +02:00 |
|
Etienne Membrives
|
1c16f80c04
|
Merge branch 'locale-de' of http://github.com/ccoenen/diaspora
|
2010-09-16 15:16:57 -07:00 |
|
Etienne Membrives
|
ed54c50f48
|
French localization done
|
2010-09-16 15:14:05 -07:00 |
|
Claudius Coenen
|
aeedf2fc22
|
adding german translation
|
2010-09-16 23:55:57 +02:00 |
|
Etienne Membrives
|
541eb5cb95
|
Beggining of French localization
|
2010-09-16 14:45:00 -07:00 |
|
Claudius Coenen
|
80f2880329
|
Merge branch 'locale-de' of http://github.com/felgru/diaspora
|
2010-09-16 23:43:22 +02:00 |
|