Alec Leamas
|
6502e28fbf
|
bugfix
|
2010-10-24 13:19:00 +02:00 |
|
ilya
|
c7b9ecb20c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-24 01:48:45 -07:00 |
|
ilya
|
8d61fb0aeb
|
tiny bug in the spec
|
2010-10-24 01:45:26 -07:00 |
|
danielvincent
|
f8347a3dd4
|
added tipsy tooltips for user pictures on left pane in aspect#index and aspect#show
|
2010-10-23 22:21:51 -07:00 |
|
danielvincent
|
18acdc7b55
|
everyone instead of all on aspect#index page. photo partial avatar now links to poster's profile.
|
2010-10-23 22:01:01 -07:00 |
|
Alec Leamas
|
0a5055514d
|
Merge branch 'v2'
|
2010-10-23 16:49:13 +02:00 |
|
Alec Leamas
|
06215365b4
|
testing
|
2010-10-23 16:48:44 +02:00 |
|
danielvincent
|
f5a0f44c25
|
fixed error in posting to all albums through publisher on albums#index
|
2010-10-23 00:36:29 -07:00 |
|
Alec Leamas
|
05616b698f
|
Merge branch 'v2'
|
2010-10-23 07:27:34 +02:00 |
|
Alec Leamas
|
abec01f98b
|
testing
|
2010-10-23 07:27:28 +02:00 |
|
Alec Leamas
|
537360bf95
|
Merge branch 'v2'
|
2010-10-23 06:22:53 +02:00 |
|
Alec Leamas
|
4ecb3d0b51
|
testing
|
2010-10-23 06:22:48 +02:00 |
|
Alec Leamas
|
578e3a594d
|
Merge branch 'v2'
|
2010-10-23 05:40:09 +02:00 |
|
Alec Leamas
|
164cc7e6f6
|
testing
|
2010-10-23 05:39:56 +02:00 |
|
Alec Leamas
|
1a49f3fb7d
|
Merge remote branch 'upstream/master'
|
2010-10-23 05:14:10 +02:00 |
|
Alec Leamas
|
c28da31f61
|
testing
|
2010-10-23 04:50:04 +02:00 |
|
Alec Leamas
|
1bb046dd1e
|
testing
|
2010-10-23 04:32:29 +02:00 |
|
ilya
|
a60287348d
|
not overwriting app config if it already exists
|
2010-10-22 19:13:35 -07:00 |
|
maxwell
|
606a6bb43a
|
status message length is limited to 1000 chars.
|
2010-10-22 17:42:59 -07:00 |
|
maxwell
|
6913381781
|
username now can only contain letters numbers, periods, and underscores
|
2010-10-22 17:26:10 -07:00 |
|
maxwell
|
096a0308e1
|
update attachment with emails
|
2010-10-22 17:12:28 -07:00 |
|
maxwell
|
9748767ec9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-22 16:57:12 -07:00 |
|
maxwell
|
de04e717c0
|
made image or default to help with hcard parsing, deleted old default user picture
|
2010-10-22 16:57:01 -07:00 |
|
ilya
|
b337d5acc9
|
delivery method test in tests
|
2010-10-22 16:36:54 -07:00 |
|
maxwell
|
5af3d5fa82
|
double checking that matches are in front or back
|
2010-10-22 16:34:08 -07:00 |
|
maxwell
|
6720fa2c59
|
added tests to make sure Person.by_webfinger only returns exact matches
|
2010-10-22 16:28:03 -07:00 |
|
danielvincent
|
c0423e5e56
|
reverting commit manually
|
2010-10-22 15:57:00 -07:00 |
|
danielvincent
|
829ad6360a
|
multiple dropzones function. person image does not copy, delete is disabled.
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
a52870b21c
|
improved animations
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
e1f4e12b8f
|
style. also, made sense of aspect-edit.js
|
2010-10-22 15:56:28 -07:00 |
|
danielvincent
|
69528b95a3
|
removed ignore bucket. people now have x's to delete them
|
2010-10-22 15:56:27 -07:00 |
|
danielvincent
|
b5976753ea
|
removed unused view
|
2010-10-22 15:47:22 -07:00 |
|
danielvincent
|
f2cfa3c378
|
user name in breadcrumb
|
2010-10-22 15:38:22 -07:00 |
|
maxwell
|
837b418201
|
reverting, going to write a test
|
2010-10-22 15:37:22 -07:00 |
|
danielvincent
|
f20078cc5c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-22 15:32:50 -07:00 |
|
danielvincent
|
ed4c253ea8
|
show pages now identify content with content creator. publisher now takes a local
|
2010-10-22 15:32:41 -07:00 |
|
maxwell
|
b96e838d1f
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/models/person.rb
|
2010-10-22 15:28:50 -07:00 |
|
maxwell
|
bcec2d04e6
|
do not pass in the diaspora handle query as a regex, we want to search on the string literal. also use dynamic finder
|
2010-10-22 15:27:59 -07:00 |
|
maxwell
|
ebfdaea38f
|
do not pass in the diaspora handle query as a regex, we want to search on the string literal. also use dynamic finder
|
2010-10-22 15:24:46 -07:00 |
|
Alec Leamas
|
79aa1f34a6
|
test
|
2010-10-22 22:30:53 +02:00 |
|
ilya
|
637d35d673
|
Remove puts
|
2010-10-22 12:27:28 -07:00 |
|
ilya
|
cbd3487705
|
moved the nailer to the end so setup of mailer doesnt mess with the communitcation
|
2010-10-22 12:00:14 -07:00 |
|
ilya
|
d1a2ebd236
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-22 11:56:04 -07:00 |
|
ilya
|
9a217d1fa8
|
MS IZ request acceptance email
|
2010-10-22 11:55:50 -07:00 |
|
Raphael
|
7dd86b3c87
|
Move comment signing spec to comment spec, make encryption spec not depend on message building
|
2010-10-22 11:18:43 -07:00 |
|
Raphael
|
d8bbe38019
|
Move spec to request_spec
|
2010-10-22 11:11:51 -07:00 |
|
Raphael
|
1a19c28199
|
Move spec to user_spec
|
2010-10-22 11:10:35 -07:00 |
|
Raphael
|
b67cee9af0
|
Trying to make spec directory structure the same as the lib and app structures
|
2010-10-22 11:09:20 -07:00 |
|
Raphael
|
61d539e555
|
Moving user_encryption_spec to lib
|
2010-10-22 11:06:31 -07:00 |
|
Raphael
|
6993f3e2b5
|
Fix spec in user_encryption
|
2010-10-22 11:05:37 -07:00 |
|