Commit graph

1048 commits

Author SHA1 Message Date
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
ad14cd0678 DG MS fixed bug where self was not in the module...wtf 2010-07-22 17:08:51 -07:00
maxwell
1118b56bb1 DG MS we now fully parse an ostatus response 2010-07-22 16:55:28 -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
108ec86593 Adding logging to signing and verifying 2010-07-22 12:34:06 -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
maxwell
a615853b07 DG MS; added more specs for pubsub 2010-07-22 11:53:57 -07:00
ilya
e75cb8e8d2 Changing back to gridfs 2010-07-22 11:47:44 -07:00
ilya
41c358d53c Storing in phototest 2010-07-22 11:43:59 -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
maxwell
69477b17f5 DG MS; added specs for publishing to a hub 2010-07-22 11:14:37 -07:00
Raphael
07767e62fe Photo factory 2010-07-22 10:49:27 -07:00
Raphael
dce861ff17 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-22 10:43:41 -07:00
Raphael
0cb6e39ff4 comment signing spec was broken 2010-07-22 10:43:35 -07:00
ilya
773dbd91aa RS IZ one more test passing going to bisect 2010-07-22 10:21:10 -07:00
Raphael
7ccf391ca5 Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-22 10:12:42 -07:00
Raphael
b6ab4db7cc Trying to get photos working again 2010-07-22 10:12:25 -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
e23b139495 Adding logging to pushing 2010-07-21 18:25:33 -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
a4b0d47edc Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-21 18:02:45 -07:00
ilya
606fa3353c RS, IZ; Photos might push urls to friends 2010-07-21 18:02:13 -07:00
maxwell
ddffc5560a rake db:purge includes albums and comments 2010-07-21 17:44:42 -07:00
maxwell
5c77ab048e Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	app/controllers/requests_controller.rb
2010-07-21 17:06:42 -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
Raphael
ebdbe0ee3d Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-07-21 15:58:21 -07:00