Commit graph

635 commits

Author SHA1 Message Date
danielvincent
180138610c Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 23:02:31 -07:00
danielvincent
04eb66b2e6 user has a image url field for user picture 2010-07-16 23:02:24 -07:00
maxwell
44b4defb69 MS IZ YEAAAAAAAAAAAAHHHHHgit push origin master git push origin master 2010-07-16 22:20:25 -07:00
maxwell
cd31d11aca MS IZ adding a friend through the webfinger profile 2010-07-16 22:11:55 -07:00
maxwell
f34e033bce MS IZ getting the profile 2010-07-16 21:59:40 -07:00
maxwell
58b052b07f IZ MS small bugfix 2010-07-16 21:35:16 -07:00
maxwell
a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	Gemfile
2010-07-16 21:33:57 -07:00
maxwell
36c911d20b IZ MS added diaspora rel to webfinger profile 2010-07-16 21:33:08 -07:00
danielvincent
5637ab2a8e added multipart option to new photo form. needed to remove remote true for now. 2010-07-16 21:14:42 -07:00
Raphael
93fdbae9c5 fixed small bug on user show page, added header text to user edit page 2010-07-16 17:27:57 -07:00
Raphael
bb4d5cad59 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 17:26:22 -07:00
Raphael
fa46fb31f4 Added photos, profile editing 2010-07-16 17:26:06 -07:00
maxwell
b3bb9f8da2 IZ MS fixed user being a constant in the lib which causes a bug when db is reseeded 2010-07-16 17:00:54 -07:00
maxwell
e0284b28ee IZ MS blogs ctivity streams/atom 2010-07-16 16:15:59 -07:00
maxwell
c124a9ab41 IZ MS blogs ctivity streams/atom 2010-07-16 16:07:58 -07:00
maxwell
0bafac9c26 IZ MS bookmarks now create VALID activity streams/atom 2010-07-16 15:58:58 -07:00
maxwell
06238703c3 IZ MS bookmarks now create activity streams 2010-07-16 15:54:26 -07:00
maxwell
98bc754627 trying to get it reporting from diaspora 2010-07-16 14:54:14 -07:00
maxwell
86718dbec3 trying to get it reporting from diaspora 2010-07-16 14:53:07 -07:00
maxwell
642db5006f trying to get it reporting from diaspora 2010-07-16 14:49:44 -07:00
maxwell
7be469f928 trying to get it reporting from diaspora 2010-07-16 14:45:18 -07:00
maxwell
df447ba7c0 trying to get it reporting from diaspora 2010-07-16 14:44:26 -07:00
maxwell
13b4fab6ae trying to get it reporting from diaspora 2010-07-16 14:43:01 -07:00
maxwell
183e0c4b5a trying to get it reporting from diaspora 2010-07-16 14:40:28 -07:00
maxwell
03a8f2ea5c trying to get it reporting from diaspora 2010-07-16 14:36:50 -07:00
maxwell
3d87c111df webfinger is now not washington specific 2010-07-16 14:15:19 -07:00
maxwell
99f7e938fd made a pubsubhub constant 2010-07-16 12:42:36 -07:00
Raphael
9165ac413a image uploading started 2010-07-16 12:31:24 -07:00
maxwell
4160baa25e process always now 2010-07-16 11:55:36 -07:00
maxwell
6a728f7b50 IZ MS debugging info on publish..... 2010-07-16 11:54:06 -07:00
maxwell
ef19322ef6 IZ MS debugging info on publish..... 2010-07-16 11:51:13 -07:00
maxwell
566cceb03f MS IZ TYPO try deleteing publish 2010-07-16 11:46:46 -07:00
maxwell
8c2dcb58c7 MS IZ TYPO deleteing trailing slash from atom 2010-07-16 11:43:02 -07:00
maxwell
e7484a3a94 MS IZ TYPO deleteing trailing slash from publisher endpoint 2010-07-16 11:38:04 -07:00
maxwell
398e104296 MS IZ TYPO forgot a space 2010-07-16 11:32:40 -07:00
maxwell
d2dea48fe6 MS IZ added .atom so we may publish correctly 2010-07-16 11:26:16 -07:00
maxwell
7e190047ec IZ MS host 2010-07-16 11:14:26 -07:00
maxwell
4259dc7dfe IZ MS changing end slash 2010-07-16 11:10:38 -07:00
maxwell
172141db0a IZ MS setting alias to not idendica 2010-07-16 11:07:17 -07:00
maxwell
b39f7cebd0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 10:39:18 -07:00
maxwell
081a6a2c73 MS IZ trying to delete commented stuff 2010-07-16 10:39:02 -07:00
Raphael
b7a7ae8c1b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 10:29:53 -07:00
Raphael
256757f02a Rails.logger in a model 2010-07-16 10:29:42 -07:00
maxwell
41b918e6e2 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 10:25:37 -07:00
maxwell
45fb44ef36 MS IZ added trailing slash for the hub notification 2010-07-16 10:25:24 -07:00
Raphael
9f90ae4db0 Syntax errors are awesome 2010-07-16 10:20:41 -07:00
Raphael
4178a78b23 Logger in receive friend request 2010-07-16 10:18:45 -07:00
Raphael
567d3f4dc5 Fixing friending deploy 2010-07-16 10:06:29 -07:00
Raphael
7dd8acadf7 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-16 09:59:24 -07:00
Raphael
05e6dada58 Fixing deploy friending 2010-07-16 09:59:06 -07:00