nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2308 commits 4 branches 0 tags 121 MiB
Commit graph

388 commits

Author SHA1 Message Date
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
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
Michael Kaeufl
f28a96e356 fix in header 2010-09-20 22:00:44 +02:00
Raphael
747f7d11a0 Move thin yml back to development mode 2010-09-20 12:51:47 -07:00
Michael Kaeufl
c78538fedf Merge branch 'arielo-i18n' of github.com:michael-k/diaspora into arielo-i18n 2010-09-20 21:40:38 +02:00
Michael Kaeufl
ac667e6ec9 de: Ausloggen -> Abmelden 2010-09-20 21:39:56 +02:00
Michael Kaeufl
1c79677c7c some more german translations 2010-09-20 21:38:13 +02:00
Michael Kaeufl
54c137fd6b Merge branch 'felgru-locale-de' into arielo-i18n 2010-09-20 20:36:20 +02: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