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 |
|
Joseph Method
|
e3e4a6b319
|
Continuation of previous commit
|
2010-10-17 19:07:54 -04:00 |
|
archi
|
baa0b43655
|
Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix
|
2010-10-17 21:19:27 +02:00 |
|
Sarah Mei
|
fcdcf88a79
|
Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger.
|
2010-10-17 12:18:53 -07:00 |
|
archi
|
1d9aa4c43d
|
Modified spec (doesn't check Youtube handling due to disabled net::http)
|
2010-10-17 21:07:49 +02:00 |
|
archi
|
f2af56f4b2
|
Youtubelink support :)
Tested with Firefox, Chrome and Mobile Safari (IE8 is broken anyway)
|
2010-10-17 20:18:24 +02:00 |
|
danielvincent
|
7160e9f85b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-17 10:25:38 -07:00 |
|
archi
|
f676e284f7
|
Added Youtube links - Still TODO: Caching of titles!
|
2010-10-17 16:14:01 +02:00 |
|
archi
|
8e753cc073
|
Youtube proof of concept patch/preview - not done yet (see bug #332)
|
2010-10-17 12:56:26 +02:00 |
|
Sarah Mei
|
50f9e8f240
|
Reorganize User model. Preserve case of username.
|
2010-10-16 23:58:01 -07:00 |
|
Sarah Mei
|
f688653936
|
disallow whitespace in username
|
2010-10-16 23:34:58 -07:00 |
|
Sarah Mei
|
798d904e7e
|
strip username on create
|
2010-10-16 23:27:18 -07:00 |
|
Sarah Mei
|
d3a62c7a45
|
RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up.
|
2010-10-16 22:02:51 -07:00 |
|
Sarah Mei
|
1b6726354f
|
Backfill specs for RegistrationsController#create.
Remove RegistrationsController#new (which just called super, so it's not necessary).
|
2010-10-16 21:14:37 -07:00 |
|
archi
|
035db98367
|
Added HTML links to posts
|
2010-10-17 02:06:46 +02:00 |
|
rmaskey
|
569376df00
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:32:02 -04:00 |
|
rmaskey
|
7c99b89d43
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:31:47 -04:00 |
|
romanov
|
2787eb0c6b
|
Issue #269: the album back link updated for aspect reference
|
2010-10-16 19:26:46 -04:00 |
|
danielvincent
|
eafc01de2a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-16 12:33:33 -07:00 |
|
maxwell
|
13a2464484
|
adding a confirm link on the aspect remove button
|
2010-10-16 02:55:45 -07:00 |
|
danielvincent
|
5ca3570667
|
added prefetch rels to prev/next links in photo show. fixed shadow bug in header
|
2010-10-16 02:06:46 -07:00 |
|
ilya
|
f33298e762
|
removed the puts, initial token checking
|
2010-10-16 00:42:37 -07:00 |
|
danielvincent
|
72479343bc
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 17:37:39 -07:00 |
|
danielvincent
|
7611bc1c8f
|
user dropdown
|
2010-10-15 17:37:32 -07:00 |
|
ilya
|
d4702aefa3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 17:20:19 -07:00 |
|
ilya
|
9727b356e1
|
the invitations add requests which are now correctly auto accepted
|
2010-10-15 17:20:04 -07:00 |
|
maxwell
|
adbe5f7c38
|
i love foaf
|
2010-10-15 16:54:56 -07:00 |
|
maxwell
|
ca604ffe5a
|
added public atom discovery link
|
2010-10-15 16:51:37 -07:00 |
|
maxwell
|
f83bddadc5
|
forgot to add the test; and cleaned up the explain partial
|
2010-10-15 16:19:07 -07:00 |
|
maxwell
|
a0ce9630b1
|
added test for facebook posting
|
2010-10-15 16:03:02 -07:00 |
|
maxwell
|
3af3e86911
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 16:02:43 -07:00 |
|
ilya
|
d06c6ced38
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 15:30:39 -07:00 |
|
danielvincent
|
47be7b1f0a
|
correct html5 search box
|
2010-10-15 15:29:57 -07:00 |
|
maxwell
|
d56800f9e8
|
fixing facebook posting
|
2010-10-15 14:53:36 -07:00 |
|
ilya
|
2c9c4b0e14
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/views/invitations/_new.haml
|
2010-10-15 14:36:49 -07:00 |
|
danielvincent
|
6f282e77ff
|
make public checkbox
|
2010-10-15 14:22:28 -07:00 |
|
ilya
|
0074aadd48
|
added a select tag to email invitations
|
2010-10-15 14:21:08 -07:00 |
|