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

1412 commits

Author SHA1 Message Date
Maxwell Salzberg
bb8db654d6 add basic pod error logging, and added guard and removed autotest 2011-07-30 11:44:27 -07:00
MrZYX
67ffdd71aa update rails-i18n 2011-07-25 12:54:25 +02:00
Maxwell Salzberg
9ac88a8c39 update gemfile 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
0cc018dd6b i think this works. there is some weird stuff in vannacontroller, but that might have always been there 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07:00
Raphael Sofaer
55009a8381 Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch. 2011-07-13 10:59:41 -07:00
MrZYX
98ebb384ca update i18n-inflector-rails 2011-07-12 20:37:13 +02:00
MrZYX
2a15a17983 rails-i18n is now a gem 2011-07-12 15:04:48 +02:00
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
Raphael Sofaer
63902fd273 Lock oauth2-provider 2011-06-29 17:30:12 -07:00
Raphael Sofaer
3887144db6 I seriously think that this commit is going to fix CI. SRSLY. 2011-06-29 15:34:45 -07:00
Raphael Sofaer
d6321d2327 Bundle in the oauth features, take the source out of the chubbies Gemfile 2011-06-29 11:21:23 -07:00
Raphael Sofaer
4683047ee0 point diaspora client to the right place in the gemfiles 2011-06-28 17:36:01 -07:00
Raphael Sofaer
3078220bc0 Point diaspora-client to git 2011-06-28 17:25:02 -07:00
Raphael Sofaer
1af945de11 Merge branch 'master' into oauth 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/app_config.rb
	app/models/post.rb
	db/schema.rb
	public/stylesheets/sass/application.sass
	spec/lib/webfinger_spec.rb
 2011-06-28 17:13:38 -07:00
Michael Sofaer
ef7580a698 Notifications page works with Vanna 2011-06-27 19:51:35 -07:00
danielgrippi
73fe74c834 updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber 2011-06-27 18:58:29 -07:00
danielgrippi
0b5de2aa7a WIP getting rid of app_url in params 2011-06-24 11:22:44 -07:00
danielgrippi
bd84eaaf75 added cucumber test for re-registering a pod from a client 2011-06-23 18:57:39 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
d46f3a8d1f fixed every spec but the activity stream photos controller spec 2011-06-23 15:22:36 -07:00
danielgrippi
5917f0d695 added JWT verification support to diaspora 2011-06-22 16:15:03 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
Raphael Sofaer
728a547cb2 Undo some pg changes 2011-06-19 16:16:30 +02:00
Raphael Sofaer
7c454b7d15 Fix stream query for postgres, shouldn't break mysql 2011-06-19 16:16:30 +02:00
Ilya Zhitomirskiy
9366b7243a configured the testmode 2011-06-15 16:04:38 -07:00
Ilya Zhitomirskiy
844bf48851 changed back to the git repo for client 2011-06-14 18:35:36 -07:00
Ilya Zhitomirskiy
dca2eca67c cucumber specs are green 2011-06-14 15:36:05 -07:00
Raphael Sofaer
42d177eea4 Lock linecache to avoid require_relative thing 2011-06-14 09:51:19 -07:00
Raphael Sofaer
4815482354 Start some real docs 2011-06-13 16:12:32 -07:00
Ilya Zhitomirskiy
f31a78f23f updated the Gemfile to point to repo instead of path 2011-06-09 17:42:33 -07:00
Raphael Sofaer
6d5169d707 Chubbies is working with local diaspora-client gem 2011-06-09 15:01:09 -07:00
Maxwell Salzberg
4b13c83de7 Chubbies now uses sqlite to have tables of pods and users 2011-06-03 16:24:12 -07:00
Raphael Sofaer
381b85189d Add Chubbies, the oauth sample app, and a cucumber feature for part of an oauth flow 2011-06-03 16:22:38 -07:00
danielgrippi
918284a8f8 include newrelic if the newrelic config file is present. profiling ftw. 2011-06-02 12:10:03 -07:00
Maxwell Salzberg
5cbbdf2949 initial post to tumblr support 2011-06-01 22:30:22 -07:00
Sarah Mei
f732d20f0c Remove vendored jasmine; use normal jasmine gem. thx @tubbo for the prompt. 2011-05-28 21:03:39 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
Sarah Mei
7a2ab42948 Locking to older version of rspec-core as new version has invalid specification 2011-05-22 17:51:53 -07:00
Maxwell Salzberg
15c4463c2a gemfile wars 2011-05-20 14:54:04 -07:00
danielgrippi
16351227f7 use aspect dropdowns everywhere; updated rake to 0.9.0 2011-05-20 11:50:41 -07:00
danielgrippi
4875d6557d update nokogiri, require false on sod 2011-05-16 22:30:25 -07:00
Raphael Sofaer
495dd89dd2 Fix password reset, add cucumber feature 2011-05-16 15:54:18 -07:00
danielgrippi
0e72a91d1b update login page 2011-05-13 22:05:35 -07:00
Raphael Sofaer
70fd2e916a Update rspec 2011-05-13 17:52:37 -07:00
Raphael Sofaer
a46ff394b1 update devise_invitable and devise 2011-05-13 16:32:07 -07:00
Raphael Sofaer
89ec768d06 Rev thin again, 1.2.10 segfaults 2011-05-03 14:44:33 -07:00
Raphael Sofaer
cb483beada Rev Thin for a 'can't find Thin::HttpParser' bug 2011-05-02 15:58:57 -07:00
MrZYX
b1d0ef9695 push gherkin to 2.3.6 since 2.3.5 doesn't compile for me 2011-04-24 15:45:09 +02:00
MrZYX
46d2efd80a update sod 2011-04-21 12:59:43 +02:00
zhitomirskiyi
c31b6f18fd Merge branch 'master' of github.com:diaspora/diaspora 2011-04-20 14:03:58 -07:00
zhitomirskiyi
76c24c2848 added debian sod recipies 2011-04-20 14:02:52 -07:00
maxwell
2223c562c0 first fix of notification page 2011-04-18 15:10:47 -07:00
Raphael Sofaer
8ae90e71be OHAI! Y U BREAK BUILD?? 2011-04-15 15:13:19 -07:00
maxwell
86fe2db24e update publish job to include .atom 2011-03-30 10:41:47 -07:00
maxwell
fa27fa2d29 make one translation absolute to attempt to fix 1.9 build 2011-03-30 10:39:40 -07:00
Raphael Sofaer
36a262a3ad Revert "update selenium-webdriver to 0.1.4,fixes #829" 
This reverts commit eddd8d969f.
 2011-03-27 16:32:40 -07:00
MrZYX
eddd8d969f update selenium-webdriver to 0.1.4,fixes #829 2011-03-27 22:52:33 +02:00
Sarah Mei
a5f6b6512d Upgrade cucumber version 2011-03-27 10:46:38 -07:00
Sarah Mei
bec34ec5e8 Perhaps the silent upgrade of selenium-webdriver freaked out CI. Let's see. 2011-03-22 16:53:06 -07:00
maxwell
155290fb51 updating Gemfile.lock 2011-03-11 15:41:28 -08:00
Raphael Sofaer
7ac3692a92 Fix specs, migrate to downcase tags, still testing migration 2011-03-11 14:23:03 -08:00
Raphael Sofaer
c1bcfef90c TAGS ARE SO COOL 2011-03-10 18:37:45 -08:00
danielgrippi
1f5edb1d92 Merge branch 'private_messages' 
Conflicts:
	app/controllers/status_messages_controller.rb
	app/models/data_point.rb
	app/models/status_message.rb
	db/schema.rb
	lib/fake.rb
	public/stylesheets/sass/application.sass
	spec/models/mention_spec.rb
 2011-03-08 21:23:41 -08:00
danielgrippi
ac738df8f5 added missing translation 2011-03-08 19:22:49 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
danielgrippi
5f55dfa1bc private message inbox wip 2011-03-03 17:32:26 -08:00
MrZYX
ae0595bca8 fixed #903 2011-03-03 21:25:01 +01:00
Raphael Sofaer
1afc83f356 Revert "memprof" 
This reverts commit 8ee81314d6.
 2011-03-02 13:34:29 -08:00
Raphael Sofaer
8ee81314d6 memprof 2011-03-02 11:47:13 -08:00
Sarah Mei
d183150fa9 Upgrade launchy. 2011-03-01 21:41:28 -08:00
Raphael Sofaer
68f0f7ec21 Add rcov task 2011-03-01 18:12:42 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
Sarah Mei
5e69f7d9a2 Upgrade arel, for some reason. 2011-02-26 16:02:10 -08:00
MrZYX
ee96dea398 update i18n-inflector to 2.5.1; correct Polski to polski; fixed locales; thanks siefca 2011-02-25 21:41:32 +01:00
maxwell
8f6922bcf9 multihttp job and spec 2011-02-23 16:06:54 -08:00
MrZYX
d32fe1ea08 updated Gemfile.lock 2011-02-24 00:34:18 +01:00
maxwell
eb9a943724 parinoid checks for admin page thx dangold 2011-02-22 15:43:10 -08:00
Sarah Mei
dcf7e57a1d Use standard carrierwave gem instead of deleted git repo. This may break photo uploading, but better that than breaking bundle install. 2011-02-21 13:54:08 -08:00
danielvincent
164fe1c1b5 adjust column width, leading, serifs, etc. in stream for better readability. 2011-02-13 15:27:14 -08:00
danielvincent
ca0d52c8e2 log character counts of status messages and comments 2011-02-13 00:17:34 -08:00
zhitomirskiyi
057dcc218d locked the excon version 2011-02-10 17:50:46 -08:00
zhitomirskiyi
f857d87475 fixed photos not being updated 2011-02-10 16:59:30 -08:00
Sarah Mei
d872467d2c Add fuubar for nicer spec output 2011-02-09 14:46:12 -08:00
Raphael
a2bb8515f9 Update cap scripts to have separate staging and production environments, use bundler 2011-01-31 15:28:43 -08:00
Sarah Mei
c40a266910 Deploy with capistrano. 2011-01-30 22:00:32 -08:00
zhitomirskiyi
6242ac64ed removed unique index on email to a regular index in order to make inviting users through fb work (no email present) 2011-01-26 15:04:46 -08:00
zhitomirskiyi
be57170bf9 added the empty email spec 2011-01-26 14:22:04 -08:00
zhitomirskiyi
8bc857cf4d updated devise added a devise_invitable fork and performed migration 2011-01-26 13:46:50 -08:00
Raphael
e890d73de7 Remove mocha 2011-01-26 11:52:14 -08:00
danielvincent
7ac0e9eb49 wip 2011-01-24 12:22:18 -08:00
danielvincent
1631452669 added in link to search page 2011-01-24 12:22:18 -08:00
Sarah Mei
225e5fc9d7 This much untested code makes me sad. But I fixed the bug whereby no rake tasks worked because of the require line. 2011-01-21 22:03:21 -08:00
zhitomirskiyi
01a4327c2b use google API instead of highcharts due to licensing 2011-01-21 13:00:08 -08:00
zhitomirskiyi
41993fe5da use highcharts.js for stats 2011-01-21 12:19:05 -08:00
zhitomirskiyi
190daa76dd getting rid of gruff and it's imagemagic deps. made graphs on stats pending. 2011-01-21 11:11:58 -08:00
zhitomirskiyi
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -08:00
Raphael
b580b7bd2c Putting fixtures in specs... 2011-01-18 10:42:50 -08:00
Raphael
fdc9534fc7 Fix specs in the presence of fixture_builder 2011-01-18 10:25:26 -08:00
zhitomirskiyi
995d285fdd ssl s3, attrs 2011-01-17 15:56:06 -08:00
zhitomirskiyi
0c8aca3ef8 rebasing 2011-01-17 15:56:06 -08:00
danielvincent
2eb1901073 s3 support minus rake migration. 2011-01-17 15:56:06 -08:00
Sarah Mei
910ae49fca Lock down gem versions & github refs in mysql branch because it's got that same damn aws problem. 2011-01-15 15:23:34 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
maxwell
32d1d26e22 updated some dependancies 2011-01-11 14:39:44 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
maxwell
ed0e739ac3 updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with 2010-12-20 11:22:52 -08:00
Sarah Mei
850dcfd322 Updated versions of carrierwave, aws, cucumber, culerity, gherkin, haml, mail, rspec, rspec-core, rspec-expectations, rspec-mocks, and rspec-rails. What could possibly go wrong? 2010-12-20 02:49:44 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
Raphael
0e77577fbd Websocket now uses redis 2010-12-10 11:25:38 -08:00
Alec Leamas
acb3381dc6 Sticking to git: urls for git repos, as we always do. 
Using a single type of url means just a single type of problems ;)
 2010-12-03 12:20:48 +01:00
Raphael
3ee246d873 Merge branch 'resque-receive' 
Conflicts:
	Gemfile.lock
 2010-12-02 19:42:05 -08:00
maxwell
11f04a060e frustrated 2010-12-02 18:48:50 -08:00
maxwell
b9131c0e46 pushing to my website for further debugging 2010-12-02 18:47:48 -08:00
maxwell
38d9d75162 posts now have public permalinks 2010-12-02 18:47:48 -08:00
Raphael
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
danielvincent
8cb2a3a79a resque init, config, gemfile 2010-12-02 12:35:26 -08:00
maxwell
9aa093a0a3 api compatabile, but ugly 2010-12-02 12:35:25 -08:00
Sarah Mei
9adadd39fe new versions of lots o' stuff 2010-12-01 22:49:20 -08:00
danielvincent
5e8606169d rolling back twitter gem to 0.9.12 release. 2010-11-23 10:55:40 -08:00
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
Sarah Mei
ad6f6498ef Updated version of thor and mongomapper. 2010-11-20 19:08:13 -08:00
Sarah Mei
90193a16f5 fix 1.9 build 2010-11-19 23:14:08 -08:00
zhitomirskiyi
e8d86d6d07 pulled out the certlocations to a config file 2010-11-19 18:14:14 -08:00
Raphael
22aa0d3f26 Updating Gemfile.locl 2010-11-18 15:14:01 -08:00
maxwell
31d33054ef added jammit, now js and css compress for production 2010-11-17 21:51:59 -08:00
maxwell
3db8da992a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 20:14:12 -08:00
maxwell
c08a991130 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 20:14:00 -08:00
danielvincent
f59f6be4b0 users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp. 2010-11-17 19:37:08 -08:00
maxwell
045c8f1aac updated magent, now using my fork untill bugfix gets pulled 2010-11-17 13:49:12 -08:00
maxwell
092f0ef7a8 invite link when you get a webfinger error 2010-11-16 19:07:19 -08:00
danielvincent
e2e3b2511d removing mini_fb gem 2010-11-16 16:46:41 -08:00
zhitomirskiyi
8edc516edf Revert "added the socket policy file perl script, starts on script server, added a chef task" 
This reverts commit ed9a66d9a4.
 2010-11-16 12:34:00 -08:00
zhitomirskiyi
ed9a66d9a4 added the socket policy file perl script, starts on script server, added a chef task 2010-11-16 12:01:10 -08:00
zhitomirskiyi
8a47b3d538 DG IZ rails updated 2010-11-15 19:00:15 -08:00
zhitomirskiyi
b437f201a5 DG IZ using em-websocket from HEAD; updated flash policy for FABridge over wss:// 2010-11-15 18:42:26 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Sarah Mei
1a4fa2713a More specs for aspect-edit.js. Initialize now fully covered. 
Also, bundler upgraded our cucumber and rspec.
 2010-11-07 16:58:51 -08:00
Sarah Mei
32d953f457 Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor. 2010-11-06 16:50:07 -07:00
Sarah Mei
bfb6abd71e try require => false on chef instead 2010-11-03 22:18:48 -07:00
zhitomirskiyi
96b44faed5 commenting chef out of bundle saved 5 secs off server start 2010-11-03 19:57:21 -07:00
Alec Leamas
a08fa76975 Updating Gemfile.lock 2010-11-03 12:58:06 +01:00
maxwell
34f190ce75 MS IZ added a check for person in webfinger response in receive_salmon method 2010-11-02 16:10:17 -07:00
Sarah Mei
e282abd526 cucumber feature for user authentication. 2010-11-01 22:22:35 -07:00
maxwell
15d6cff837 MS IZ everything now uses diaspora handle. this feels so good 2010-11-01 18:42:42 -07:00
Sarah Mei
d0446aa316 require => false on jasmine to get rid of warnings 2010-10-30 10:58:32 -07:00
Sarah Mei
3fd198d1bc mongrel doesn't build under 1.9 2010-10-29 22:35:33 -07:00
Sarah Mei
d819c98718 can haz working jasmine 2010-10-29 22:21:08 -07:00
livefromthemoon@gmail.com
6e1121179d guess locale from browser settings 2010-10-28 17:29:17 +02:00
Sarah Mei
f314ab39df At some point, we should upgrade database_cleaner to 0.6.0. That point is not now. (It breaks cucumber.) 2010-10-26 19:05:18 -07:00
danielvincent
3d302f8db7 facebook and twitter both use omniauth and are saved as OmniauthServices 2010-10-25 17:41:59 -07:00
maxwell
be39df75fe removed fb_status from the factories. whoops. 2010-10-25 17:41:58 -07:00
maxwell
fdd222003a fixed failing specs due to omitted factories. 2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
maxwell
b17ae0bf38 DG MS removed unused fb_status model and respective specs, fixtures. 2010-10-25 12:26:08 -07:00
Sarah Mei
d32d47b790 work in progress cucumber feature for posting messages 2010-10-24 22:57:43 -07:00
root
acc9c116e5 Add a cookbook to run after bundling to install everything 2010-10-24 19:22:15 +00:00
Raphael
c58b4706a5 Update carrierwave in Gemfile.lock 2010-10-21 10:09:52 -07:00
Sarah Mei
560910b53d More cruisecontrol bits 2010-10-20 20:47:07 -07:00
maxwell
494a0e2d3f updating the db script for dev to set the default pictures 2010-10-20 18:24:09 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 2010-10-20 14:59:55 +02:00
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -07:00
maxwell
0f75072477 make import spec pending with diaspora handle bug 2010-10-14 23:03:23 -07:00
maxwell
341009e20f Merge branch 'master' of github.com:diaspora/diaspora into maxwell 
Conflicts:
	Gemfile
	Gemfile.lock
	spec/models/user/invite_spec.rb
 2010-10-14 23:02:06 -07:00
Sarah Mei
5e8d34621a ohai rails 3.0.1 2010-10-14 20:51:54 -07:00
maxwell
a30a2666c6 merging 2010-10-14 16:32:37 -07:00
maxwell
bc5bcd16fb adding 1.9 debugger for 1.9 2010-10-13 23:55:17 -07:00
maxwell
f2bdc98b47 Merge branch 'master' of github.com:diaspora/diaspora into import 2010-10-13 23:52:46 -07:00
maxwell
e1dd0cf6be Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion 2010-10-13 23:49:13 -07:00
maxwell
55227f3f72 DG MS; filter_post method, aspect_clean method 2010-10-13 13:10:08 -07:00
Sarah Mei
56c6688c81 Take out reloads so specs run on 1.9.2 2010-10-12 20:54:00 -07:00
Raphael
900a085124 Merging in bigbash's fixes 2010-10-12 15:09:32 -07:00
danielvincent
afad554f01 DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile 2010-10-11 13:42:05 -07:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
ilya
ee4c7c1cb8 Gemfile.lock 2010-10-08 17:05:12 -07:00
danielvincent
edd8f0ba6d links now have active state 2010-10-08 15:35:22 -07:00
maxwell
255901dfab fixing copypasta 2010-10-08 15:00:04 -07:00
ilya
4ecda6ab8f Merge branch 'master' of github.com:diaspora/diaspora into invites 
Conflicts:
	Gemfile
	Gemfile.lock
 2010-10-07 18:20:51 -07:00
danielvincent
2e73104d6f DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2 2010-10-07 18:17:26 -07:00
ilya
3c61365fa1 initial invitable in user 2010-10-07 18:11:17 -07:00
danielvincent
68590ccc17 removed autotest 2010-10-07 15:26:02 -07:00
Raphael
9912769b5b Merge remote branch 'guillei/s3_upload' 2010-10-07 14:17:43 -07:00
danielvincent
dc88110716 img tag in hcard 2010-10-05 20:22:13 -07:00
Raphael
37fb2bfd32 Don't require a facebook yml 2010-10-05 16:57:22 -07:00
danielvincent
aed9125e93 more querying through the current_user in controllers 2010-10-05 12:41:41 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb 
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
 2010-09-27 15:39:50 -07:00
Guillermo
6e0082da9e Files are uploaded to S3 if the ENV variables are set (Heroku-friendly) 2010-09-26 11:03:47 -05:00
Stephen Caudill
05c2da81e5 Add cucumber and run the generator 2010-09-26 11:35:50 -04:00
Stephen Caudill
af938fe74f Remove unused/broken Selenium tests 2010-09-26 11:33:41 -04:00
Raphael
40120bb441 Moving to activemodel validations 2010-09-24 11:15:39 -07:00
Raphael
b9bff76054 Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes 2010-09-24 09:49:42 -07:00
Raphael
70a22ae839 Merge branch 'master' into HEAD 
Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb
 2010-09-24 09:15:10 -07:00
Raphael
972cb54828 Move locale files, fix syntax error in fr-informal 2010-09-23 14:52:06 -07:00
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
danielvincent
9571ade89c basic setup 2010-09-21 12:29:39 -07:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
Michael Fellinger
ba058a39a8 Replace require_relative with compatible version 2010-09-16 14:50:30 +09:00
Jamie Wilkinson
45c4bf5fa7 Checking in the bundler lockfile is proper behavior 2010-09-16 13:13:08 +08:00
Patrick Aljord
a38655bd33 ignore Gemfile.lock 2010-09-16 09:59:55 +08:00
Paul Rosania
cdc009d701 Updated Gemfile.lock - no more mongo_ext 2010-09-16 09:49:57 +08:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Raphael
59006e657f Hcard done manually 2010-09-09 15:15:37 -07:00
Raphael
c6aff4a562 making the hcard work 2010-09-09 13:02:59 -07:00
Raphael
2d1a49abb5 Add refs to mongomapper and validatable 2010-09-08 10:00:17 -07:00
maxwell
c8dc31bb5b MS adding gemfile lock back into this house 2010-09-07 18:06:18 -07:00