maxwell
|
24ca139241
|
MS remove some stray puts
|
2010-09-20 17:11:07 -07:00 |
|
maxwell
|
3b07596b1a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 16:51:08 -07:00 |
|
maxwell
|
2be0cca2cd
|
MS adding downcase to webfinger lookup
|
2010-09-20 16:51:02 -07:00 |
|
maxwell
|
e2fc48c9ff
|
MS being slightly more proper with application helper, and fixing the person search page
|
2010-09-20 16:44:35 -07:00 |
|
Raphael
|
bfdf220f22
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 16:41:14 -07:00 |
|
Raphael
|
8dd11c0c95
|
Add a couple specs to friending
|
2010-09-20 16:41:03 -07:00 |
|
maxwell
|
45509fb045
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 16:03:03 -07:00 |
|
maxwell
|
5b5df24592
|
merge
|
2010-09-20 16:02:48 -07:00 |
|
Raphael
|
b805155f75
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 16:02:26 -07:00 |
|
Raphael
|
0bbbded895
|
or any later version of the AGPL
|
2010-09-20 16:02:10 -07:00 |
|
maxwell
|
2b31c09ab3
|
small typo in readme
|
2010-09-20 16:00:23 -07:00 |
|
maxwell
|
788ed3aac2
|
small typo in readme
|
2010-09-20 15:58:09 -07:00 |
|
maxwell
|
4fd4e88671
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 15:55:26 -07:00 |
|
maxwell
|
9f63dd9b69
|
MS added another message in the readme about not using mod_rails, as mod_rails does not work with EventMachine
|
2010-09-20 15:55:11 -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 |
|
Michael Kaeufl
|
f28a96e356
|
fix in header
|
2010-09-20 22:00:44 +02: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 |
|
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 |
|
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 |
|
Michael Kaeufl
|
54c137fd6b
|
Merge branch 'felgru-locale-de' into arielo-i18n
|
2010-09-20 20:36:20 +02: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 |
|