Commit graph

706 commits

Author SHA1 Message Date
danielvincent
11a099914c on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited. 2010-07-29 11:07:44 -07:00
danielvincent
fd4475370d added profile url to author show page 2010-07-29 10:30:24 -07:00
maxwell
cb3d6db9b0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-29 10:06:11 -07:00
maxwell
7a0db375ab MS added rails 3rc 2010-07-29 09:59:03 -07:00
ilya
c8b40001e5 IZ album edit page was not added 2010-07-28 21:10:35 -07:00
Raphael
1e954eae4f took out old puts, put in new one 2010-07-28 20:37:42 -07:00
maxwell
6a8291b56f Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 18:35:06 -07:00
maxwell
049361ea15 MS profiles should send, need to just make the parser now 2010-07-28 18:32:00 -07:00
ilya
96a9c9455d DG IZ; make photos in stream larger, because they need love too 2010-07-28 17:46:43 -07:00
ilya
6f3e7bc78b DG IZ; minor tweaks 2010-07-28 17:31:05 -07:00
ilya
acb295d695 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 17:05:14 -07:00
ilya
03cf61bd7c new user top bar 2010-07-28 17:04:56 -07:00
maxwell
e14e391a22 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-28 16:50:48 -07:00
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -07:00
ilya
1700ce8e18 DG IZ; tweaks to album index page 2010-07-28 16:12:49 -07:00
ilya
3f27e1f67d DG IZ photo spacing now works 2010-07-28 14:48:28 -07:00
ilya
5723d91dae DG IZ; moved some buttons around, added album edit page 2010-07-28 14:00:02 -07:00
ilya
9e3c6a0936 DG IZ; brushed up ostatus user page 2010-07-28 12:13:36 -07:00
maxwell
eb4262dfc7 MS merged master 2010-07-28 11:13:17 -07:00
danielvincent
e2b5af35c1 minute changes 2010-07-28 00:04:43 -07:00
maxwell
a57727c1fc Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 16:18:59 -07:00
maxwell
c41dea1e8b MS small profile tweaks 2010-07-27 16:18:46 -07:00
danielvincent
7992b1b0e0 delete photo button on photo show page instead of delete album. 2010-07-27 16:10:42 -07:00
danielvincent
fdd1a5d93b more recovery 2010-07-27 16:04:59 -07:00
maxwell
92cc48beaf Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 15:52:50 -07:00
maxwell
3cecbf1511 MS profile page fixes 2010-07-27 15:52:42 -07:00
danielvincent
34291340b2 trying to get back up to speed 2010-07-27 15:50:44 -07:00
maxwell
9dd5c08296 fixed two small UI bugs 2010-07-27 14:45:04 -07:00
maxwell
86e090bac3 MS figured out moz gradient business 2010-07-27 14:34:16 -07:00
maxwell
9c7b3f0c07 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-27 14:23:44 -07:00
maxwell
bdca2348a6 MS IZ profile page has more useful info, but ultimatly kinda ugly 2010-07-27 14:23:31 -07:00
danielvincent
d4ac19e9ce all form buttons are now using button definition in UI 2010-07-27 12:23:21 -07:00
danielvincent
dbc8f0112e some misc design cleanup. album page toggle pending. 2010-07-27 12:12:25 -07:00
danielvincent
97daaf81c2 made custom css3 buttons (pending FF compatability; works in webkit for now.) 2010-07-26 21:48:02 -07:00
maxwell
bda87bbeab MS switched request new links to just the request link 2010-07-26 18:13:20 -07:00
maxwell
d73d36f162 MS i had broke atom generation in my refactor. now it is fixed 2010-07-26 17:39:48 -07:00
danielvincent
9afb8beb25 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-26 17:04:00 -07:00
danielvincent
ec59b89e83 DG IZ; few changes to uploader. added prefetching to photo prev/next links on photo show page 2010-07-26 16:57:44 -07:00
maxwell
a9b1954ff6 MS status message now updates the big one on the index page...hooray for jquery 2010-07-26 16:27:10 -07:00
danielvincent
f6687316d6 DG IZ; only a remote scaled photo is downloaded, not the full res 2010-07-26 16:08:19 -07:00
danielvincent
65acd48885 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-26 15:52:02 -07:00
danielvincent
36abb19e2c added the uploading photo wjava script 2010-07-26 15:50:41 -07:00
maxwell
88c83bb028 MS added pagination to the author show page 2010-07-26 15:15:42 -07:00
maxwell
47f5c77e1a kinda prettied up the albums page 2010-07-26 15:09:02 -07:00
maxwell
d7550568ad added pagination to photo picker on the user profile. still ugly, less sucky 2010-07-26 13:55:44 -07:00
maxwell
0c2fc54c0f MS we didnt serialize the post creator sig....sigh.... this could not be the problem 2010-07-26 13:29:39 -07:00
Maxwell Salzberg
66f66b85a6 MS added test, things still seem broken though 2010-07-24 23:21:02 -07:00
maxwell
b797704a14 MS small pointless webhooks refactor 2010-07-24 16:11:32 -07:00
maxwell
416f128ba8 MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module 2010-07-24 15:48:42 -07:00
maxwell
2cbdc5413f MS nuked some random non helpful puts statements 2010-07-24 12:12:48 -07:00
danielvincent
261a7d177d fixed for real 2010-07-24 11:09:25 -07:00
danielvincent
926eacc588 mend 2010-07-24 10:37:35 -07:00
danielvincent
03e06cb279 person sidebar has a view all; displays user images with names in tooltips instead of text 2010-07-24 10:24:43 -07:00
maxwell
9095a06738 MS just broke common.rb out into 3 files.... all tests pass, dont shoot me if something is broken, but on first pass we look ok 2010-07-24 01:56:07 -07:00
maxwell
c9709dd1e7 MS put current status back on page 2010-07-24 01:39:15 -07:00
maxwell
8a174d37c7 MS trying a dan-like thing in the publisher 2010-07-23 23:56:41 -07:00
danielvincent
4c3a51833f user name is bigger 2010-07-23 22:35:12 -07:00
danielvincent
4d2b11310b nudged layout 2010-07-23 21:34:47 -07:00
maxwell
302cf54fab MS subscribers should now unsubscribe 2010-07-23 21:31:28 -07:00
maxwell
c34f5e5ee0 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-23 21:20:05 -07:00
maxwell
311a60f7b7 MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller 2010-07-23 21:16:36 -07:00
danielvincent
e5d298040d little things 2010-07-23 21:11:21 -07:00
danielvincent
f6fd6bc9e6 added breadcrumb to albums 2010-07-23 20:28:10 -07:00
danielvincent
7eb59a654c Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-23 20:12:37 -07:00
danielvincent
d93c331615 moved publisher 2010-07-23 20:12:28 -07:00
ilya
2fa9462e05 Next and Previous for photos buttions are now in the center 2010-07-23 20:09:52 -07:00
danielvincent
b63b7fe482 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-23 19:44:41 -07:00
danielvincent
ad61c290fb took current user's name out of the layout 2010-07-23 19:44:34 -07:00
maxwell
00159d1fb8 MS minor defaults change 2010-07-23 18:17:48 -07:00
ilya
8793709284 No file is now complained about in the view 2010-07-23 16:57:34 -07:00
ilya
61a9ba7a6e put album owner on unless mine 2010-07-23 16:36:59 -07:00
ilya
48975cc59e put album owner on album show page 2010-07-23 16:33:10 -07:00
ilya
4eccf63fef Can't upload to other people's album 2010-07-23 16:26:05 -07:00
ilya
1c0d5f6e6b Removing destroy link from albums that are not yours 2010-07-23 16:07:15 -07:00
ilya
79aa12ee67 RS IZ Removing the destroy link from photos 2010-07-23 15:59:42 -07:00
ilya
f866872d7a now should be saving to the directory without the wrong id in the name 2010-07-23 15:49:08 -07:00
ilya
031234f763 Failing at syntax 2010-07-23 15:42:12 -07:00
ilya
bb251e73b3 Logging photo.inspect after save 2010-07-23 15:37:07 -07:00
ilya
e754e97c7e Logging for the differing id problem in remote photos 2010-07-23 15:32:27 -07:00
ilya
2f35d07807 Broke photo signing 2010-07-23 15:22:04 -07:00
ilya
e43f54cc72 RS IZ remote photo url does not change on marshaling' 2010-07-23 15:13:40 -07:00
ilya
1b32afc78f Switching to Grid_FS, correctly 2010-07-23 14:53:12 -07:00
ilya
283bbc4850 Switching to Grid_FS 2010-07-23 14:32:55 -07:00
Raphael
d8ebbf8d26 Adding some logging to requesting/subscribing 2010-07-23 14:20:02 -07:00
ilya
a52adba95b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-23 11:59:31 -07:00
ilya
082274d0d7 RS IZ a nicer fail(notice) on wrong file format on upload 2010-07-23 11:59:04 -07:00
Raphael
473662a265 Layout false on hubub controller 2010-07-23 11:50:14 -07:00
maxwell
e0baf9d6c5 MS sort the updates on a author's page 2010-07-22 23:36:37 -07:00
maxwell
dfad30e33b MS typo 2010-07-22 22:34:30 -07:00
maxwell
3e3fcc57f9 MS author author? 2010-07-22 22:32:47 -07:00
maxwell
1f414c9347 MS so close to subscribing to tantek 2010-07-22 22:30:08 -07:00
maxwell
7ba85e0d4e MS tantek? 2010-07-22 22:22:08 -07:00
maxwell
8c50ea0c97 MS i really wanna subscribe to tantek 2010-07-22 22:14:06 -07:00
maxwell
0fdce91756 DG MS added views for ostatus following 2010-07-22 21:27:43 -07:00
maxwell
3f4219cf94 added debugging stuff to index page for ostatus stuffs 2010-07-22 20:19:52 -07:00
maxwell
16bbce3054 DG MS ostatus post and author now exsist 2010-07-22 20:16:24 -07:00
maxwell
c5bcab94e1 DG MS...dumb, forgot to call it in the controller 2010-07-22 17:11:44 -07:00
maxwell
82e61ff99d Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-22 13:53:46 -07:00
maxwell
b3668956ab MS DG following now works on identica, you subscribe, and then identica spams you for the rest of your life 2010-07-22 13:53:39 -07:00
ilya
7df902b9db XML reader was assuming photos were local 2010-07-22 12:39:53 -07:00
ilya
065c790e4e not saving in photo receive and logging the saving in common 2010-07-22 12:23:18 -07:00
ilya
a1a8fc1ea4 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-22 12:07:36 -07:00
ilya
b2dcaed5e2 RS IZ saving in the photo parsing 2010-07-22 12:07:18 -07:00
maxwell
daf0de2eb0 Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus 2010-07-22 11:54:07 -07:00
ilya
b90cb95c64 RS IZ the photo controller now uses instantiate 2010-07-22 11:41:00 -07:00
ilya
24f8b33f2f Tests all pass! 2010-07-22 11:36:36 -07:00
ilya
773dbd91aa RS IZ one more test passing going to bisect 2010-07-22 10:21:10 -07:00
ilya
8d87f07d31 using owner instead of first user 2010-07-22 09:55:13 -07:00
maxwell
6869384732 i think it works - max 2010-07-21 21:15:16 -07:00
ilya
14533f6534 url not path 2010-07-21 21:13:31 -07:00
maxwell
9b1fcdbab2 MS DG some serious message handler and user request API stuff....needs way more tests 2010-07-21 20:33:43 -07:00
ilya
a222edc646 Url not path 2010-07-21 20:22:30 -07:00
ilya
ef7b9f58a7 IZ remote files 2010-07-21 19:51:34 -07:00
ilya
a75dfb0201 Album retractions 2010-07-21 18:27:18 -07:00
ilya
6b9a3fc518 Pushing Albums out 2010-07-21 18:26:03 -07:00
ilya
5a5842dbdc Accidently started websocketing albums 2010-07-21 18:22:57 -07:00
ilya
a6104fd2b5 RS, IZ; Albums must be pushed 2010-07-21 18:07:38 -07:00
ilya
606fa3353c RS, IZ; Photos might push urls to friends 2010-07-21 18:02:13 -07:00
maxwell
0d268905e7 DG MS all photos of a album are destroyed on album deletion 2010-07-21 17:05:40 -07:00
maxwell
21bd875a3f MS DG request bar fix, and some other small tweaks 2010-07-21 16:38:33 -07:00
maxwell
3cee09407c Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-21 15:47:46 -07:00
maxwell
6f7f82e818 added helpers for photo show page 2010-07-21 15:47:30 -07:00
Raphael
9b4d92e1fa trying to patch relationship controller 2010-07-21 15:36:14 -07:00
maxwell
a5f359ef1b MS DG added a safe for viewing photosize 2010-07-21 15:08:00 -07:00
maxwell
0f407b11ed MS DG comments now work on photo show page; full size photos now available 2010-07-21 14:58:06 -07:00
maxwell
6410b68ea4 added correct path to ignore for uploads 2010-07-21 14:31:08 -07:00
maxwell
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
danielvincent
d5c28eb9a6 album photos as links were too janky; removed 2010-07-21 00:42:41 -07:00
danielvincent
5fc2dfa0bb delete links removed from album index 2010-07-21 00:40:57 -07:00
danielvincent
aece0fc1c7 removed duplications used for testing 2010-07-21 00:32:38 -07:00
danielvincent
c01e9846cf began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere 2010-07-21 00:24:11 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -07:00
maxwell
f07740454a Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 19:30:28 -07:00
danielvincent
249948a500 hotfix for photos/collection relationship to fix photo saving 2010-07-20 19:29:19 -07:00
maxwell
dac3c7a8de Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 16:22:08 -07:00
maxwell
933bf61db8 RS, MS, relationship_flow returns the action and the url to execute it to 2010-07-20 16:15:36 -07:00
danielvincent
51fd87db36 no ideas why collection saving isn't working... 2010-07-20 15:15:11 -07:00
ilya
1bd2c16ef1 DG IZ started the collection spec 2010-07-20 14:01:56 -07:00
Raphael
afc150c719 Reverting reverrsion 2010-07-20 11:56:11 -07:00
Raphael
382caf7adc Reverting last commit 2010-07-20 11:53:13 -07:00
Raphael
7b6289c78a Took label out of publisher for photo 2010-07-20 11:52:38 -07:00
ilya
715a6ae770 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 11:50:45 -07:00
ilya
7901791ee3 DG IZ; added simple image picker for edit profile page. currently displays all images uploaded. 2010-07-20 11:50:36 -07:00
maxwell
453d2ee827 RS MS fail. totally made a new bug and fixed it re: resizing 2010-07-20 11:50:23 -07:00
maxwell
d420652311 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 11:41:56 -07:00
maxwell
e856945a94 RS MS photos are no longer ginormous, and also a small bug where photos were going to the status message show page. 2010-07-20 11:41:50 -07:00
Raphael
8e8c48eac9 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-20 11:31:51 -07:00
Raphael
d8cbbcf6c8 Added photo file validation spec 2010-07-20 11:31:41 -07:00
Raphael
de3a08d031 Took out putses 2010-07-20 10:23:19 -07:00
ilya
e08ed8805f DG IZ photo upload form now with all the others 2010-07-20 10:00:02 -07:00
danielvincent
55710ffbdb image uploader does two thumbnails 2010-07-17 21:10:21 -07:00
maxwell
ec3f6e6765 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-17 19:22:26 -07:00
danielvincent
c53efbe56f Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	app/models/post.rb
2010-07-17 19:00:53 -07:00
Raphael
bb21361a6b Photo controller fixed 2010-07-17 18:13:51 -07:00
maxwell
917d58acbb MS found one more duplicate in the Gemfile 2010-07-17 14:10:31 -07:00
Raphael
7d7c39e3dc callbacks not running on photo save 2010-07-17 14:09:21 -07:00
danielvincent
c8c76ddab5 added auth_user back to photos controller 2010-07-17 14:08:18 -07:00
danielvincent
79536dcfb7 all post partials now use object_path for links 2010-07-17 13:59:04 -07:00
danielvincent
b221e19746 every post partial shows a user picture. a post's comments are displayed with a count in its show page 2010-07-17 13:41:54 -07:00
Raphael
93e900b998 fixed comments, did I break request url? 2010-07-17 11:29:30 -07:00
Raphael
d8ad4367d5 Tests now pass 2010-07-17 09:32:41 -07:00
maxwell
eb4153ec8f did a couple of things to the request page 2010-07-16 23:22:18 -07:00
maxwell
5d0c5dbd86 MS kinda hacky webfinger email fix 2010-07-16 23:03:59 -07:00
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
c124a9ab41 IZ MS blogs ctivity streams/atom 2010-07-16 16:07: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
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
Raphael
9165ac413a image uploading started 2010-07-16 12:31:24 -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
256757f02a Rails.logger in a model 2010-07-16 10:29:42 -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
maxwell
bf3d34090e MS IZ = AHHH 2010-07-15 19:08:25 -07:00
maxwell
9ff4cd015d MS IZ = AHHH 2010-07-15 19:05:59 -07:00
maxwell
f927ace140 MS IZ = AHHH 2010-07-15 19:01:14 -07:00
maxwell
8f59a9d788 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-15 18:42:44 -07:00
maxwell
b903163d3f MS IZ = AHHH 2010-07-15 18:42:25 -07:00
Raphael
cae5700222 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-15 18:41:01 -07:00