danielvincent
|
4b74796c07
|
16 pictures on aspect listings
|
2011-01-19 16:06:35 -08:00 |
|
maxwell
|
120c07ddf5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-19 16:04:54 -08:00 |
|
maxwell
|
35432880b2
|
adding timeago when the inf. scroll is involked
|
2011-01-19 16:04:46 -08:00 |
|
Raphael
|
f35f0212dd
|
Show the right contacts
|
2011-01-19 15:54:49 -08:00 |
|
zhitomirskiyi
|
122f182a4c
|
limit to 16 in the view
|
2011-01-19 15:52:52 -08:00 |
|
Raphael
|
a444198843
|
Remove mongo from chef
|
2011-01-19 15:39:09 -08:00 |
|
Dorian
|
3976489984
|
Checks for redis.conf in /usr/local (by justthisguy)
|
2011-01-19 23:42:23 +01:00 |
|
zhitomirskiyi
|
9c1184bd29
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-19 14:30:55 -08:00 |
|
zhitomirskiyi
|
fc6d641643
|
correct requires
|
2011-01-19 14:30:34 -08:00 |
|
Raphael
|
2578ac15b6
|
Add some indicies
|
2011-01-19 14:29:22 -08:00 |
|
zhitomirskiyi
|
aeab29aa38
|
removed the backup crons
|
2011-01-19 14:20:06 -08:00 |
|
maxwell
|
e7a065a521
|
make jobs have a base class, which will verify the activerecord connection before trying the job
|
2011-01-19 14:10:42 -08:00 |
|
maxwell
|
934f56b553
|
make description text darker and more readable on getting started
|
2011-01-19 13:31:25 -08:00 |
|
maxwell
|
465dd9ba96
|
check to see if rails is already loaded in a couple of places
|
2011-01-19 13:30:12 -08:00 |
|
MrZYX
|
3dcb3d3e2c
|
updated locales
|
2011-01-19 21:41:43 +01:00 |
|
MrZYX
|
7f8ee17b40
|
pass @contacts to partial in aspects/index.js.erb
|
2011-01-19 21:09:06 +01:00 |
|
Sarah Mei
|
dd3f8f4bee
|
Add compound index to post_visibilities
|
2011-01-19 00:19:16 -08:00 |
|
Sarah Mei
|
b43c29745b
|
Fix build by turning off transactional fixtures in the import spec.
|
2011-01-19 00:16:11 -08:00 |
|
maxwell
|
6e65f3408d
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
spec/models/jobs/socket_webfinger_spec.rb
|
2011-01-18 22:47:04 -08:00 |
|
maxwell
|
72e10cfad6
|
remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times
|
2011-01-18 22:45:43 -08:00 |
|
maxwell
|
02ab24335a
|
remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times
|
2011-01-18 22:39:14 -08:00 |
|
maxwell
|
85b824babc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 22:12:11 -08:00 |
|
maxwell
|
7a02a31440
|
fix invitations#new, and a post spec which was mongo specific
|
2011-01-18 22:11:58 -08:00 |
|
Raphael
|
3935d978ac
|
Take some queries out of views
|
2011-01-18 19:11:01 -08:00 |
|
zhitomirskiyi
|
960058803a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 17:23:03 -08:00 |
|
zhitomirskiyi
|
21bccedf9b
|
notification eagerly load the target
|
2011-01-18 17:22:48 -08:00 |
|
danielvincent
|
4f25dfa6d3
|
publics controller merge fix
|
2011-01-18 17:14:32 -08:00 |
|
zhitomirskiyi
|
5ac194911f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 17:07:03 -08:00 |
|
zhitomirskiyi
|
e7a4c47f0a
|
include target for notification
|
2011-01-18 17:06:54 -08:00 |
|
danielvincent
|
849a5476ab
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 17:06:15 -08:00 |
|
danielvincent
|
3dd2384458
|
Merge branch 'fixturebuilder'
Conflicts:
spec/controllers/people_controller_spec.rb
spec/controllers/publics_controller_spec.rb
spec/lib/diaspora/parser_spec.rb
|
2011-01-18 17:05:44 -08:00 |
|
Raphael
|
38dd58315d
|
typo
|
2011-01-18 17:04:22 -08:00 |
|
danielvincent
|
1fa39ad20d
|
fixed issue in attack_vectors_spec
|
2011-01-18 16:58:59 -08:00 |
|
zhitomirskiyi
|
38a3193a61
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 16:58:04 -08:00 |
|
zhitomirskiyi
|
63590e2e7e
|
restore hashes for person for person#index. since request relations are one way, the building the hash is perhaps simpler than alternitives"
|
2011-01-18 16:57:34 -08:00 |
|
danielvincent
|
511a48adde
|
fixed publicscontroller specs
|
2011-01-18 16:52:11 -08:00 |
|
Raphael
|
3b394c1c89
|
One more defualt scope out
|
2011-01-18 16:48:02 -08:00 |
|
Raphael
|
e6e2ba9cfb
|
Take out default scopes
|
2011-01-18 16:46:52 -08:00 |
|
zhitomirskiyi
|
ef1b7644f3
|
got rid of more hash from
|
2011-01-18 16:38:31 -08:00 |
|
zhitomirskiyi
|
3e6a271ad8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2011-01-18 16:22:03 -08:00 |
|
zhitomirskiyi
|
004094d66f
|
fixed the querying in the controllers got rid of hashes
|
2011-01-18 16:21:14 -08:00 |
|
Raphael
|
85bae12a00
|
Query on guid, not id
|
2011-01-18 16:07:58 -08:00 |
|
Raphael
|
6ccf8a4d2d
|
Fixed connecting spec, magic import failure disappearance
|
2011-01-18 16:05:50 -08:00 |
|
Raphael
|
9e5cf1e1a4
|
Fix person receive urls
|
2011-01-18 15:21:04 -08:00 |
|
Raphael
|
bad7399eeb
|
Remove yml files from git
|
2011-01-18 15:18:58 -08:00 |
|
Raphael
|
88ebd14799
|
Fixture builder working, need to make specs not require a clean db
|
2011-01-18 14:53:46 -08:00 |
|
Raphael
|
1353929d44
|
Made specs work with fixtures, spec_helper needs work
|
2011-01-18 13:31:10 -08:00 |
|
zhitomirskiyi
|
d0074d0d8a
|
no more mongo check in script server
|
2011-01-18 11:01:09 -08:00 |
|
zhitomirskiyi
|
41c83a7e19
|
mousedown so that new tab opening would make notification go down
|
2011-01-18 10:51:05 -08:00 |
|
zhitomirskiyi
|
0cb9f1c0d7
|
focus publisher on reshare
|
2011-01-18 10:51:05 -08:00 |
|