ilya
|
74a92a2637
|
tiny typo
|
2010-09-21 17:40:43 -07:00 |
|
ilya
|
e3d52bb467
|
putting the config file in a shared directory for in the deploy scripts
|
2010-09-21 17:39:44 -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
|
c8e52526d9
|
another silly mistake, need to symbolize keys in deploy scripts
|
2010-09-21 16:31:27 -07:00 |
|
ilya
|
dc0a08172d
|
syntax error in seed script
|
2010-09-21 16:23:42 -07:00 |
|
root
|
fe2be748a0
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-21 19:21:40 -04:00 |
|
ilya
|
394bf1acb5
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
|
2010-09-21 16:15:01 -07:00 |
|
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 |
|
danielvincent
|
c8221cfcae
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 15:41:37 -07:00 |
|
danielvincent
|
44db21ffd4
|
DG MS; cleaned up spec
|
2010-09-21 15:41:29 -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 |
|
root
|
03f8cbc249
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-09-21 16:59:26 -04:00 |
|
danielvincent
|
0a99b82bd3
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
|
2010-09-21 13:40:17 -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 |
|
danielvincent
|
9571ade89c
|
basic setup
|
2010-09-21 12:29:39 -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 |
|
Thomas Krehbiel
|
bdd752f07b
|
Fix for 'Local variable hides method'
|
2010-09-20 21:49:14 -04:00 |
|
Pistos
|
fa1e09cadb
|
Hard-wrapped README text to confirm to an 80-character screen width.
|
2010-09-20 21:23:20 -04:00 |
|
Pistos
|
2d7b72e518
|
Added a newline after headings where it was missing.
|
2010-09-20 21:18:37 -04: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 |
|