Commit graph

223 commits

Author SHA1 Message Date
Raphael
ac45960bbf Fixed album spec, condensed traversing tests to halve the time of the spec (It was reading the photos from disk on every spec) 2010-08-02 12:33:36 -07:00
Raphael
b8ae6b44a2 RS; Image filename is now the Photo model id 2010-08-02 10:05:34 -07:00
maxwell
6aa1fa1826 DG MS profiles send? who knows... 2010-07-29 15:53:38 -07:00
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
maxwell
049361ea15 MS profiles should send, need to just make the parser now 2010-07-28 18:32:00 -07:00
maxwell
80db1132d1 Fixed the tests; 2010-07-28 16:50:38 -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
ilya
4eccf63fef Can't upload to other people's album 2010-07-23 16:26:05 -07:00
maxwell
16bbce3054 DG MS ostatus post and author now exsist 2010-07-22 20:16:24 -07:00
maxwell
daf0de2eb0 Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus 2010-07-22 11:54:07 -07:00
ilya
41c358d53c Storing in phototest 2010-07-22 11:43:59 -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
ilya
773dbd91aa RS IZ one more test passing going to bisect 2010-07-22 10:21:10 -07:00
Raphael
b6ab4db7cc Trying to get photos working again 2010-07-22 10:12:25 -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
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
695a93ddad DG MS added basic album traversal 2010-07-21 14:29:58 -07:00
maxwell
301343ae01 DG MS added basic album support 2010-07-20 21:28:24 -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
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
Raphael
bb21361a6b Photo controller fixed 2010-07-17 18:13:51 -07:00
Raphael
7d7c39e3dc callbacks not running on photo save 2010-07-17 14:09:21 -07:00
Raphael
d8ad4367d5 Tests now pass 2010-07-17 09:32:41 -07:00
maxwell
31629f8115 MS fixed webfinger spec regression 2010-07-16 23:11:23 -07:00
maxwell
a742ef1253 Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
	Gemfile
2010-07-16 21:33: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
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
Raphael
d7e07dfda8 comment specs fixed, comments now signed by post poster 2010-07-15 14:41:39 -07:00
Raphael
2d5d3a2f2d commit more often 2010-07-15 13:29:21 -07:00
Raphael
fd18ac6c4b Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption 2010-07-15 13:06:46 -07:00
maxwell
f97218c005 MS IZ cleanup of pubsub stuff 2010-07-15 10:24:41 -07:00
Raphael
c82f41e740 Merging in master 2010-07-14 12:16:24 -07:00
Raphael
335f202e2b RS, IZ; Profiles are now embedded 2010-07-14 11:22:44 -07:00
maxwell
1b63fbbec7 DG MS added pubsub gem, added hub to message queue 2010-07-14 11:01:28 -07:00
ilya
4a0bd5fc0c RS IZ; removed validations on marshaling and removed key deletion on person destroyw 2010-07-13 17:36:18 -07:00
maxwell
9e93fd072e DG MS; added subscriber model for ostatus interop 2010-07-13 14:32:27 -07:00
ilya
174eb7e8f7 Merging in Master 2010-07-12 11:28:39 -07:00
maxwell
18760f13f8 push changes 2010-07-12 11:25:53 -07:00
ilya
3dfb55ee85 IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on 2010-07-11 00:04:08 -04:00
maxwell
902a8cb349 MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change 2010-07-10 10:34:46 -07:00
ilya
1bed575b90 Added the Key Fingerprint validation to the person model(defaults to empty string) 2010-07-10 06:09:53 -04:00
ilya
7eba033c0d Revert "RS IZ Friday night, key_fingerprint serialization weirdness"
This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.
2010-07-10 05:29:57 -04:00
ilya
8c75761ba1 RS IZ Friday night, key_fingerprint serialization weirdness 2010-07-10 02:25:48 -04:00
maxwell
8147602570 DG MS friends now are delete 2010-07-09 18:10:11 -07:00
maxwell
f5fd0b011a DG MS; upon friend deletion, all connected posts and comments are purged 2010-07-09 16:08:00 -07:00
maxwell
cf352b6f8d DG MS; cannot friend request an existing friend. 2010-07-09 14:35:42 -07:00
maxwell
b052ddeb84 DG MS; database seed scripts now ensure all friends are set to true 2010-07-09 14:13:39 -07:00
maxwell
48adc9ebc1 DG MS; person object now properly stored with request object save 2010-07-09 14:07:35 -07:00
maxwell
c2c64d9938 MS DG more friend request tests pass 2010-07-08 23:14:54 -07:00
maxwell
e1834cc887 DG MS fixed spec 2010-07-08 20:51:12 -07:00
maxwell
06eec9204a DG MS; person request is now request. refactoring as well. user verbiage for request actions 2010-07-08 18:28:39 -07:00
ilya
93c5404cab DG IZ message handler is a singleton' 2010-07-08 13:28:02 -04:00
danielvincent
a33acd134e DG IZ; fixed person requesting (friend requests). 2010-07-07 18:10:47 -07:00
danielvincent
3d105e7c1e DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket. 2010-07-07 16:53:52 -07:00
danielvincent
d705d39f70 DG IZ; added for action to friend request 2010-07-07 13:44:06 -07:00
ilya
79c0e960ad DG IZ; friend now has an active flag 2010-07-06 23:43:01 -04:00
ilya
d5d4d4ae84 DG IZ; friend requests get saved locally, friend object gets transmitted and saved remotely 2010-07-06 21:29:49 -04:00
ilya
a23a2691f3 DG IZ; starting fresh with requests 2010-07-06 20:09:20 -04:00
ilya
0587688d18 DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler 2010-07-06 02:15:49 -04:00
ilya
027d953cf4 DG IZ added the FriendRequest model. 2010-07-05 23:28:51 -04:00
Raphael
f9856517db Post deletion now deletes comments 2010-07-02 14:34:58 -07:00
danielvincent
469599a4a9 DG RS IZ; added post deletion propagation 2010-07-02 13:08:53 -07:00
maxwell
e696ef7023 comments now go go go and are tested RS MS 2010-06-30 16:24:44 -07:00
maxwell
fcdba64828 pushing to test comment passing 2010-06-30 13:54:09 -07:00
Raphael
340a57ea6d RS; figured out recursive serialization with ROXML, posts and comments now serialize with their persons 2010-06-30 08:06:30 -07:00
maxwell
638b71ae28 Added a spec to person, cleaned up some putses 2010-06-29 17:45:13 -07:00
maxwell
77c0bb5c4e urls are now unique, and a user can not add a friend with the exact same url 2010-06-29 16:04:15 -07:00
maxwell
19e03c7077 person now has a url, and they cant add themselves any longer.... you need to add a url to your old development user, and we need to set it in the field 2010-06-29 12:33:00 -07:00
ilya
b5b9c647d7 DG IZ Created the profile model & friend view now shows the information 2010-06-28 21:32:09 -04:00
ilya
2b42ef216c DG IZ; added a profile; one-to-one relation with Person (non-singleton) 2010-06-28 18:20:56 -04:00
maxwell
a6c33b3e7b Merge branch 'master' of github.com:diaspora/diaspora_rails 2010-06-25 22:15:49 -07:00
maxwell
ec01e2c016 Comments now working, but no AJAX, need to refresh to see them 2010-06-25 22:15:41 -07:00
ilya
2557271dcc removed users link 2010-06-25 21:57:18 -04:00
ilya
5fb8d90738 added a validation to bookmark 2010-06-25 21:46:20 -04:00
ilya
720c68e2c6 Specs all pass 2010-06-25 18:18:20 -04:00
ilya
c0167a445a RS, IZ; Ended spec pollution, fixed up blog spec 2010-06-25 18:04:09 -04:00
ilya
179af4fbfa Merged mongomapper and master 2010-06-25 00:11:45 -04:00
maxwell
e558d4833f DG MS fixing tests 2010-06-24 20:45:49 -07:00
ilya
4323bc5fe7 RS, IZ, specs working again for real 2010-06-24 20:47:03 -04:00
Raphael
f0db58f912 Moved authentication to applicationcontroller for now, refactored posting statusmessages 2010-06-24 17:10:45 -07:00
ilya
81157190ac RS, IZ, Merged from master 2010-06-23 20:19:25 -04:00
ilya
8829714e2d RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant 2010-06-23 20:17:44 -04:00
maxwell
a0eeb43176 DG friend url validation can now take a post, sligtly regressed on some really weird edge cases 2010-06-23 16:30:46 -07:00
maxwell
9fa26f020e DG MS; clicking on a person's name redirects to that person's post stream 2010-06-23 14:32:51 -07:00
Raphael
0ff87037cb Added inheritance spec to user 2010-06-23 11:28:53 -07:00
Maxwell Salzberg
523cb6f15f DG; Post belongs to a Person, and a Person has many Posts. Also, added Person for real this time 2010-06-22 23:27:31 -07:00
Maxwell Salzberg
9a44578c37 DG; Person is now the parent of Friend and User 2010-06-22 23:11:55 -07:00
maxwell
989949a8c9 added pretty (but dumb) update of sockets, and fixed some tests which broke as a result. needs better tests and the code is U G L Y 2010-06-22 15:14:55 -07:00
danielvincent
a1361da770 DG IZ; friend and owner now require a real name 2010-06-21 15:56:40 -07:00
ilya
eb2c3fd2e5 fixed one spec bug in bookmarks 2010-06-21 15:01:12 -04:00
maxwell
34df8fa946 DG MS; resolved unknown types going to receive handler. only post objects are inputted 2010-06-18 16:47:34 -07:00
maxwell
c430aaff18 DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml 2010-06-18 14:35:51 -07:00
danielvincent
628af0372f DG MS; completed event-queue intergration. 2010-06-17 14:29:41 -07:00
Raphael Sofaer
ed26c82be4 RS, IZ; merged day's commits 2010-06-15 21:41:39 -07:00
Raphael Sofaer
8213443afd RS, IZ; stubbed out and wrapped curl backtick 2010-06-15 21:34:52 -07:00
Raphael Sofaer
34127b070a IZ Made the specs pass, time to clean 2010-06-15 20:38:14 -07:00
Raphael Sofaer
c4b931c309 IZ RS getting remote messages (not yet done) 2010-06-15 18:41:54 -07:00
maxwell
e6f3fc1d38 DG MS more test cleanup and removed a deprecation warning 2010-06-15 17:38:12 -07:00
maxwell
497b477e89 DG MS added a post model, going to put it more places than just status message now 2010-06-15 17:21:57 -07:00
ilya
a46b0479f4 IZ merge conflicts 2010-06-15 14:59:35 -04:00
ilya
653392f738 IZ factories in controller specs as well as bookmark 2010-06-15 14:56:32 -04:00
danielvincent
f69a2bd8a1 RS; Merging whitespace 2010-06-15 11:14:00 -07:00
danielvincent
45c926f790 DG RS; added blog posts, cleaned up unnecessary warden mocks in all controller specs 2010-06-15 11:09:47 -07:00
ilya
8a37843cd9 IZ no more message= in newest in status message model 2010-06-15 13:23:24 -04:00
ilya
ee295d01ff IZ using factories for the spec 2010-06-15 13:18:26 -04:00
maxwell
1a1887f77f DG MS completed bookmark story 2010-06-14 20:20:19 -07:00
maxwell
3eef53892c DG MS; Dashboard shows the user's most recent update 2010-06-14 17:48:21 -07:00
maxwell
4532c39e93 DG MS; Status messages have owner field; defaults to user 2010-06-14 17:13:07 -07:00
maxwell
1f73c2351e DG MS IZ; Status message renders to and from xml; Friend model in place 2010-06-14 16:20:57 -07:00
maxwell
960db53b9b MS IZ DG completed crud for friend 2010-06-14 13:12:17 -07:00
maxwell
f6e662a3fa moved redirect commitment to cucumber, delivering stories 2010-06-14 11:41:15 -07:00
maxwell
29c6f9fa0f DG, MS, IZ; status messages now functional 2010-06-13 22:11:16 -07:00
maxwell
85e6eb2132 added stray local files 2010-06-13 21:22:52 -07:00
maxwell
28ba205ef3 blerg rspec cache sux 2010-06-13 21:08:17 -07:00
maxwell
c84c99f993 created the rspec runner so you dont have to worry about cleaning mongoid every run completed chore MS 2010-06-13 16:12:32 -07:00
danielvincent
eaeafd3240 added authentication via devise 2010-06-12 21:56:50 -07:00
danielvincent
8ecaf240e6 user session model authenticates against users 2010-06-12 19:51:54 -07:00