zhitomirskiyi
|
63c740fce7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
|
2010-10-27 09:53:50 -07:00 |
|
Raphael
|
aa819d2113
|
Putting an index on Person#diaspora_handle
|
2010-10-26 19:16:16 -07:00 |
|
Raphael
|
49c09b9c8c
|
Remove unused clean_hash
|
2010-10-26 19:16:16 -07:00 |
|
zhitomirskiyi
|
fa484e95e4
|
MS IZ refactored querying
|
2010-10-26 17:05:38 -07:00 |
|
danielvincent
|
e62afae045
|
deselected tabs in top nav, made user drop down a bit clearer
|
2010-10-26 16:12:58 -07:00 |
|
danielvincent
|
6e015790a7
|
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
|
2010-10-26 16:02:53 -07:00 |
|
zhitomirskiyi
|
1024b8a3a7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
Conflicts:
app/controllers/aspects_controller.rb
|
2010-10-26 14:57:52 -07:00 |
|
zhitomirskiyi
|
b36ce1ac80
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-26 14:49:52 -07:00 |
|
zhitomirskiyi
|
8acdf21234
|
MS IZ got rid of the requests for me scope in the user
|
2010-10-26 14:49:37 -07:00 |
|
danielvincent
|
7f1d87f424
|
fixed pagination bug on aspect#show (re: #445)
|
2010-10-26 12:57:43 -07:00 |
|
zhitomirskiyi
|
e776389d19
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
|
2010-10-26 11:19:50 -07:00 |
|
maxwell
|
af917557f6
|
can't call match on nil
|
2010-10-25 22:56:50 -07:00 |
|
maxwell
|
a992c5fbc2
|
dont show service if you dont have the keys for it. also, update deploy script
|
2010-10-25 22:06:53 -07:00 |
|
danielvincent
|
060d8f9c7b
|
DG MS; fixed some bugs with posting publicly.
|
2010-10-25 19:24:48 -07:00 |
|
zhitomirskiyi
|
917d1838de
|
MS IZ specs are green
|
2010-10-25 18:55:51 -07:00 |
|
danielvincent
|
287d633c44
|
user#post now handles posting to services.
|
2010-10-25 17:41:59 -07:00 |
|
danielvincent
|
b2e8ebd0bc
|
OmniauthService -> Service. Cleaned up views.
|
2010-10-25 17:41:59 -07:00 |
|
danielvincent
|
3d302f8db7
|
facebook and twitter both use omniauth and are saved as OmniauthServices
|
2010-10-25 17:41:59 -07:00 |
|
maxwell
|
c489f49a25
|
DG beginning to collapse twitter&facebook
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
154b6e0ee7
|
MS DG added specs for posting to twitter, and basic services controller tests
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
606c7a02a4
|
MS DG public message now post to twitter, if connected
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
c4ff07b09a
|
twitter oauth dance complete
|
2010-10-25 17:41:58 -07:00 |
|
maxwell
|
b17ae0bf38
|
DG MS removed unused fb_status model and respective specs, fixtures.
|
2010-10-25 12:26:08 -07:00 |
|
danielvincent
|
7b3f6f66c1
|
removed second #stream declaration on status_message#show. fixed bug where show pages would get posts as well as comments.
|
2010-10-24 14:44:43 -07:00 |
|
danielvincent
|
661ad20a02
|
added delegate, proper finders, and more chaining to stream.js. removed div.comment_set from the DOM.
|
2010-10-24 14:44:43 -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 |
|
danielvincent
|
f5a0f44c25
|
fixed error in posting to all albums through publisher on albums#index
|
2010-10-23 00:36:29 -07:00 |
|
ilya
|
c27f05ed42
|
Initial refactor done, need to stop mapping user.friends to people so much
|
2010-10-22 18:11:04 -07:00 |
|
ilya
|
7083d2aa03
|
Moving friendships into a 'Contact' proxy object.
|
2010-10-22 18:11:04 -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
|
de04e717c0
|
made image or default to help with hcard parsing, deleted old default user picture
|
2010-10-22 16:57:01 -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
|
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 |
|
ilya
|
9a217d1fa8
|
MS IZ request acceptance email
|
2010-10-22 11:55:50 -07:00 |
|
maxwell
|
20a5ec863f
|
small bugfixes for the mailer
|
2010-10-22 00:49:01 -07:00 |
|
maxwell
|
5701c3a873
|
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
|
2010-10-22 00:49:01 -07:00 |
|
ilya
|
80cd4761f3
|
started the new invitation email
|
2010-10-22 00:49:01 -07:00 |
|