ilya
|
d3b0b9c07e
|
Make db seed set app_config[:pod_url]
|
2010-09-21 16:13:21 -07:00 |
|
ilya
|
d26e7850ac
|
RS, IZ; removed url from user and views
|
2010-09-21 15:52:26 -07:00 |
|
ilya
|
efd901dcd9
|
RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG
|
2010-09-21 15:46:57 -07:00 |
|
Raphael Sofaer
|
9db4fea9ac
|
Correct mailing list link
|
2010-09-21 14:44:36 -07:00 |
|
Raphael
|
4e951d8abf
|
Fixing COPYRIGHT file
|
2010-09-21 14:08:18 -07:00 |
|
Raphael
|
95d852b181
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 14:00:12 -07:00 |
|
Raphael
|
11d31901e4
|
IZ, RS, Pulled receiving out of user file, refactored receive method to be clearer
|
2010-09-21 13:59:52 -07:00 |
|
ilya
|
4d00a0e99e
|
IZ posting to all albums should now work, needed to check for all in user.post
|
2010-09-21 12:35:48 -07:00 |
|
ilya
|
e4ac3afc3e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 11:59:17 -07:00 |
|
ilya
|
1882509a0b
|
removed the auto_link seems to fix HTML injection, no more autolinking
|
2010-09-21 11:59:04 -07:00 |
|
Dorian
|
003a8b454f
|
Some refactoring again (define code rules would be good)
|
2010-09-22 02:55:54 +08:00 |
|
Raphael
|
08df7e1250
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 11:03:32 -07:00 |
|
Raphael
|
50414fef40
|
Remove unused method from message handler
|
2010-09-21 11:03:21 -07:00 |
|
ilya
|
5ffb5adb65
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 10:05:33 -07:00 |
|
danielvincent
|
b019ade588
|
minor changes from production
|
2010-09-20 21:50:06 -07:00 |
|
danielvincent
|
4d200fea87
|
removed view all link from status_message#show
|
2010-09-20 20:17:18 -07:00 |
|
danielvincent
|
f50b70da9e
|
DG IZ; removed stray mustache
|
2010-09-20 18:14:12 -07:00 |
|
danielvincent
|
3a5a8890d9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 18:09:06 -07:00 |
|
danielvincent
|
ca97d792af
|
DG IZ; fixing querying bug in aspect_by_id
|
2010-09-20 18:08:59 -07:00 |
|
Raphael
|
441f75203a
|
Add autolink and sanitize to show page
|
2010-09-20 17:33:05 -07:00 |
|
danielvincent
|
9c334e24e4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 17:26:35 -07:00 |
|
danielvincent
|
e588d7ab6a
|
DG IZ moving friends is now ajaxy
|
2010-09-20 17:26:20 -07:00 |
|
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 |
|