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

470 commits

Author SHA1 Message Date
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
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
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
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
Michael Kaeufl
5533f30840 de translation: abgemeldet -> gekündigt 2010-09-20 19:41:14 +02:00
Mikhail Zubrov
718b0715b3 add a Russian translation 2010-09-21 01:41:01 +08:00
Michael Kaeufl
c8d3ceae61 de translation: wieder -> erneut 2010-09-20 19:40:37 +02: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
Felix Gruber
0203b9317b better translation from sennewood 2010-09-20 14:04:09 +02: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
Pedro Silva
230865aaa2 Added Portuguese Portugal locale 2010-09-20 00:58:57 +08:00
Felix Gruber
c4f420ec59 some corrections from sennewood 2010-09-19 18:15:36 +02:00
Ariel Zavala
e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red 2010-09-19 11:16:00 -04:00
kook
6c6c7be1e5 oopsie 2010-09-19 10:28:33 +08:00
kook
c34e4caafa czech translation 2010-09-19 10:28:20 +08:00
MrZYX
5740c72804 made websocket server host configurable 2010-09-19 09:57:57 +08:00
danielvincent
2efde8a841 added missing quote in finnish locale 2010-09-18 15:50:35 -07:00
Danillo César
ac09f48cf8 Added locales files for portuguese brazilian. 2010-09-19 06:42:36 +08:00
’Jarkko
6cf5f6c8c7 Finnish locales 2010-09-19 06:39:32 +08:00
danielvincent
f034b180c2 quotation fix in italian locale 2010-09-18 15:36:42 -07:00
Otacon
34c0c3c89f Added italian translation (it) 2010-09-19 06:28:35 +08:00
Ariel Zavala
f48b8a4748 Moved devise.it to devise locale folder 2010-09-18 11:20:57 -04:00
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
ilya
01e3bdaa29 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-17 23:02:45 -07: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
ilya
2b70317677 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-17 15:33:51 -07: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
ilya
659c06d0cf Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 23:04:03 -07: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
ilya
fc234390c3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 19:44:29 -07: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
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
Ariel Zavala
b7cfbd6fd7 Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml 2010-09-16 17:05:11 -04: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
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Etienne Membrives
9157f72e01 French localization 2010-09-16 12:31:24 -07:00
Ariel Zavala
a673257eef Added localization to photos views 2010-09-16 15:11:21 -04:00
Ariel Zavala
443b5af4ce Added localization to aspect views 2010-09-16 14:57:56 -04: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
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
ab5e7319ee Added I18n initializer 2010-09-16 11:46:34 -04:00
Raphael
1e646fb0a9 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 23:54:57 -07:00
ilya
81793d236c get_to_the_choppa is back 2010-09-15 22:54:51 -07:00
Michael Fellinger
ba058a39a8 Replace require_relative with compatible version 2010-09-16 14:50:30 +09:00
Michael Fellinger
c6f5b4ed16 Basic 1.9.2 port 2010-09-16 14:41:33 +09:00
Raphael
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
 2010-09-15 22:37:05 -07:00
Stephen Caudill
5595dc5f48 Retab the project 2010-09-16 13:16:10 +08:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jamie Wilkinson
5d87ca0904 Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting 2010-09-16 10:07:57 +08:00
Jesse Kriss
969779a60d adding deprecation setting 2010-09-16 09:46:09 +08:00
Jesse Kriss
30e655fd6c adding heroku-friendly mongo config 2010-09-16 09:46:09 +08:00
Raphael
de93fd2818 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
33048fe6db Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	app/models/user.rb
	spec/models/aspect_spec.rb
 2010-09-15 17:24:00 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
Raphael
1006e8a680 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Raphael
d63cc358c5 Remerging master and production 2010-09-15 09:48:06 -07:00