Commit graph

2018 commits

Author SHA1 Message Date
maxwell
bbc7492af4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:17:23 -07:00
maco
195108f7fc README.md: add PPA instructions for rubygems 1.3.7 for Ubuntu 10.04 2010-09-16 23:13:33 +00:00
maxwell
1e8f10f1af MS rake task to fix broken local people.... let me test it first on a server, but then you can run rake db:fix_diaspora_handle 2010-09-16 16:12:45 -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
patcito
abf121f53c added link to diaspora Q&A shapado site 2010-09-17 07:02:03 +08:00
maxwell
e7afebece8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 15:07:02 -07:00
maxwell
2e8785b596 applying this change from wiki, thanks astronouth7303 2010-09-16 15:04:29 -07:00
Raphael
0eb2c97aef object_path shouldn't create links to users 2010-09-16 14:51:27 -07:00
maxwell
b155d07abd Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 14:38:32 -07:00
maxwell
6f867d60c4 MS fixed the nil hostname on user 2010-09-16 14:38:24 -07:00
Raphael
9827f02874 I'm still learning markdown 2010-09-16 14:38:08 -07:00
Raphael
1d8d35cb98 Add contributor agreement to readme 2010-09-16 14:36:35 -07:00
Raphael
d8460ed37b Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 14:21:51 -07:00
Raphael
0d2037af1e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 13:46:05 -07:00
danielvincent
1d616f001a Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 12:14:46 -07:00
danielvincent
588de2f6a9 added link to exploits@joindiaspora.com 2010-09-16 12:14:16 -07:00
Raphael
feb4cbfd29 Merge branch 'master' of http://github.com/fbrubacher/diaspora 2010-09-16 12:14:11 -07:00
Michael Nutt
cd9639cf29 websocket js should honor app socket port configuration 2010-09-17 03:11:11 +08:00
Hylke Bons
e18b8f0698 fix typo in COPYRIGHT 2010-09-17 03:09:28 +08:00
maxwell
649839567d MS added pagination to the search page 2010-09-16 11:47:34 -07:00
Daniel Vincent Grippi
07a8fa8bb6 fixed xss bug in comment view partial. 2010-09-16 08:32:19 -07:00
Federico Brubacher
05808456d8 fixed small issue in albums#update anad added corressponding controller test 2010-09-16 12:21:08 -03: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
d124686723 Need more stack traces! 2010-09-15 23:22:02 -07:00
Raphael
da51d35001 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-15 23:01:25 -07:00
Raphael
d760725145 Don't webfinger another server on receiving a webfinger request 2010-09-15 23:01:13 -07:00
ilya
81793d236c get_to_the_choppa is back 2010-09-15 22:54:51 -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
Raphael Sofaer
7334501f2b Bring Gemfile.lock back 2010-09-15 22:27:15 -07:00
Jamie Wilkinson
295ae7fa93 'rake whitespace:clean' => 'rake whitespace:cleanup' 2010-09-16 13:19:03 +08:00
Stephen Caudill
5595dc5f48 Retab the project 2010-09-16 13:16:10 +08:00
Stephen Caudill
3d939a1119 Add task for retabbing all files in project
Replace hard tabs with two character soft tabs.
2010-09-16 13:16:10 +08:00
Jamie Wilkinson
45c4bf5fa7 Checking in the bundler lockfile is proper behavior 2010-09-16 13:13:08 +08:00
Steve 'Ashcrow' Milner
3945e199eb added Fedora install information to README.md as well as a script for setting up a usable environment. 2010-09-16 13:08:30 +08:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jamie Wilkinson
0c6c4af277 'rake whitespace:cleanup' task 2010-09-16 10:07:58 +08:00
Jamie Wilkinson
42aa6dcff3 I needed to roll factory_girl_rails into both :dev and :test bundle groups to get it to fly 2010-09-16 10:07:58 +08:00
Jamie Wilkinson
eb0f011236 Show the signup link 2010-09-16 10:07:58 +08:00
Jamie Wilkinson
5d87ca0904 Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting 2010-09-16 10:07:57 +08:00
Patrick Aljord
a38655bd33 ignore Gemfile.lock 2010-09-16 09:59:55 +08:00
Paul Rosania
1e7c6c1867 Ignore .rvmrc 2010-09-16 09:50:26 +08:00
Paul Rosania
cdc009d701 Updated Gemfile.lock - no more mongo_ext 2010-09-16 09:49:57 +08:00
patcito
f6d8d68c25 Added doc for logging in. 2010-09-16 09:47:58 +08:00
patcito
10da8eebb1 MongoDB doesn't need to be started manually if installed using the Ubuntu package. 2010-09-16 09:47:57 +08:00
Jesse Kriss
969779a60d adding deprecation setting 2010-09-16 09:46:09 +08:00
Jesse Kriss
30e655fd6c adding heroku-friendly mongo config 2010-09-16 09:46:09 +08:00
Raphael
e9009ea609 Downcase username only if it is there 2010-09-15 18:23:54 -07:00
Raphael
b8f6c0bbd4 adjust git clone command 2010-09-15 18:17:16 -07:00