maxwell
|
63ed6a3a95
|
MS DG made async webfingering controller. need to call it from javascript to prevent seeds from blocking. remember to update your gems
|
2010-09-21 21:31:53 -07:00 |
|
ilya
|
dc0bd363a1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 20:02:13 -07:00 |
|
ilya
|
6d6ca3d8bc
|
added terse_pod_url to the APP_CONFIG hash
|
2010-09-21 20:01:56 -07:00 |
|
danielvincent
|
df5b7d6d84
|
DG MS; new function in post
|
2010-09-21 18:14:46 -07:00 |
|
ilya
|
76f140aa8b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 16:59:16 -07:00 |
|
ilya
|
020ff603bd
|
terse_url in user, db seeds are fixed, config/app_config.yml is now in gitignore, copy over config/app_config_example.yml.
|
2010-09-21 16:59:06 -07:00 |
|
danielvincent
|
03638ee68e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 16:35:25 -07:00 |
|
danielvincent
|
107c05ef6f
|
DG MS; validate_aspect_permissions broken out of post method
|
2010-09-21 16:35:18 -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 |
|
danielvincent
|
44db21ffd4
|
DG MS; cleaned up spec
|
2010-09-21 15:41:29 -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 |
|
danielvincent
|
4d200fea87
|
removed view all link from status_message#show
|
2010-09-20 20:17:18 -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
|
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 |
|
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
|
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 |
|
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 |
|
Ariel Zavala
|
db7ad16503
|
Added localization to comments views
|
2010-09-21 02:03:51 +08:00 |
|
Ariel Zavala
|
6501974f30
|
added more translations missing on views
|
2010-09-21 01:43:54 +08:00 |
|
TJ Peden
|
e6c8cf20d3
|
Fixed receive_url problem
|
2010-09-21 01:26:51 +08:00 |
|
maxwell
|
5bf6d358a4
|
MS added small log for when user is found from webfinger
|
2010-09-19 20:40:03 -07:00 |
|
maxwell
|
07d2de6646
|
removed an annoying log of encrypted salmon.
|
2010-09-19 20:36:39 -07:00 |
|
danielvincent
|
14ad24ba7e
|
visual tweaks on header. moved upload a file button to header on album#show
|
2010-09-19 14:27:20 -07:00 |
|
danielvincent
|
b40b81e447
|
aspect manage tab now reads 'manage aspects'
|
2010-09-19 10:11:41 -07:00 |
|
danielvincent
|
cc4e9f8d39
|
description text for all boxes in manage page. search box text defaults to query on people#index.
|
2010-09-18 17:56:26 -07:00 |
|
danielvincent
|
b5a2971302
|
search results for people now look like the stream
|
2010-09-18 17:49:52 -07:00 |
|
danielvincent
|
08f833ba7a
|
case insensitivity on search
|
2010-09-18 17:21:18 -07:00 |
|