maxwell
|
9da5399425
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 00:42:52 -07:00 |
|
maxwell
|
e7f764ffeb
|
attack vector where you take posts from valid (unknown) diaspora people is now fixed
|
2010-10-20 00:42:33 -07:00 |
|
danielvincent
|
e7d7e1f258
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 00:02:22 -07:00 |
|
danielvincent
|
d2945c83dc
|
status message show is now a real show page. photo partial in stream shouldn't display a slideshow of album.
|
2010-10-20 00:02:15 -07:00 |
|
Raphael
|
a01c1c7461
|
Remove remove_all_aspects without ill effect
|
2010-10-19 23:54:12 -07:00 |
|
Raphael
|
d3d0182164
|
Put database cleaner back in
|
2010-10-19 23:29:59 -07:00 |
|
Raphael
|
d98ac70155
|
Clean up some repetition in specs
|
2010-10-19 23:29:59 -07:00 |
|
Raphael
|
197bd8eb49
|
make user/receive spec less repetitive
|
2010-10-19 23:29:59 -07:00 |
|
Raphael
|
74ec629b01
|
user_friending_spec passes again
|
2010-10-19 23:29:59 -07:00 |
|
Raphael
|
52f7350f78
|
Fix a couple more specs
|
2010-10-19 23:29:59 -07:00 |
|
Raphael
|
43dd95147e
|
Starting to remove database-cleaner
|
2010-10-19 23:29:58 -07:00 |
|
Sarah Mei
|
b007ba1487
|
Fixed cucumber features. Backfilled tests for AspectsController#create.
|
2010-10-19 22:57:55 -07:00 |
|
Sarah Mei
|
f8400389de
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 22:39:05 -07:00 |
|
Sarah Mei
|
81ef7386b3
|
validation errors in profile and person bubble up to user.
|
2010-10-19 22:33:12 -07:00 |
|
Sarah Mei
|
8cf1b83662
|
cucumber feature closer to passing.
|
2010-10-19 22:29:07 -07:00 |
|
maxwell
|
d0055cee37
|
changed a bit of text in the invite, also made it show on all aspects now that we have it fixed
|
2010-10-19 21:07:10 -07:00 |
|
maxwell
|
e7f84f5434
|
fix hcard when parsing friend photo
|
2010-10-19 20:46:43 -07:00 |
|
maxwell
|
f26dc039c9
|
removed empty hash from invite email
|
2010-10-19 20:43:45 -07:00 |
|
maxwell
|
bfe57b13cc
|
added diaspora handle to user profile page
|
2010-10-19 20:34:10 -07:00 |
|
maxwell
|
da95930c9a
|
added a bit to test email
|
2010-10-19 20:23:20 -07:00 |
|
danielvincent
|
d200aaab52
|
mail has some style. couldn't figure out devise mailer templating at the time...
|
2010-10-19 18:26:02 -07:00 |
|
Raphael
|
14a5eee41c
|
Return if there is a failure to create a user
|
2010-10-19 17:29:22 -07:00 |
|
Raphael
|
360891496e
|
Check that time serializes correctly post-parse, not on string equality
|
2010-10-19 17:09:52 -07:00 |
|
danielvincent
|
8751503aa4
|
header on public explain fancybox
|
2010-10-19 16:28:45 -07:00 |
|
danielvincent
|
f6303b8fff
|
reshare dropdown looks nicer. fixed user menu to drop down on click
|
2010-10-19 16:16:46 -07:00 |
|
Raphael
|
3557d66749
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 16:07:03 -07:00 |
|
Raphael
|
9309be2d69
|
Merge branch 'import'
Conflicts:
spec/models/user/invite_spec.rb
|
2010-10-19 16:06:48 -07:00 |
|
ilya
|
24b136bbd9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 15:42:51 -07:00 |
|
ilya
|
4e9e716783
|
another attack vector spec
|
2010-10-19 15:42:40 -07:00 |
|
Alec Leamas
|
8dbd61f167
|
Point fix: error in diaspora-setup (x2) blocks build.
|
2010-10-19 23:39:22 +02:00 |
|
danielvincent
|
35a59d3982
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 14:07:09 -07:00 |
|
Raphael
|
ea36790e21
|
Add gzipped source.tar to gitignore
|
2010-10-19 14:06:57 -07:00 |
|
danielvincent
|
0a4bf225d0
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 14:06:51 -07:00 |
|
danielvincent
|
b218a53bf7
|
fancyboxes have title bars now, kind of.
|
2010-10-19 14:06:44 -07:00 |
|
Raphael
|
d6f8fe106a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 13:51:43 -07:00 |
|
Raphael
|
2c66bbbe00
|
Strip profile names, resolve 357
|
2010-10-19 13:51:31 -07:00 |
|
danielvincent
|
8c92c31323
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 12:29:34 -07:00 |
|
danielvincent
|
0621aa2f6c
|
fixed no friends/posts message positioning
|
2010-10-19 12:28:54 -07:00 |
|
Raphael
|
962f282cbc
|
Validate uniqueness of aspect name, 359
|
2010-10-19 12:23:24 -07:00 |
|
danielvincent
|
d87345ca33
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 12:10:36 -07:00 |
|
danielvincent
|
ea00d35f1f
|
padding on stream fix. added add aspect button in aspect nav.
|
2010-10-19 12:10:22 -07:00 |
|
Raphael
|
d68644c358
|
Resolve #387
|
2010-10-19 11:47:43 -07:00 |
|
Raphael
|
296afdc871
|
Beat Dan at bugfixing
|
2010-10-19 11:43:10 -07:00 |
|
Raphael
|
9f653e39f1
|
Fix bug 376
|
2010-10-19 11:39:52 -07:00 |
|
Raphael
|
de0b240dbb
|
Remove unused helper method
|
2010-10-19 11:36:33 -07:00 |
|
danielvincent
|
3866b83dab
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-19 11:29:47 -07:00 |
|
danielvincent
|
7e9585c5f0
|
default user picture change. stream link on all aspects page fix. layout view is not fragmented.
|
2010-10-19 11:29:29 -07:00 |
|
Raphael
|
fce902821b
|
Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive.
|
2010-10-19 11:06:43 -07:00 |
|
Raphael
|
adb559155a
|
Revert change from ps ax to pgrep, pgrep isn't on every computer
|
2010-10-19 10:29:23 -07:00 |
|
Raphael
|
2893c3766b
|
Delete em-webfinger file from other branch
|
2010-10-19 10:09:04 -07:00 |
|