maxwell
|
544f7f08e5
|
MS IZ doesn't delete from pending friends since there is nothing in it
|
2010-08-09 10:38:13 -07:00 |
|
maxwell
|
7be374ac48
|
MS IZ fixed a couple of view things as well as the dev db seed script
|
2010-08-09 10:10:41 -07:00 |
|
Raphael
|
39998db052
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-09 09:48:40 -07:00 |
|
ilya
|
890f927492
|
removed references of mine? method in all views
|
2010-08-08 22:53:23 -07:00 |
|
ilya
|
ec13527717
|
buren back in the game, THE GAME
|
2010-08-08 21:53:54 -07:00 |
|
ilya
|
6acdde7313
|
fixing the seed script for the refactor
|
2010-08-08 21:42:08 -07:00 |
|
ilya
|
fb4254535d
|
DG IZ; slashes and http in seed script
|
2010-08-08 21:32:09 -07:00 |
|
ilya
|
27b4c19337
|
Getting the deployment changes from master
|
2010-08-08 21:24:34 -07:00 |
|
ilya
|
c6980ae7cc
|
Fixed typo in the rails env not being set
|
2010-08-08 21:08:08 -07:00 |
|
ilya
|
719bf450e1
|
I can't get no satisfaction from get satisfaction
|
2010-08-08 20:54:50 -07:00 |
|
root
|
b6934a55d1
|
the required file permission change for the private key now happens
|
2010-08-09 03:28:55 +00:00 |
|
root
|
41e6fc31a3
|
final sprinkle change
|
2010-08-09 03:11:32 +00:00 |
|
ilya
|
86c43ecbd8
|
moving ssh key relatedstuff around in sprinkle scrip
|
2010-08-08 19:48:55 -07:00 |
|
ilya
|
49544135a1
|
Removing existing ssh key directory
|
2010-08-08 19:16:20 -07:00 |
|
ilya
|
a91fc08105
|
spacing typo
|
2010-08-08 18:46:19 -07:00 |
|
ilya
|
0869e3b49a
|
adding buren back going to reimage the presidents
|
2010-08-08 18:17:51 -07:00 |
|
ilya
|
84d4f6061b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-08-08 17:15:24 -07:00 |
|
ilya
|
331295be76
|
Temp, removing buren
|
2010-08-08 17:14:39 -07:00 |
|
ilya
|
8e6dfe7166
|
DG IZ having an email key makes devise work, ring to deploy
|
2010-08-08 17:00:39 -07:00 |
|
danielvincent
|
a6f5603dc9
|
added email field to login screen. strange error won't let me log in?
|
2010-08-06 23:55:05 -07:00 |
|
maxwell
|
f4ca29da41
|
PeopleController now renders json when given a query. Unfortunately, it only renders the matching friend ids without first or last names...
|
2010-08-06 17:19:33 -07:00 |
|
Raphael
|
214685e5a9
|
Dev seed might now work
|
2010-08-06 17:11:50 -07:00 |
|
Raphael
|
7076097ee4
|
RS, IZ; The tests are green.
|
2010-08-06 16:56:13 -07:00 |
|
maxwell
|
58de12df5e
|
DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name)
|
2010-08-06 16:35:02 -07:00 |
|
Raphael
|
4350e17656
|
RS, IZ; removed lots of putses, fixed up request, parser, retractions
|
2010-08-06 16:01:39 -07:00 |
|
Raphael
|
f2e327d908
|
User factory now works
|
2010-08-06 13:27:42 -07:00 |
|
Raphael
|
0f596af5c4
|
Refactored message_queue getting, fixed retraction spec
|
2010-08-06 13:13:00 -07:00 |
|
Raphael
|
5b14c4822c
|
RS, IZ; webhooks spec should use user.post
|
2010-08-06 12:19:40 -07:00 |
|
Raphael
|
62e6ea0756
|
Error rescue in parser now is specific to not a real type error
|
2010-08-06 12:14:51 -07:00 |
|
Raphael
|
d130b82e42
|
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
|
2010-08-06 11:52:33 -07:00 |
|
Raphael
|
6449d20687
|
Working on devise mocking in helper specs
|
2010-08-06 11:19:40 -07:00 |
|
danielvincent
|
6f1a596dff
|
small color changes
|
2010-08-06 00:40:44 -07:00 |
|
danielvincent
|
c54d47337b
|
updated button style
|
2010-08-06 00:15:22 -07:00 |
|
Raphael
|
a46212ec09
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-05 19:17:09 -07:00 |
|
Raphael
|
b5cbfab36e
|
RS, IZ; Comment spec now passes
|
2010-08-05 19:01:45 -07:00 |
|
maxwell
|
5d924dadf4
|
MS DG; 19 failing specs left
|
2010-08-05 17:16:51 -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 |
|
Raphael
|
8356126f8d
|
Added deploy key
|
2010-08-05 15:44:18 -07:00 |
|
maxwell
|
7a1011c46c
|
DG MS; webhook specs fixed
|
2010-08-05 15:41:32 -07:00 |
|
maxwell
|
dc0eb7de51
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into friend-refactor
|
2010-08-05 15:13:59 -07:00 |
|
maxwell
|
5e6d0c1153
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into
friend-refactor, also fixed more specs
Conflicts:
app/models/person.rb
app/models/user.rb
spec/factories.rb
|
2010-08-05 15:13:05 -07:00 |
|
Raphael
|
49fabe77d4
|
Took another hardcoded piece out of deploy.rb
|
2010-08-05 15:08:44 -07:00 |
|
Raphael
|
bffb63d9f0
|
IZ, RS; Moved every instance of hardcoded backer info out to yml file config/deploy_config.yml
|
2010-08-05 14:39:48 -07:00 |
|
maxwell
|
cc04d4e08d
|
MS DG; more tests pass after making person have many people
|
2010-08-05 13:25:31 -07:00 |
|
danielvincent
|
67d4aea1db
|
DG MS; fixed album specs
|
2010-08-05 12:00:23 -07:00 |
|
Raphael
|
124fa7c78a
|
Deploy from master
|
2010-08-05 11:57:24 -07:00 |
|
danielvincent
|
dae8f26692
|
DG MS; fixed most photo specs
|
2010-08-05 11:56:37 -07:00 |
|
Raphael
|
bb66e87905
|
RS, IZ; Encryption specs now pass with openssl
|
2010-08-05 11:56:31 -07:00 |
|
Raphael
|
f8e7d3f313
|
RS, IZ; Rolling back special casing of friend-request
|
2010-08-05 11:14:40 -07:00 |
|