danielvincent
|
e588d7ab6a
|
DG IZ moving friends is now ajaxy
|
2010-09-20 17:26:20 -07:00 |
|
danielvincent
|
b80d75c382
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 15:54:07 -07:00 |
|
danielvincent
|
40c96fc619
|
DG IZ; click to edit rollover text on aspect manage page
|
2010-09-20 15:53:56 -07:00 |
|
maxwell
|
fc9cddc7b8
|
make the remote tom work
|
2010-09-20 15:40:43 -07:00 |
|
maxwell
|
d8c5541e12
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 15:32:26 -07:00 |
|
maxwell
|
cb0f0b72eb
|
MS removed a log and trying to be slightly more pedantic
|
2010-09-20 15:32:18 -07:00 |
|
danielvincent
|
fb2f027b24
|
DG IZ; escape regex characters in Person.search
|
2010-09-20 15:25:19 -07:00 |
|
danielvincent
|
9787c45159
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 15:15:53 -07:00 |
|
danielvincent
|
5bb4ee5d36
|
DG IZ; posting now ensures aspect ownership.
|
2010-09-20 15:15:37 -07:00 |
|
maxwell
|
5e2fdedf8b
|
MS removed another logging of encrypted data....
|
2010-09-20 15:07:30 -07:00 |
|
danielvincent
|
4fe4326ed1
|
DG IZ photo uploading now works
|
2010-09-20 15:00:02 -07:00 |
|
danielvincent
|
aa2ea3f300
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 13:18:21 -07:00 |
|
danielvincent
|
af9cda52af
|
DG IZ; always query through the current_user in the controllers.
|
2010-09-20 13:18:11 -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 |
|
Raphael
|
cbbf3337a3
|
Readme style conformance
|
2010-09-20 13:00:19 -07:00 |
|
Raphael
|
5b6215db77
|
Replicating a bunch of Pistos' commits, because the HEADs diverged
|
2010-09-20 12:59:01 -07:00 |
|
Raphael
|
747f7d11a0
|
Move thin yml back to development mode
|
2010-09-20 12:51:47 -07:00 |
|
Raphael
|
0869ea6a6a
|
Adjust readme
|
2010-09-20 12:51:33 -07:00 |
|
Arnaud Delcasse
|
eeb132d825
|
Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results.
|
2010-09-21 03:20:06 +08:00 |
|
danielvincent
|
b097f93bf5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 11:39:17 -07:00 |
|
maxwell
|
5d1fdcaf3a
|
MS fixing bug #67. stripping whitespace from search
|
2010-09-20 11:38:24 -07:00 |
|
danielvincent
|
fe306b37ab
|
DG IZ; mass-assignment quick-fix in controllers
|
2010-09-20 11:30:27 -07:00 |
|
maxwell
|
64d371d9d6
|
MS added a warning for account
|
2010-09-20 11:30:08 -07:00 |
|
maxwell
|
ffb732c1b5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 11:14:48 -07:00 |
|
Ariel Zavala
|
db7ad16503
|
Added localization to comments views
|
2010-09-21 02:03:51 +08: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 |
|
maxwell
|
cc7c82ab5e
|
MS added openssl copywright exception
|
2010-09-20 10:46:46 -07:00 |
|
Felix Gruber
|
4c9ac0e5f6
|
initial german translation
|
2010-09-21 01:46:15 +08:00 |
|
Ariel Zavala
|
6501974f30
|
added more translations missing on views
|
2010-09-21 01:43:54 +08:00 |
|
Claudius Coenen
|
b8dc20e4bb
|
adding german translation
|
2010-09-21 01:42:16 +08:00 |
|
Mikhail Zubrov
|
718b0715b3
|
add a Russian translation
|
2010-09-21 01:41:01 +08: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 |
|
TJ Peden
|
e6c8cf20d3
|
Fixed receive_url problem
|
2010-09-21 01:26:51 +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 |
|