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

677 commits

Author SHA1 Message Date
MrZYX
7cd6e3a868 updated german locale (informal) with keys from pull request 465 
again with help of michiwend
 2010-11-02 12:12:47 -07:00
MrZYX
b1c9961a72 updated german locale so no keys are missing (informal) 
also added parts for german from the rails i18n project
still some parts missing, unclear or not translatable look at #FIXME's
even added translation that is missing in en.yml :P
thanks to michiwend for help
 2010-11-02 12:12:47 -07:00
danielvincent
fdd3264812 proxy buffering enabled and gzip compression for files other than text/html in nginx.conf 2010-11-02 12:03:10 -07:00
Raphael
bbd8cadc14 Retaining specs and line from robustdj's patch 2010-11-02 11:27:51 -07:00
danielvincent
a3ce5f1cd7 REMOVED IMPORTER 2010-11-02 11:17:47 -07:00
Alec Leamas
fceffba261 Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor 2010-11-02 16:34:47 +01:00
Raphael
7244730961 Merge remote branch 'ed0h/fr-update' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 17:36:05 -07:00
maxwell
06445901f8 IZ MS retrations for posts now green 2010-11-01 17:11:06 -07:00
Hexagon
938d146405 Common translations are used without the namespace 2010-11-02 00:07:24 +01:00
Raphael
377cae8cba Merge remote branch 'ed0h/i18n-fallbacks' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:57:43 -07:00
Raphael
41d839ecf4 Merge remote branch 'ecleel/master' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:39:38 -07:00
maxwell
3c16a46f0e MS IZ updated the backer script to use aspects.create 2010-11-01 14:54:40 -07:00
Hexagon
1acc206fa4 #475: Fixed more untranslated strings 2010-11-01 22:22:13 +01:00
Hexagon
65419e423a Added missing strings to swedish translation 2010-11-01 16:42:47 +01:00
J David Eisenberg
1a32766fb0 Issue #492: Informal, vague description when signing up as a new user 2010-11-01 16:42:47 +01:00
Curtis J Schofield
f693a97bf3 i put in a dash 2010-11-01 16:42:46 +01:00
Sarah Allen
fb145beb9a Rails.env is a string, not a symbol 2010-11-01 16:42:46 +01:00
livefromthemoon@gmail.com
60f6e091d3 Added missing strings to french translation 2010-11-01 00:27:32 +01:00
livefromthemoon@gmail.com
bbd0d35070 Fix some bugs for I18n fallbacks 2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
9e27797092 Fallback to default language when a translation is missing for the current language 2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
cf82a0a9c8 Better to set the default locale in an initializer than in a before_filter 2010-10-31 22:39:54 +01:00
J David Eisenberg
f54820f456 Issue #496: Eliminate self-links in Getting Started 2010-10-31 12:16:07 -07:00
Abdulaziz Al-Shetwi
96906d9eaf Retranslate arabic localization. 2010-10-31 14:14:48 +03:00
Hexagon
0bef839261 Translating a huge amount of untranslated strings 2010-10-30 15:24:26 +02:00
Alec Leamas
58ead768d6 Small fix 2010-10-30 09:58:01 +02:00
Alec Leamas
68cba5da98 Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2 2010-10-30 09:54:28 +02:00
Raphael
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
Hexagon
99661a3240 Added swedish translations 2010-10-30 01:32:32 +02:00
danielvincent
8ec49e685b going to a non-friend's page contains a way to add them. 2010-10-29 15:43:44 -07:00
zhitomirskiyi
2c0a189df4 removed the session secret from the repo 2010-10-29 12:20:06 -07:00
maxwell
9c2ca15e93 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 12:09:32 -07:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
maxwell
47a9b2d189 switching deploy branch to master 2010-10-29 11:39:28 -07:00
maxwell
1e349e6a61 last time 2010-10-29 11:16:50 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
maxwell
fdb169558a dont restart servers after db:reset 2010-10-29 11:16:11 -07:00
maxwell
493969e458 trying a timer 2010-10-29 11:16:11 -07:00
maxwell
07b2e7e227 omg i was deploying the wrong branch for the past two hours 2010-10-29 11:15:14 -07:00
maxwell
d89cb53e26 pumping up the zombie sleep to allow for mail to get send out . 2010-10-29 11:13:42 -07:00
maxwell
eddcb71fcb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:11:05 -07:00
maxwell
53e9df5455 pumping up the zombie sleep to allow for mail to get send out . 2010-10-29 11:05:18 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
danielvincent
2b4e3e3a41 a person now has a photos#index page. 2010-10-29 10:38:17 -07:00
Alec Leamas
94327264d4 Comments on Swedish diaspora terms, trailing blanks killed 2010-10-29 11:11:56 +02:00
Hexagon
09fb02ec9f modified: config/locales/diaspora/sv.yml 2010-10-29 00:55:27 +02:00
livefromthemoon@gmail.com
52522c102e add some basic verification when loading the languages config file 2010-10-28 18:09:25 +02:00
livefromthemoon@gmail.com
c4d8f4e587 remove two useless lines of code 2010-10-28 17:38:45 +02:00
livefromthemoon@gmail.com
b7a586b1a5 allow user to change his language in his settings 2010-10-28 17:29:17 +02:00
danielvincent
1d5b7a87f1 Merge branch 'master' into getting-started 2010-10-27 18:14:08 -07:00
danielvincent
cd726c0ba7 users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/ 2010-10-27 12:21:25 -07:00
Raphael
16e455958c Merge remote branch 'hexagon/se-localization' 2010-10-27 11:08:06 -07:00
Raphael
f700eb537a Add activemodel error message for person to en and fr locales 2010-10-27 10:27:30 -07:00
zhitomirskiyi
634538eff3 IZ MS change back deploy config 2010-10-27 10:13:04 -07:00
zhitomirskiyi
63c740fce7 Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor 2010-10-27 09:53:50 -07:00
danielvincent
a8086f2990 further refinements. added back buttons, more explanation text. 2010-10-26 23:27:26 -07:00
zhitomirskiyi
21c75c08bb removed the http inspect 2010-10-26 19:19:34 -07:00
zhitomirskiyi
c4b79aebc0 mongo query profing 2010-10-26 18:42:53 -07:00
zhitomirskiyi
0b2e00b7d6 MS IZ the mailer will not be setup unless turned on in the APP_CONFIG 2010-10-26 17:46:19 -07:00
danielvincent
385e1673ab Merge branch 'master' into getting-started 
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_account.haml
	app/views/users/_profile.haml
 2010-10-26 16:50:57 -07:00
Raphael
f975199f19 Merge remote branch 'mael/fr-locales' 2010-10-26 16:40:50 -07:00
danielvincent
6e015790a7 settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update 2010-10-26 16:02:53 -07:00
zhitomirskiyi
c0c8c6253c added a logging line for debugging 2010-10-26 15:13:16 -07:00
danielvincent
69b1b71a5d removed javascript slider. made each getting_started section its own page. added bio to profile (and changed xml_accessors to xml_readers). 2010-10-26 13:04:47 -07:00
danielvincent
278a74f1f9 draft 2010-10-26 13:04:46 -07:00
maxwell
a992c5fbc2 dont show service if you dont have the keys for it. also, update deploy script 2010-10-25 22:06:53 -07:00
Sarah Mei
33410899d9 Fix for build breakage 2010-10-25 21:38:53 -07:00
danielvincent
a1d00d41e5 deploys back to master 2010-10-25 19:33:23 -07:00
danielvincent
6ff94e67b3 remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example" 2010-10-25 17:50:04 -07:00
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -07:00
danielvincent
3d302f8db7 facebook and twitter both use omniauth and are saved as OmniauthServices 2010-10-25 17:41:59 -07:00
maxwell
c489f49a25 DG beginning to collapse twitter&facebook 2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
Hexagon
1382bd9d08 Fixed header in swedish translation 2010-10-25 21:45:43 +02:00
Hexagon
d617392108 Added/complemented swedish translation 2010-10-25 21:41:32 +02:00
maelsoucaze
14ac908c3d French localizations updates. 2010-10-25 00:06:05 +02:00
maelsoucaze
294c8849b9 Merge remote branch 'upstream/master' into fr-locales 2010-10-25 00:04:24 +02:00
ilya
b337d5acc9 delivery method test in tests 2010-10-22 16:36:54 -07:00
ilya
47b03c45b2 commented out the email interceptor 2010-10-22 10:37:04 -07:00
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -07:00
MrZYX
5fa623552d made smtp sender address configurable 2010-10-21 19:47:30 +02:00
maxwell
bc9c852e25 fixed translation showing en on person show page when the person had no posts 2010-10-20 17:52:07 -07:00
ilya
6fa82490c9 remove friend from aspect box, with js call to remove the person from the aspect 2010-10-20 17:34:52 -07:00
ilya
94a7a3c6ad IZ MS; deleted move_friends removed 2010-10-20 14:26:45 -07:00
Alec Leamas
03f637eca9 Polishing up after git mess... 2010-10-20 22:05:42 +02:00
Joseph Method
4b588ccefb Addresses [#380] and [#239] by handling the errors from bad identities 2010-10-19 23:44:43 -04:00
Raphael
9309be2d69 Merge branch 'import' 
Conflicts:
	spec/models/user/invite_spec.rb
 2010-10-19 16:06:48 -07:00
danielvincent
0621aa2f6c fixed no friends/posts message positioning 2010-10-19 12:28:54 -07:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
Alec Leamas
fcd70ce152 Add a configuration file 
Adds a config file with environment and default thin
options
 2010-10-19 08:26:43 +02:00
ilya
d642928268 invite sends friend request if already friends, and raises if already friends 2010-10-18 16:27:02 -07:00
Joseph Method
e3e4a6b319 Continuation of previous commit 2010-10-17 19:07:54 -04:00
Sarah Mei
f688653936 disallow whitespace in username 2010-10-16 23:34:58 -07:00
Sarah Mei
d25847a626 Error message for duplicate email; add email validation spec. 2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe Error message for duplicate username; refactor User validation specs. 2010-10-16 22:36:26 -07:00
maelsoucaze
34b21e7543 French localization updates. 2010-10-16 17:19:19 +02:00
danielvincent
db31357172 another typo change 2010-10-15 11:16:04 -07:00
danielvincent
d18b59f3d3 typo fix 2010-10-15 11:12:12 -07:00
maxwell
341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
 2010-10-14 23:02:06 -07:00
Raphael
0680c2b5a6 Merge remote branch 'maelsoucaze/fr-locales' 2010-10-14 17:43:27 -07:00
Raphael
ecc7a55f8b Merge remote branch 'flea/master' 
Conflicts:
	.gitignore
 2010-10-14 17:24:46 -07:00