nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2195 commits 4 branches 0 tags 121 MiB
Commit graph

687 commits

Author SHA1 Message Date
danielvincent
81250c0e9d Merge branch 'master' of github.com:diaspora/diaspora into reposting 2010-09-22 15:49:13 -07:00
danielvincent
e9d16cc09b DG IZ; cleanup 2010-09-22 15:48:50 -07:00
root
aaa4d75a5e Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-22 16:41:43 -04:00
danielvincent
6dd7911c8c DG IZ; update_or_repost 2010-09-22 10:52:29 -07:00
ilya
6bd22034b7 typo in user 2010-09-21 21:45:29 -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
root
fe2be748a0 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-21 19:21:40 -04: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
root
03f8cbc249 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-21 16:59:26 -04: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
Thomas Krehbiel
bdd752f07b Fix for 'Local variable hides method' 2010-09-20 21:49:14 -04:00
maxwell
2be0cca2cd MS adding downcase to webfinger lookup 2010-09-20 16:51:02 -07:00
danielvincent
fb2f027b24 DG IZ; escape regex characters in Person.search 2010-09-20 15:25:19 -07:00
danielvincent
5bb4ee5d36 DG IZ; posting now ensures aspect ownership. 2010-09-20 15:15:37 -07: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
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
08f833ba7a case insensitivity on search 2010-09-18 17:21:18 -07:00
danielvincent
e9a3f46fbd fixed query function to go through mongomapper instead of custom 2010-09-18 16:42:07 -07:00
Patrick Aljord
182c6228f3 show comments ordered by created_at, they are showing up at random order without that 2010-09-18 07:36:21 +08:00
Raphael
b3549c79f4 Give slightly more specific error message 2010-09-17 12:49:49 -07:00
Raphael
ce2260b747 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-17 11:57:36 -07:00
Raphael
99ad001d28 Fix websocket spec, take out puts in by_webfinger 2010-09-17 09:52:31 -07:00
Raphael
2e8ecceaf7 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 21:53:34 -07:00
Raphael
b45906f902 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 21:35:48 -07:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
maxwell
e668071ea5 README.md 2010-09-16 18:48:18 -07:00
danielvincent
25b4b409be Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 16:19:48 -07:00
danielvincent
cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
maxwell
2e8785b596 applying this change from wiki, thanks astronouth7303 2010-09-16 15:04:29 -07:00
maxwell
6f867d60c4 MS fixed the nil hostname on user 2010-09-16 14:38:24 -07:00
Raphael
1e646fb0a9 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-15 23:54:57 -07:00
Raphael
32fc6212ab Put only the hostname in diaspora_handle 2010-09-15 23:49:55 -07:00
Raphael
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
Raphael
c67a8ea100 Merge branch 'master' of github.com:diaspora/diaspora into production 
Conflicts:
	config/deploy.rb
	config/environments/production.rb
	spec/models/request_spec.rb
 2010-09-15 22:37:05 -07:00
Stephen Caudill
5595dc5f48 Retab the project 2010-09-16 13:16:10 +08:00