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

133 commits

Author SHA1 Message Date
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