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

1429 commits

Author SHA1 Message Date
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
MrZYX
2394d40603 fixed Gemfile for ruby 1.9.1 2011-02-17 18:52:12 +01:00
Paweł Wilk
7f4e048cad Updated to newest version of the i18n-inflector-rails gem 2011-02-15 01:57:10 +01:00
Raphael Sofaer
ac667b7ecd No SystemTimer on windows 2011-02-11 13:20:47 -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
0e2243e620 use capture and captures to detect thins in /service 2011-01-31 15:28:43 -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
Paweł Wilk
1eb0d3bbab Depends on the version 0.2.x of i18n-inflector-rails which has some improvements 2011-01-27 00:32:03 +01: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
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
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
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
Paweł Wilk
60bed99c3b Dependency fixed 2011-01-15 23:34:01 +01:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
Paweł Wilk
ee59f36b77 Added grammatical inflection support using I18n Inflector with Rails plug-in 2011-01-14 18:33:15 +01: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
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
MrZYX
acc8803cee try at fixing specs for ruby 1.9, SystemTimer isn't needed anymore for 1.9 2010-12-03 16:33:28 +01: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
danielvincent
5e8606169d rolling back twitter gem to 0.9.12 release. 2010-11-23 10:55:40 -08:00
zhitomirskiyi
481204a157 mongo cloudfiles backup task 2010-11-19 10:57:28 -08:00
maxwell
585ab020f8 move back to magent master 2010-11-18 12:36:47 -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
72f99afe9c commenting out sprinkle from the gemfile because it is misbehaving with CI 2010-11-16 18:38:32 -08:00
danielvincent
e2e3b2511d removing mini_fb gem 2010-11-16 16:46:41 -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
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
maxwell
a22060d1fb removing webfinger 2010-11-02 13:59:20 -07:00
Sarah Mei
50efd27710 Removing webmock from cucumber - interferes with capybara (more investigation needed). 2010-10-31 20:04:24 -07:00
Sarah Mei
d0446aa316 require => false on jasmine to get rid of warnings 2010-10-30 10:58:32 -07:00
Alec Leamas
d572f8fafc Packaging update 
Handle git gems by cloning repo to local one, rewriting Gemfile
urls and sending both repos and gems in source packages.
Separate doc dir w licensec.
Gemfile, Gemfile.lock now lives in bundle, linked to application.
Rewrite http git urls to git: to make it uniform & simpler
 2010-10-30 18:03:14 +02: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
maxwell
606c7a02a4 MS DG public message now post to twitter, if connected 2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -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
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
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
cf6850b3f6 updating rspec to 2.0 proper 2010-10-13 23:21:25 -07:00
Shawn McGuire
ca571432c2 Changed remaining http:// to git:// 2010-10-12 16:28:42 -05: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
Raphael
d1a4ee0bcb Roll back em-http-request 2010-10-08 16:36:26 -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
Maxwell Salzberg
a09a6d82b7 updated bundler dependency to include newer ones 2010-10-04 09:45:12 -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
Raphael
4f89f957f1 Putting in version switches for gems that don't work in 1.9 2010-09-27 10:51:29 -07:00
Raphael
0aa8e0e753 Unfortunately, we can't put ruby-debug in the gemfile because it breaks 1.9.2 compatibility. Just put it back in locally when you want to use it, or figure out how to do a switch by ruby verison in the Gemfile 2010-09-27 10:39:29 -07:00
Dorian
e792344c0e Use improved whitespace:scrub_gratuitous_newlines 2010-09-26 12:52:39 -04: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
Stephen Caudill
294da214f7 Make ruby-debug available in test env 2010-09-26 11:31:03 -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
cadcb81583 Gems we don't actually need... 2010-09-23 12:33:27 -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
c6f5b4ed16 Basic 1.9.2 port 2010-09-16 14:41:33 +09: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
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
ilya
2311c33626 MS IZ mocked all the webrequest tests 2010-09-14 11:13:58 -07:00
Raphael
2d1a49abb5 Add refs to mongomapper and validatable 2010-09-08 10:00:17 -07:00
maxwell
804777f9ae MS; updated to released rails 2010-09-07 16:47:53 -07:00
Raphael
fbee957892 Specifying bson version to avoid whatever is fucking up in 1.0.6, we can 
move to it later
 2010-08-28 13:27:48 -07:00
Raphael
b87c936b34 use rsofaer redfinger 2010-08-23 15:51:43 -07:00
Raphael
09ed7141dd json 2010-08-19 16:46:46 -07:00
maxwell
20678060e7 selenium, ymls, a sample test 2010-08-19 15:44:23 -07:00
maxwell
a26543b4a5 rolling back 2010-08-18 21:22:49 -07:00
maxwell
fec0a5ed7f MS not going for real mongomapper yet 2010-08-18 17:56:36 -07:00
maxwell
6e2c42f8de MS app now works with rc1 2010-08-18 17:42:04 -07:00
Raphael
6b288361f9 Removed gemcutter from gemfile 2010-08-05 16:08:53 -07:00
Raphael
94406a5c27 Sprinkle back in bundle 2010-08-05 15:48:36 -07:00
ilya
4a3f6b2986 need to serialize key to bson 2010-08-04 21:08:25 -07:00
ilya
5dfc097c88 replaced the functionality with openssl, didn't do the encryption spec 2010-08-04 20:32:15 -07:00
maxwell
4f78af5623 Gemfile 2010-07-29 17:03:08 -07:00
maxwell
a534d6424e gemfile 2010-07-29 16:58:14 -07:00
maxwell
004233ed73 gemfile 2010-07-29 16:53:12 -07:00
maxwell
3fac7c8dbc roll back gemfile 2010-07-29 16:35:15 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
Raphael
89a39da99e specifying em-http ref 2010-07-17 19:29:03 -07:00
maxwell
f483c2f66d MS found one more duplicate in the Gemfile 2010-07-17 14:05:57 -07:00
maxwell
0905c17386 MS notes and GEMFILE formatting 2010-07-17 14:04:43 -07:00
maxwell
a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails 
Conflicts:
	Gemfile
 2010-07-16 21:33:57 -07:00
maxwell
36c911d20b IZ MS added diaspora rel to webfinger profile 2010-07-16 21:33:08 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00
Raphael
9165ac413a image uploading started 2010-07-16 12:31:24 -07:00
Raphael
788f668db0 updated bson_ext 2010-07-15 15:49:28 -07:00
Raphael
c82f41e740 Merging in master 2010-07-14 12:16:24 -07:00
maxwell
1b63fbbec7 DG MS added pubsub gem, added hub to message queue 2010-07-14 11:01:28 -07:00
ilya
bb146820bf IZ RS, new Gemfile, ignoring the random_seed 2010-07-12 11:43:16 -07:00
ilya
174eb7e8f7 Merging in Master 2010-07-12 11:28:39 -07:00
Raphael
c3832cd2a7 Reverting gemfile change 2010-07-11 13:03:39 -07:00
ilya
4562de3525 MS IZ merged master into encryption 2010-07-11 00:25:08 -04:00
maxwell
a02a833625 updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too 2010-07-10 00:32:58 -07:00
ilya
9e8426ceb4 RS, IZ; Users now have keys, keyring now in db folder 2010-07-08 19:57:10 -04:00
Raphael
4819ce694b removed emspec from gemfile 2010-07-08 10:27:22 -07:00
maxwell
bf0afeede0 i really have no clue why this works nwow 2010-07-07 16:41:42 -07:00
Raphael
5e78163df3 added bundler to gemfile 2010-07-06 19:23:34 -07:00
maxwell
46ab63de36 added will pagination action. 2010-06-28 21:56:58 -07:00
maxwell
5f3a6a7aa0 MS mongomapper works kinda 2010-06-24 17:22:49 -07:00
Raphael
5add5188c6 specified devise ref 2010-06-23 10:20:44 -07:00
maxwell
fd5d7c63ad messy application.haml file i know, but now the sockets only update pages which want their data 2010-06-22 18:59:11 -07:00
maxwell
0546bb2582 pulled in all of max's changes from yesterday to 187 2010-06-22 10:39:06 -07:00
maxwell
0ef2214526 Merge branch 'master' of github.com:diaspora/diaspora_rails into 192_magic_funhouse 2010-06-22 10:33:45 -07:00
Raphael
81f5ca7ef3 added sprinkle to bundler 2010-06-22 10:29:01 -07:00
maxwell
51279cd519 turned on mutex in dev. totally my bad 2010-06-22 10:12:13 -07:00
maxwell
3581f7a7d6 merged in socket 2010-06-20 22:13:24 -07:00
maxwell
1610e72de9 fixed merge 2010-06-20 11:13:21 -07:00
maxwell
70ade8bd66 added another gem 2010-06-20 11:11:34 -07:00
maxwell
5637fa4e4c update em-http-request, removed the mutex because we are thin. also removed some uneeded config for database cleaner in the test setup env 2010-06-19 15:48:50 -07:00
maxwell
1fcd758bd4 removed the mutex, added rack fiber pool. this thing screams 2010-06-19 15:07:12 -07:00
maxwell
1e0e0bce79 fixing merge with master 2010-06-19 14:57:37 -07:00
maxwell
ea7abccd72 fixed the addressable issue; we needed to specify the actuall file the gem gets required as ::sigh:: 2010-06-19 14:56:20 -07:00
maxwell
2f6a11f018 fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit 2010-06-19 14:42:23 -07:00
maxwell
63866a8128 playing 2010-06-18 23:47:42 -07:00
Raphael Sofaer
acfa7df1c5 Merge Capistrano into master 2010-06-18 23:41:02 -07:00
Raphael Sofaer
414b18fb15 added thin to gemfile 2010-06-18 17:37:56 -07:00
maxwell
c430aaff18 DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml 2010-06-18 14:35:51 -07:00
danielvincent
3371b87fff DG MS; queue works. just need to move some tests over. 2010-06-17 11:32:13 -07:00
danielvincent
d91cec0881 queue works. needs cleanup. 2010-06-17 10:29:30 -07:00
Maxwell Salzberg
67535c1113 tried to git rid of error in em-http-request 2010-06-17 09:20:59 -07:00
danielvincent
43207aeb41 pending: resolving post action in queue 2010-06-16 23:12:23 -07:00
ilya
8a37843cd9 IZ no more message= in newest in status message model 2010-06-15 13:23:24 -04:00
ilya
ee295d01ff IZ using factories for the spec 2010-06-15 13:18:26 -04:00
maxwell
408c2c719d swaped out js for jquery 2010-06-15 09:53:19 -07:00
maxwell
1f73c2351e DG MS IZ; Status message renders to and from xml; Friend model in place 2010-06-14 16:20:57 -07:00
maxwell
0ff541ba43 fixed the dumb autotest bug. by adding mocha, it seemed to work. also fixed a bug where authenticate is called to warden and a view IZ MS 2010-06-14 11:05:55 -07:00
maxwell
3fd7f2719b added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster 2010-06-13 15:46:40 -07:00
danielvincent
eaeafd3240 added authentication via devise 2010-06-12 21:56:50 -07:00
maxwell
e068707158 added nifty templates, and started a user model. session model is next 2010-06-12 15:26:37 -07:00
maxwell
e1a0c2f365 got rspec fully working 2010-06-12 14:44:58 -07:00
Maxwell Salzberg
a663844eef MS IZ set up mongoid and got rid of activerecord sqlite3 nonsense 2010-06-12 00:59:19 -07:00
Raphael Sofaer
0390bbde8a Activerecord this time\! 2010-06-11 10:40:49 -07:00