Alec Leamas
|
90b86690d9
|
Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4
|
2010-11-16 16:25:32 +01:00 |
|
maxwell
|
f6c6030c6d
|
fixing a translation
|
2010-11-15 23:08:57 -08:00 |
|
zhitomirskiyi
|
c5ae73f96d
|
websocket secure params in app_config
|
2010-11-15 17:45:52 -08:00 |
|
Raphael
|
de1fed70f0
|
Add logging statement to server startup
|
2010-11-15 16:56:30 -08:00 |
|
Raphael
|
1b39b79446
|
Make invitation view with no inviters sensible
|
2010-11-15 16:35:00 -08:00 |
|
Hexagon
|
13a2b8ce07
|
Small fix to devise.sv
|
2010-11-15 22:28:36 +01:00 |
|
Hexagon
|
1d3d2565df
|
Forgot to change en.yml, here it is
|
2010-11-15 22:28:36 +01:00 |
|
Hexagon
|
35095f8859
|
Update of sv.yml to reflect latest changes + small fix to en.yml
|
2010-11-15 22:28:36 +01:00 |
|
Raphael
|
d3098cf6bc
|
Add option to close registration in app_config
|
2010-11-15 12:15:40 -08:00 |
|
Alec Leamas
|
3abb2c9751
|
app_config update
Attempt to close http://bugs.joindiaspora.com/issues/463, establishing a
new style in app_config.yml. Many comments needs to be reviewed.
|
2010-11-15 09:10:35 +01:00 |
|
danielvincent
|
969c668518
|
translation fix on _person.haml. button tweak
|
2010-11-13 12:10:09 -08:00 |
|
danielvincent
|
ed50fe7f1f
|
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
|
2010-11-12 20:22:56 -08:00 |
|
danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
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 |
|