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 |
|