Commit graph

2594 commits

Author SHA1 Message Date
Claudius Coenen
aeedf2fc22 adding german translation 2010-09-16 23:55:57 +02:00
Raphael
0eb2c97aef object_path shouldn't create links to users 2010-09-16 14:51:27 -07: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
maxwell
b155d07abd Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 14:38:32 -07:00
maxwell
6f867d60c4 MS fixed the nil hostname on user 2010-09-16 14:38:24 -07:00
Raphael
9827f02874 I'm still learning markdown 2010-09-16 14:38:08 -07:00
Raphael
1d8d35cb98 Add contributor agreement to readme 2010-09-16 14:36:35 -07:00
Ariel Zavala
8f56178bd2 added diaspora site specific localization files 2010-09-16 17:29:25 -04:00
Ariel Zavala
d7ca279fa9 Revert "Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml"
This reverts commit b7cfbd6fd7.
2010-09-16 17:27:26 -04:00
Raphael
d8460ed37b Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 14:21:51 -07:00
Ariel Zavala
b7cfbd6fd7 Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml 2010-09-16 17:05:11 -04:00
Raphael
0d2037af1e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 13:46:05 -07:00
Ariel Zavala
060ba12376 Started Spanish Locale 2010-09-16 16:30:17 -04:00
Maël Soucaze
f4aeca66f8 French localisation. 2010-09-16 22:17:00 +02:00
Etienne Membrives
aae6c35fa7 Merge branch 'master' of http://github.com/arielo/diaspora 2010-09-16 13:08:11 -07:00
Etienne Membrives
55478957fe Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-16 12:57:21 -07:00
Ariel Zavala
e10e5df760 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 15:56:06 -04:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Ariel Zavala
6a967e7fe9 Added localization to status message views 2010-09-16 15:47:12 -04:00
Etienne Membrives
9157f72e01 French localization 2010-09-16 12:31:24 -07:00
danielvincent
1d616f001a Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 12:14:46 -07:00
Ariel Zavala
ec9affb849 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 15:14:38 -04:00
danielvincent
588de2f6a9 added link to exploits@joindiaspora.com 2010-09-16 12:14:16 -07:00
Raphael
feb4cbfd29 Merge branch 'master' of http://github.com/fbrubacher/diaspora 2010-09-16 12:14:11 -07:00
Ariel Zavala
51b6ce9dfb Added localization to layouts and shared views 2010-09-16 15:11:58 -04:00
Ariel Zavala
a673257eef Added localization to photos views 2010-09-16 15:11:21 -04:00
Michael Nutt
cd9639cf29 websocket js should honor app socket port configuration 2010-09-17 03:11:11 +08:00
Hylke Bons
e18b8f0698 fix typo in COPYRIGHT 2010-09-17 03:09:28 +08:00
Ariel Zavala
5078830785 Added localization to comments views 2010-09-16 15:00:21 -04:00
Ariel Zavala
9bdd11b383 Added localization to album views 2010-09-16 14:58:42 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04:00
Ariel Zavala
a0a207d0b8 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 14:55:08 -04:00
ilya
b880602497 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 11:48:59 -07:00
ilya
41f46c47b1 removed the deploy key, not needed now that the repo is public, thx for the heads up Juha @ Enemy & Sons Ltd 2010-09-16 11:48:24 -07:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Felix Gruber
61ab7726b5 change 'en' to 'de' in devise.de.yml 2010-09-16 19:15:36 +02:00
Felix Gruber
c940955261 initial german translation 2010-09-16 19:05:14 +02:00
Ariel Zavala
53b05e7fb3 Added devise spanish locale 2010-09-16 11:47:54 -04:00
Ariel Zavala
46c3d83634 Merge branch 'master' of http://github.com/diaspora/diaspora into spanish-translation 2010-09-16 11:46:57 -04:00
Ariel Zavala
ab5e7319ee Added I18n initializer 2010-09-16 11:46:34 -04:00
Daniel Vincent Grippi
07a8fa8bb6 fixed xss bug in comment view partial. 2010-09-16 08:32:19 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03:00
Michael Nutt
aa6b242563 websocket js should honor app socket port configuration 2010-09-16 03:08:33 -04:00
Michael Nutt
46a83324ab Warn if can't attach to websocket port 2010-09-16 03:08:33 -04:00
Michael Nutt
ef2e393ac8 Add bin directory to gitignore 2010-09-16 03:08:33 -04:00
Raphael
1e646fb0a9 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 23:54:57 -07:00
Raphael
32fc6212ab Put only the hostname in diaspora_handle 2010-09-15 23:49:55 -07:00
Michael Fellinger
35c9922c61 And fix some more requires 2010-09-16 15:24:26 +09:00
Raphael
d124686723 Need more stack traces! 2010-09-15 23:22:02 -07:00