livefromthemoon@gmail.com
82f9aefaa8
Updated some french translation strings
2010-11-12 12:26:34 -08:00
livefromthemoon@gmail.com
cdfc406aad
Added missing french translations
2010-11-12 12:26:34 -08:00
Raphael
a4d7b25bac
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-12 11:54:19 -08:00
danielvincent
4976503c0f
let nginx serve static assets.
2010-11-12 11:47:19 -08:00
Jonne Hass
1816b1e4df
people.show.add_friend -> people.person.add_friend
2010-11-12 06:07:37 +01:00
MrZYX
5ae4248b30
some more fixes I overlooked. Sorry
2010-11-12 06:07:37 +01:00
MrZYX
f55a973685
two small fixes
2010-11-12 06:07:37 +01:00
Hexagon
52da9c84ed
Update of sv.yml to match latest additions
2010-11-12 06:07:37 +01:00
MrZYX
0a363a73b0
just found the mailer... :)
2010-11-12 06:07:37 +01:00
MrZYX
9ceb3e2fd1
found some still untranslatable strings in helpers and stuff
2010-11-12 06:07:36 +01:00
Hexagon
a4f5a1e7ae
Updated swedish translation
2010-11-12 06:07:36 +01:00
MrZYX
748efb1860
eliminated senseless duplicates in en.yml
2010-11-12 06:07:36 +01:00
Jonne Hass
a957ba3aed
so then I remove the newly unused friends_since for you
2010-11-12 06:06:16 +01:00
MrZYX
6400dc244f
fixing again. it's getting anoying
2010-11-12 06:06:16 +01:00
MrZYX
8085a7bcd7
fixes to be in sync with latest commits
2010-11-12 06:06:15 +01:00
MrZYX
d91c26fb68
translated getting started, fixed #508
2010-11-12 06:06:15 +01:00
MrZYX
381c53b775
found some untranslatable strings
2010-11-12 06:04:05 +01:00
MrZYX
eef0901f36
unscoped fill_me_out
2010-11-12 06:04:05 +01:00
MrZYX
ca72bb40a6
refactored en.yml
...
removed unused keys out of en.yml
replaced some ' with "
2010-11-12 06:04:05 +01:00
danielvincent
85e2316280
Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect
2010-11-11 19:41:12 -08:00
maxwell
034d7ee2b1
first commit
2010-11-09 15:29:43 -08:00
maxwell
2162a2e3f9
collapse person's photos and status message into their profile; also, made these nested on a person
2010-11-08 15:55:58 -08:00
maxwell
21cdbf08b5
we need to ask to publish on peoples wall...this was working because we all installed it with minifb which asked for everything
2010-11-08 01:26:11 -08:00
danielvincent
020cd90341
aspect labels on people#show view
2010-11-06 11:09:11 -07:00
danielvincent
1a481d43d2
Use _stream_element.haml as a wrapper for posts in the stream.
2010-11-05 17:40:28 -07:00
Sarah Mei
a230763879
gender is a text field
2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7
Merge remote branch 'MrZYX/untranslated-strings'
...
Conflicts:
app/views/aspects/manage.html.haml
config/locales/diaspora/en.yml
2010-11-04 20:05:57 -07:00
Raphael
061ec59091
Merge remote branch 'jdeisenberg/511-nonstandard-mongo-port'
2010-11-04 19:55:09 -07:00
Raphael
c1c631d5ed
Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg
...
Conflicts:
config/locales/diaspora/en.yml
2010-11-04 18:56:43 -07:00
Raphael
7d125e68e9
Warn rather than failing if there is no smtp sender address
2010-11-04 16:55:15 -07:00
Raphael
c3a38eaab4
Merge remote branch 'MrZYX/396-smtp-sender-address'
2010-11-04 16:47:57 -07:00
Raphael
229e202a72
Take httponly off of session cookies so that the websocket works in firefox 3.x. XSS attacks would now be easier to exploit if found. A possible replacement for opening this security hole is to set a new cookie value for Firefox users that stores a randomly generated key which would give a websocket with that key access.
2010-11-04 15:17:28 -07:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000
made a bunch of strings translatable
2010-11-04 20:49:50 +01:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
J David Eisenberg
c695688c63
Issue #511 : Nonstandard mongo port fails
2010-11-03 22:58:39 -07:00
MrZYX
80b8e5e42d
updated german locale (informal) to reflect latest changes
2010-11-02 12:12:47 -07:00
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
