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 |
|
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
|
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 |
|
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 |
|
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 |
|
maxwell
|
8ada8414c7
|
username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons
|
2010-10-18 22:55:09 -07:00 |
|
ilya
|
8894fa4daa
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-18 16:28:57 -07:00 |
|
ilya
|
d642928268
|
invite sends friend request if already friends, and raises if already friends
|
2010-10-18 16:27:02 -07:00 |
|
Raphael
|
676e802fd2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-18 15:46:44 -07:00 |
|
Raphael
|
b681850783
|
Get rid of warning/error on invites/_new partial
|
2010-10-18 15:46:14 -07:00 |
|
ilya
|
7ab2b00231
|
moved fb posting into the user model
|
2010-10-18 14:50:48 -07:00 |
|
ilya
|
a8bf082e35
|
The invitation now has an optional personal message
|
2010-10-18 14:35:41 -07:00 |
|
Raphael
|
244accc9a9
|
flash error on friending self
|
2010-10-18 12:11:32 -07:00 |
|
Raphael
|
f90d38bb9c
|
Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge
|
2010-10-18 12:00:20 -07:00 |
|
Raphael
|
3436371a96
|
Merge remote branch 'archi/332-quickfix'
|
2010-10-18 11:44:47 -07:00 |
|
Raphael
|
8e4691b9d0
|
Merge remote branch 'rmaskey/269-album-link'
|
2010-10-18 11:27:13 -07:00 |
|
danielvincent
|
4b1516542d
|
various. fixed publisher in new layout.
|
2010-10-18 11:00:52 -07:00 |
|
danielvincent
|
54e5fb4abb
|
add new aspect back on manage page. changed badges
|
2010-10-18 11:00:52 -07:00 |
|
danielvincent
|
15104cf920
|
somewhat there
|
2010-10-18 11:00:52 -07:00 |
|
ilya
|
e648042b15
|
the user destroy now deletes the aspects
|
2010-10-18 10:26:45 -07:00 |
|
ilya
|
73dfab8601
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-18 09:56:36 -07:00 |
|
archi
|
5e97fd3b52
|
Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix
|
2010-10-18 11:06:42 +02:00 |
|
danielvincent
|
eca37e1a28
|
small view cleanups
|
2010-10-17 21:55:03 -07:00 |
|
danielvincent
|
2f5547626e
|
fixed error in status_messages_controller
|
2010-10-17 21:31:12 -07:00 |
|
danielvincent
|
1139299f42
|
removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller
|
2010-10-17 20:47:51 -07:00 |
|
danielvincent
|
108bf9d99e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-17 19:33:57 -07:00 |
|