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 |
|
Raphael
|
c520fb71a7
|
Moved socket out to separate process. Multiple thins should now be possible
|
2010-09-16 21:34:15 -07: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 |
|