nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6152 commits 4 branches 0 tags 121 MiB
Commit graph

1559 commits

Author SHA1 Message Date
Raphael
16d7ccdf0b fix youtube title stting 2011-01-04 11:48:02 -08:00
zhitomirskiyi
d3daa32558 mark a notification as read when you ignore a request 2011-01-04 11:27:25 -08:00
Raphael
0966889ab9 continue work on mongo export 2011-01-04 10:58:22 -08:00
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Thomas R. Koll
5e1f5ff5b1 Starting spec for rails.js 2010-12-29 17:43:50 +01:00
Nick van der Burgt
8bbb142c85 Set a limit on the second page 2010-12-29 12:32:24 +01:00
Nick van der Burgt
46e9be88d1 Wrote spec test for notifications pagination 2010-12-29 12:27:39 +01:00
Alec Leamas
215d6a8504 Build test diaspora_handle properly. 2010-12-29 10:10:08 +01:00
Sarah Mei
f18439fa14 ZOMG specs pass on mysql! 
Make '_type' column on services into 'type'.
 2010-12-28 21:08:54 -08:00
Raphael
4fec1bf717 1 failure left in mysql specs 2010-12-28 11:38:26 -08:00
Sarah Mei
787d550a1f Fix StatusMessagesController. Refactor specs to take out stuff that's tested elsewhere. MOAR REFAKTRNG PLZ. Is ugly. 2010-12-27 21:48:51 -08:00
Raphael
3d7d8b51d2 Add a spec to user, fix a cucumber step for mysql 2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831 Fix a couple more specs in mysql 2010-12-26 20:52:15 -08:00
Raphael
a6dcaa2327 Photo specs passing, 9 failures left in mysql 2010-12-26 20:33:21 -08:00
Raphael
3e7e99831a 14 failures after updating mysql branch to master 2010-12-26 17:25:07 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Dorian
b348f094ab Test for XSS in comment 2010-12-26 02:16:53 +01:00
danielvincent
4ff9622bfc notifications now properly socket (not a hack through comments like before). notification badge updates on new messages. 2010-12-25 16:07:31 -05:00
Sarah Mei
de502bf67c Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec. 2010-12-24 18:39:20 -08:00
Sarah Mei
a1ea193fb9 Methods to generate jasmine fixtures in controller specs, and methods to load those fixtures in jasmine specs. 2010-12-24 16:08:45 -08:00
Michael Sofaer and Raphael Sofaer
7175200779 Fix a spec, need to move to a computer with firefox. 2010-12-24 15:17:24 -08:00
Sarah Mei
9c50f900ed Merry Christmas! I got you someting green. 
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
 2010-12-24 14:14:24 -08:00
Michael Sofaer and Raphael Sofaer
30d60021f4 11 Controller specs remain in mysql. ALMOST DONE 2010-12-24 14:12:55 -08:00
Sarah Mei
5ae16c15a3 Fix bug in :pod_uri generation. 2010-12-24 13:00:06 -08:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
Michael Sofaer and Raphael Sofaer
82b226712f Posting spec green 2010-12-24 09:58:11 -08:00
Dorian
5cbccda33a Spec for not allowing user to do the XSS 2010-12-24 15:49:26 +01:00
Michael Sofaer and Raphael Sofaer
331e6645c6 Just don't use count with select DISTINCT 2010-12-24 00:31:36 -08:00
Michael Sofaer and Raphael Sofaer
426651d827 Fixed a few more specs, having trouble getting AR to return the count of distinct (once for all aspects a post is visible in) posts a user can see 2010-12-24 00:23:37 -08:00
Michael Sofaer and Raphael Sofaer
22a5832c01 Fix retraction related failures in mysql 2010-12-23 23:04:04 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342 Status message spec now passes 2010-12-23 12:56:49 -08:00
Sarah Mei
2b7eeffd5b Fix searching in mysql. It now does one query for all tokens. And person_spec is green! 2010-12-22 22:24:04 -08:00
Raphael
924bcca0e2 Isolated problem in status message marshalling, mysql 2010-12-22 21:34:45 -08:00
Raphael
d01fbeac04 33 failures left in mysql 2010-12-22 16:37:41 -08:00
Raphael
55492535c6 Fix some more specs, aspects controller is green in mysql 2010-12-22 14:15:45 -08:00
Raphael
baf0533466 logical failures on person spec, 25 failing model specs 2010-12-21 18:59:28 -08:00
Raphael
cbda6b8c58 58 failures with mysql 2010-12-21 17:14:52 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -08:00
danielvincent
a1f3ab3046 mark requests as read when a user responds to the request 2010-12-21 10:31:18 -08:00
Raphael
659dfd36ed Querying spec passes, 63 model spec failures 2010-12-20 18:49:07 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
Raphael
049670654e Connecting spec passes with mysql 2010-12-20 14:22:44 -08:00
Raphael
dcf630fd9a Request spec passes, no more scope on requests 2010-12-20 13:59:46 -08:00
Raphael
4c47d8334c Add PostVisibility model, some more specs working 2010-12-20 13:23:05 -08:00
maxwell
e0883fb176 remove object_id for notifications thx sarahmei for pointing out my evil ways 2010-12-20 12:06:50 -08:00
maxwell
ed0e739ac3 updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with 2010-12-20 11:22:52 -08:00
Sarah Mei
c1bfbd358e Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know. 2010-12-20 02:50:38 -08:00
Raphael
d44e76a6aa Down to 250 failures in mysql 2010-12-20 00:36:48 -08:00
Raphael
51083e9659 Another 50 passes in mysql 2010-12-19 13:57:46 -08:00
Raphael
0c67e271df Services are in mysql, contact_for and add_contact_to_aspect work again 2010-12-19 13:11:41 -08:00
Raphael
232de40457 Only service hasn't been migrated, there are a good 100 passing examples in mysql 2010-12-19 12:27:32 -08:00
MrZYX
1b6f341348 made linking more robust, this fixes #732 2010-12-19 13:49:46 +01:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60 WIP moving to mysql 2010-12-18 21:16:39 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d profile_spec is passing with mysql... baby steps. 2010-12-18 18:45:55 -08:00
Raphael
36b622c998 Fix build 2010-12-18 15:22:56 -08:00
Raphael
02f745900f Get rid of youtube-title failure 2010-12-18 15:16:05 -08:00
maxwell
427cf18324 fix birthday spec 2010-12-17 19:41:42 -08:00
Raphael
a64d8943b4 Pulled in spec refactor, thanks blackxored 2010-12-17 18:49:34 -08:00
maxwell
13407f700e fix test 2010-12-17 17:25:11 -08:00
maxwell
e7cca604e6 refactored notifications 2010-12-16 17:30:35 -08:00
Raphael
5e6c14fce8 Simplify connect_users for a huge test speedup 2010-12-16 14:47:37 -08:00
danielvincent
1465024f10 skipping receive process for incoming local posts, calling receive_object directly 2010-12-16 14:39:19 -08:00
Raphael
eb56521a66 Don't query inside of loops... 2010-12-16 12:25:31 -08:00
danielvincent
f821f49db1 added similar contacts to contact pages 2010-12-16 11:49:08 -08:00
Raphael
b467d12d83 Fix spec in peoplecontroller 2010-12-16 11:37:16 -08:00
maxwell
226d95ec2c Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 19:15:26 -08:00
Raphael
837ad20045 unpend spec in aspects controller spec 2010-12-15 18:11:09 -08:00
maxwell
d5ba34f245 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 18:05:54 -08:00
Raphael
e881edab96 Fix missing partials on last commit, you can now accept a request from the requestor's profile page 2010-12-15 18:05:18 -08:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -08:00
maxwell
8ec85d3b12 basic notifications 2010-12-15 17:31:36 -08:00
Raphael
b22398951e Send requests from the aspect list on the person show page 2010-12-15 14:48:14 -08:00
Raphael
80a9b97f8d add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids 2010-12-15 14:48:14 -08:00
maxwell
9555fae33d no notifications on retractions 2010-12-15 13:14:46 -08:00
maxwell
61b2bbbd7d Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 12:28:09 -08:00
maxwell
b6754d92b7 adding basic notification class 2010-12-15 12:11:47 -08:00
maxwell
a7d36615e6 adding basic notification class 2010-12-15 12:11:37 -08:00
Dan Hansen & Sarah Mei
82e2f23f91 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-15 14:29:33 -05:00
Raphael
bd31ff3ee3 Fix request validations, build. 2010-12-15 10:48:29 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa added vimeo method, still needs support from lib/youtube_titles.rb. updated locales 2010-12-15 01:20:53 -05:00
Dan Hansen & Sarah Mei
c4a7745c88 Refactored the markdownify method. 2010-12-15 01:00:20 -05:00
danielvincent
f1ee32145d Remove pending_requests from user, just use Request.from and Request.to. 2010-12-14 19:00:03 -08:00
maxwell
0119de4afc adding task to fix users with periods 2010-12-14 18:45:10 -08:00
maxwell
6bd42874e8 adding a task to fix person object with spaces in their name 2010-12-14 17:36:27 -08:00
maxwell
d24be269f2 small refactor of admin mail. don't call deliver in the method 2010-12-14 17:36:26 -08:00
danielvincent
b1c0facfe6 initiating a request now just creates a pending contact instead of persisting a request 2010-12-14 17:11:43 -08:00
Raphael
06b7b1c99a WIP pending contacts 2010-12-14 17:11:42 -08:00
Raphael
251cdec2ec Add full request cycle cucumber feature 2010-12-14 17:11:42 -08:00
Raphael
e63a8a4bfa Take contact.person query out of the views, only query people once in hashes_for_aspects 2010-12-14 12:11:36 -08:00
maxwell
0bd13ec106 use blank instead of empty for the person#name helper 2010-12-14 11:30:06 -08:00
maxwell
42c22cedf9 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-13 14:38:47 -08:00
MrZYX
045ba7c419 Merge branch 'email-validation' of https://github.com/themasch/diaspora into themasch-email-validation 2010-12-13 22:49:50 +01:00
maxwell
502db347cc removed homepage detail into a partial, which you should redefine 2010-12-13 12:52:23 -08:00
Raphael
f861955d80 profile.image_url is set to :thumb_large in update_profile 2010-12-13 12:11:54 -08:00
Mark Schmale
4cc62ffaca added spec for email validation 2010-12-13 15:46:19 +01:00
MrZYX
1284fcc92d fix for #699 2010-12-13 15:04:11 +01:00
Sarah Mei
3eaf7c48e6 white space police 2010-12-12 13:43:01 -08:00
Sarah Mei
7cd8e0f16b Fix jasmine specs so that they fail when they're supposed to. 2010-12-12 12:57:11 -08:00
danielvincent
d19353ed8f added newline support to markdownify 2010-12-12 00:44:54 -08:00
Sarah Mei
646603ffe0 Don't show rake output when running migrations_spec 2010-12-11 12:32:33 -08:00
danielvincent
6f62161442 invitation emails stripped of whitespace from form 2010-12-10 18:10:24 -08:00
danielvincent
2c5d5d9328 show already invited users on invitation#new 2010-12-10 18:05:08 -08:00
MrZYX
0b57ccd47f fixed require 2010-12-10 21:49:09 +01:00
Raphael
2c141baf78 Capitalization... 2010-12-10 12:12:34 -08:00
Raphael
4bb9370c5d Correctly stub the websocket redis method 2010-12-10 11:53:18 -08:00
maxwell
076d0e5edd Merge branch 'master' of github.com:diaspora/diaspora 2010-12-10 11:47:20 -08:00
maxwell
c774685d52 users can now disable email notfications 2010-12-10 11:47:10 -08:00
Raphael
0e77577fbd Websocket now uses redis 2010-12-10 11:25:38 -08:00
MrZYX
36043845ca fixed requires for ruby 1.9 2010-12-10 17:25:02 +01:00
Alec Leamas
eacee54846 Replace APP_CONFIG[:terse_pod_url] with uri object. 
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.

The pod_url is normalized using module URI's functions, always with a
trailing /.

The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
 2010-12-10 14:29:19 +01:00
Raphael
fc73c02c3a Fix hashes_for_person spec 2010-12-09 20:01:37 -08:00
maxwell
dfbc01ca7a added a test for the converter rake task 2010-12-09 19:29:25 -08:00
maxwell
bf56364019 tests for post to services resque job 2010-12-09 19:29:25 -08:00
maxwell
d81aa7dfe1 added specs for push_to_services, also rename the socket webfinger job spec because since it did not end with '_spec' it was not getting run 2010-12-09 19:29:25 -08:00
maxwell
a4336a8e72 moar tests for services 2010-12-09 19:29:25 -08:00
maxwell
041e747db6 MSSM services are now broken out into seperate classes, and we cleaned up posting to them 2010-12-09 19:29:25 -08:00
Raphael
2be0666d80 Remove query from aspects manage, correct spec in User spec 2010-12-09 19:11:47 -08:00
Raphael
e406426b81 select only profile on most Person queries 2010-12-09 15:04:40 -08:00
maxwell
13740da9b9 fix for people controller where Person.search was returning a non-deterministic order of people 2010-12-09 14:37:07 -08:00
Raphael
3a4caca397 Fix photo uploading in profile photos, style photo upload button better 2010-12-09 13:06:31 -08:00
Raphael
b8589c457d Refactor people edit page, now using form_tag 2010-12-09 13:03:30 -08:00
zhitomirskiyi
23d2a92bf1 pushing the profile to to all the contacts 2010-12-09 11:51:35 -08:00
danielvincent
46793179db people#show displays shows public posts for non-contacts as well 2010-12-08 16:53:24 -08:00
danielvincent
b94e6ae4a0 shift+enter submits new messages/comments 2010-12-07 21:30:29 -08:00
Raphael
18319f8e42 Hopefully cut down the stream rendering time by memoizing the new comment form 2010-12-07 09:28:11 -08:00
Raphael
f421f1327c Take nested queried out of aspects manage 2010-12-07 00:21:05 -08:00
Raphael
9442553504 Refactor aspectscontroller and aspect_contacts.haml 2010-12-06 17:20:21 -08:00
Raphael
8a19e9f961 Fix spec 2010-12-06 13:56:40 -08:00
Raphael
32a2264af5 Refactor peoplecontroller index 2010-12-06 13:36:20 -08:00
maxwell
97c1ce54c1 fixed the batch emailer tests... sorry it took me so long 2010-12-06 10:56:04 -08:00
Raphael
3ef5ac5252 Add some specs to Invitation, use I18n in InvitationsController 2010-12-05 14:37:43 -08:00
danielvincent
e9742acc32 reverting http_post to a working state 2010-12-05 02:08:29 -08:00
danielvincent
d7407b7aa6 request -> resource 2010-12-05 02:03:03 -08:00
danielvincent
737e6084df actually setting the timeout in restclient 2010-12-05 01:54:16 -08:00
Sarah Mei
ecc537c737 Stub Jobs::ReceiveSalmon.perform in controller test 2010-12-05 01:31:19 -08:00
maxwell
65c22020e8 fixing photo controllers spec 2010-12-05 00:45:13 -08:00
maxwell
2c09c35425 MS DG photos now delete sm if they are empty status messages, and status messages delete their photos 2010-12-05 00:45:13 -08:00
maxwell
a415ff5c5f fixed the build. made photos dependent destroy with parent status message 2010-12-05 00:45:13 -08:00
Raphael
36e1fb8b2c Fix a couple local-posting specs 2010-12-04 23:38:31 -08:00
Raphael
c99796f5db Extra spec on find_for_authentication 2010-12-04 23:15:22 -08:00
maxwell
03a5514400 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 23:06:58 -08:00
Raphael
61e40debb5 Fix in find_for_authentication 2010-12-04 22:25:28 -08:00
maxwell
fb310560df Merge branch 'master' of github.com:diaspora/diaspora 2010-12-04 19:37:47 -08:00
Michael Sofaer
9e575ea765 MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues 2010-12-04 19:36:22 -08:00
danielvincent
4c4f5c6aa4 dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND. 2010-12-04 19:36:22 -08:00
maxwell
b56b2fbd1b added spec for periods in usernames; unpendify a couple of specs 2010-12-04 19:33:58 -08:00
Sarah Mei
c9f7866955 Random extra spec for people_controller 2010-12-04 18:13:15 -08:00
Michael Sofaer
3ca89bde57 Put photos create spec back in. I am not going to check who left it pending. 2010-12-04 17:18:08 -08:00
danielvincent
d1ad2efed1 HttpPost job now follows redirects 2010-12-04 15:23:54 -08:00
danielvincent
177cc16e2f fixed the build 2010-12-04 14:26:13 -08:00
OhaiBBQ
ba23bd7a0a Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs 2010-12-04 11:54:59 +03:00
maxwell
7dce94814c fixing the invite user job 2010-12-03 22:41:16 -08:00
Sarah Mei
713c98ce51 don't require redis for cucumber 2010-12-03 20:49:41 -08:00
maxwell
0a831cfbf4 invites are now on the queue 2010-12-03 19:33:54 -08:00
danielvincent
f9e4a744a5 put spec helper methods in spec_helper 2010-12-03 15:50:17 -08:00
danielvincent
a7823485c7 made http calls synchronous. messagehandler enqueues POSTs into resque. 2010-12-03 15:26:52 -08:00
danielvincent
71cae6b89f Move request mail into resque 2010-12-03 11:51:04 -08:00
maxwell
c43077d318 fixed twitter, added logging for constants, added job for local recieve 2010-12-03 11:34:42 -08:00
MrZYX
acc8803cee try at fixing specs for ruby 1.9, SystemTimer isn't needed anymore for 1.9 2010-12-03 16:33:28 +01:00
Raphael
3ee246d873 Merge branch 'resque-receive' 
Conflicts:
	Gemfile.lock
 2010-12-02 19:42:05 -08:00
maxwell
579a288351 public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable 2010-12-02 18:48:50 -08:00
maxwell
38d9d75162 posts now have public permalinks 2010-12-02 18:47:48 -08:00
danielvincent
756824d072 removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec. 2010-12-02 18:42:21 -08:00
danielvincent
6c05d01177 enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index. 2010-12-02 17:36:46 -08:00
Raphael
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
Raphael
c76f38ca23 Write webfinger job for search 2010-12-02 12:35:26 -08:00
Raphael
6cfa6577a5 Add first resque job 2010-12-02 12:35:26 -08:00
Raphael
cee5e4c26e Bring in resque recipes and rake tasks 2010-12-02 12:35:26 -08:00
Raphael
db0106f13c Rename EMWebfinger to Webfinger, clean up some related things 2010-12-02 12:35:25 -08:00
maxwell
be00a2f1b3 webfingering is now syncrounous 2010-12-02 12:35:25 -08:00
maxwell
9aa093a0a3 api compatabile, but ugly 2010-12-02 12:35:25 -08:00
maxwell
119599bfeb Revert "Commented-on posts bubble up to the top" 
This reverts commit 6da410079b.
 2010-12-02 09:51:26 -08:00
MrZYX
c3356af8d1 mardownify doesn't strip _/__/*/** without context anymore and allow __/** to be escaped with \__/\** instead of \_\_/\*\*. probably makes it less robust against weired constructs though 2010-12-02 13:54:39 +01:00
Sarah Mei
1f789e5f2b typeof regex implemented inconsistently across browsers...sigh 2010-12-01 23:08:57 -08:00
Sarah Mei
c7b1fcc806 Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master 2010-12-01 22:53:58 -08:00
Sarah Mei
ef89d49b1a Revert "Added some specs for grammatical_gender (User model and Users controller)." 
This reverts commit 1295417224.
 2010-12-01 22:29:19 -08:00
Dan Hansen
f81dc0fed6 remove empty specs 2010-12-01 21:25:58 -08:00
root
5d31a24e9e fixed spec, jquery event binding doesnt call the function itself, but a 'clone' of the function 2010-12-02 02:54:38 +03:00
Raphael
6da410079b Commented-on posts bubble up to the top 2010-12-01 15:38:56 -08:00
Raphael
8d853a88a3 Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
Raphael
f0df1ec8df Remove dev utilities controller 2010-12-01 15:38:56 -08:00
Raphael
c07b9b1874 Fix rest of specs 2010-12-01 15:38:56 -08:00
Raphael
199eb8945d clean up posting spec, move socket_to_uid into add_to_streams 2010-12-01 15:38:56 -08:00
Raphael
836b5685f7 Change prune_aspect_ids to aspects_from_ids, seperate out non-backgroundable piece of posting from dispatch_post 2010-12-01 15:38:56 -08:00
Raphael
e63a29be64 Change v_aspect_ids to prune_aspect_ids 2010-12-01 15:38:55 -08:00
root
5cd0a60073 Moved to it's own file, added specs 2010-12-02 02:22:05 +03:00
maxwell
75caecc6a3 reset to local to english in tests 2010-12-01 12:16:21 -08:00
maxwell
7fc9d239b9 you can no longer send a request to yourself at the Request model level 2010-12-01 11:37:54 -08:00
Raphael
ef083c6770 Merge branch 'master' of github.com:diaspora/diaspora 2010-12-01 11:21:36 -08:00
Raphael
5791ffba79 Add administrative mail method 2010-12-01 11:20:10 -08:00
Hexagon
5651ea1d33 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations 2010-12-01 19:13:39 +01:00
Paweł Wilk
1295417224 Added some specs for grammatical_gender (User model and Users controller). 2010-12-01 18:19:48 +01:00
Josh Lubaway
ecd1d2ecd6 Bug #624 Can't unset birthday 
This change allows users to "unset" their birthday.

Previously the logic checked to see if all values for birthday were
present (year, month, day). If all values were present the update
would proceed.

Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
 2010-11-30 21:23:47 -08:00
Dan Hansen & Sarah Mei
b2f4e064fc stream.js now semi-split into functions (still needs work); specs for toggling comments 2010-11-30 16:24:11 -08:00
Raphael
a520c756ea Fix spec 2010-11-30 16:02:14 -08:00
danielvincent
601284a171 make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo. 2010-11-30 15:58:26 -08:00
maxwell
c5f71184be profile now knows about three images sizes, even in federation case 2010-11-30 15:58:25 -08:00
Hexagon
160198c152 Added rake task to check pod_url and terse_pod_url 2010-11-30 15:58:25 -08:00
maxwell
fdbc7dff86 profile now knows about three images sizes, even in federation case 2010-11-30 15:56:43 -08:00
Hexagon
b15032de39 Added rake task to check pod_url and terse_pod_url 2010-11-30 15:56:43 -08:00
Raphael
366734ca5e Take queries out of aspect contacts pane on home page 2010-11-30 15:35:32 -08:00
Raphael
57485e7093 Move aspect contacts pane js to public 2010-11-30 13:55:37 -08:00
maxwell
ec05c21472 profile now knows about three images sizes, even in federation case 2010-11-30 13:40:41 -08:00
Hexagon
ec5145777e Added rake task to check pod_url and terse_pod_url 2010-11-30 13:32:46 -08:00
Hexagon
c98f6f21c8 config spec now makes sense 2010-11-30 22:27:19 +01:00
danielvincent
185e84537e fixed build 2010-11-30 13:19:25 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
Hexagon
4fa3e801a8 Added rake task to check pod_url and terse_pod_url 2010-11-30 20:48:55 +01:00
Raphael
fcb0e07dd7 Stop regenerating fixtures on every spec run 2010-11-29 23:22:49 -08:00
Hexagon
7d2b46c7c0 public helper spec superfluous, fixing build 2010-11-30 00:17:01 +01:00
Raphael
e86a5563ed Override request started log line 2010-11-29 14:03:29 -08:00
maxwell
bf79d62317 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-29 13:41:38 -08:00
maxwell
4ef7c4d6d1 make the build pass (we no longer socket photos at all) and also more test fixing around request. we were saving requests to early in the cycle, most likely cruft before it was refactored. 2010-11-29 13:39:48 -08:00
Raphael
eccc25e20a Add pending specs for log_overrider... hit a wall when I wanted more information than is being passed to ActiveSupport::Notifier 2010-11-29 13:14:27 -08:00
danielvincent
2c22941e2f fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show. 2010-11-28 20:16:57 -05:00
Sarah Mei
5ae8a06016 unpendingify comment specs 2010-11-28 17:16:22 -08:00
danielvincent
c35be73978 added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive) 2010-11-28 18:51:27 -05:00
danielvincent
05174436c0 comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner). 2010-11-28 18:51:27 -05:00
danielvincent
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
Raphael
845e1fe7a3 Fix comments ajax response 2010-11-28 01:31:05 -05:00
Raphael
4e15745170 Add spec to comment 2010-11-28 00:55:20 -05:00
Raphael
cbe98a1479 Add spec to commentscontroller 2010-11-28 00:39:23 -05:00
Raphael
703e8e0426 Add spec for js requests on stmc create 2010-11-28 00:36:05 -05:00
Raphael
6d6b07fb92 Use form_tag, not form_for, in _new_comment 2010-11-27 23:24:29 -05:00
danielvincent
f59c6e2427 refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now. 2010-11-27 23:06:34 -05:00
Raphael
d2bfffca92 Fix PeopleController, add specs 2010-11-27 21:46:07 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
danielvincent
64f7a20ff4 fixed specs, took out that nasty raise. 2010-11-27 16:20:46 -05:00
maxwell
c65c62906c pushing so dan can look at how to stub EM:next_tick correctly 2010-11-27 16:20:46 -05:00
Raphael
7030ed0fed Putting youtube titles back into status messages 2010-11-27 11:43:24 -05:00
Raphael
d5d4a08f03 Start moving youtube title getting into the post/comment flow 2010-11-27 01:00:47 -05:00
Raphael
fef6d84f4b markdownify performance spec 2010-11-26 22:16:33 -05:00
Raphael
d81db97054 take out request routed 2010-11-26 21:15:03 -05:00
Raphael
0fa93706a6 Make request completed log line complete 2010-11-26 21:15:02 -05:00
Raphael
e09b544f26 Add specs to log overrider 2010-11-26 21:15:02 -05:00
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -05:00
Raphael
fb85ffe406 Adding specs for log_overrider 2010-11-26 18:38:08 -05:00
Sarah Mei
abae16472d pagination works on aspects#show 2010-11-26 13:09:05 -08:00
Sarah Mei
f8229d07e8 Adding copyright to js files 2010-11-26 12:16:10 -08:00
Michael Sofaer and Raphael Sofaer
b54164cef8 Don't do expensive things on invalid users 2010-11-26 11:55:54 -05:00
Dan Hansen & Sarah Mei
257d6f414a Top-level Diaspora object for js widget management 2010-11-25 22:24:25 -08:00
danielvincent
417301088f fixed build 2010-11-26 00:56:53 -05:00
danielvincent
94d08954d9 401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation. 2010-11-26 00:19:19 -05:00
Dan Hansen & Sarah Mei
5075a7384b allow hyphens in YouTube video IDs 2010-11-25 21:05:54 -08:00
Raphael
690951dcd1 Take a query out of the views 2010-11-25 23:53:45 -05:00
Raphael
33ba00377e Add performance spec 2010-11-25 23:53:45 -05:00
Dan Hansen & Sarah Mei
eb314aa300 Fix application helper specs around youtube links 2010-11-25 16:29:30 -08:00
Sarah Mei
ef2fa21d06 person_image_link and object_path return empty strings if parameter is nil. 2010-11-25 12:26:46 -08:00
Sarah Mei
050918a310 Added link to manage aspects page from sidebar. 
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
 2010-11-25 10:29:35 -08:00
Sarah Mei
287b79ab17 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-24 22:09:25 -08:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
Raphael
08ba387311 More sane redirect on failing to accept an invitation 2010-11-25 00:39:13 -05:00
Raphael
a85f47041a This file is generated by rake fixtures:users 2010-11-24 14:07:00 -05:00
zhitomirskiyi
9ca54a2282 accepting an invitation correctly adds the request to the user 2010-11-23 18:58:26 -08:00
zhitomirskiyi
a9b503b65e made the dev. util things pending 2010-11-23 15:49:50 -08:00
zhitomirskiyi
3f737116d6 since there is only one person with that name in the db, it returns a redirect 2010-11-23 11:02:17 -08:00
zhitomirskiyi
ebaf2c081e returning nothing on empty query and limit the returning of the query to 90 2010-11-23 10:02:01 -08:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
maxwell
709e348457 Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/fixtures/users.yaml
 2010-11-23 00:15:26 -08:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
maxwell
7c09117230 fixing build 2010-11-22 19:05:35 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar" 
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
 2010-11-22 17:11:34 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
zhitomirskiyi
7df35ade12 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 12:24:34 -08:00
zhitomirskiyi
1519fd46bf Sending a request to someone who requested you autoaccepts the request 2010-11-22 12:21:26 -08:00
danielvincent
857a4b5f11 photo large is now at 300px. a person's profile photo now references the larger size instead of medium. 2010-11-22 10:32:14 -08:00
danielvincent
9a18b7e6f3 photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level. 2010-11-22 00:32:46 -08:00
danielvincent
c841a47a37 status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE. 2010-11-21 23:42:49 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
bd0c21a634 button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test. 2010-11-21 16:30:46 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
maxwell
4ce337bbed display a users username in the final step 2010-11-21 16:13:02 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
danielvincent
242d0ab9c5 a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box. 2010-11-21 16:11:55 -08:00
Raphael
b991df9d3a WSR spec working 2010-11-21 16:19:25 -05:00
Raphael
6f0d008914 Move WebSocketReceiver out to a js file 2010-11-21 16:14:36 -05:00
Raphael
0daffb7fed Add a couple specs, refactor in connecting 2010-11-21 14:09:39 -05:00
Raphael
4ce2de55e2 Fix photo show, js on people search page 2010-11-21 13:29:50 -05:00
zhitomirskiyi
3d5cf8f625 added a panding cross path request spec 2010-11-19 18:53:46 -08:00
Raphael
655e92ebdd Add some scopes for Request, take putses out of specs 2010-11-18 18:04:29 -08:00
zhitomirskiyi
c2dcf9a074 fixed the invite spec 2010-11-18 16:55:44 -08:00
zhitomirskiyi
d0d261fdae zero default invites, the rake task starts people with 5 invites 2010-11-18 16:23:35 -08:00
maxwell
c0d10ef174 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-18 15:36:47 -08:00
maxwell
747ab761a0 pushing mailer spec for ilya 2010-11-18 15:36:30 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -08:00
Raphael
61692c1da6 Fix translation missing in inv mailer 2010-11-18 12:50:46 -08:00
Raphael
be55384628 Add pending spec to invitations 2010-11-18 11:21:35 -08:00
maxwell
9882fa183d Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 23:19:27 -08:00
maxwell
2ffd2d93e3 made mailchimp form ssl 2010-11-17 23:19:12 -08:00
Sarah Mei
64237534fd Merge branch 'master' of github.com:diaspora/diaspora 2010-11-17 22:31:21 -08:00
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
maxwell
f01fca1877 letting jammit do its default thing 2010-11-17 22:18:15 -08:00
danielvincent
1a9041a3c0 DG MS; fixed cucumber tests to work with new landing page flow 2010-11-17 19:49:01 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
maxwell
2c627cdb2b updating jas 2010-11-17 00:16:11 -08:00
maxwell
f81bb1d7e7 i broke the jasmine tests. this is me fixin them 2010-11-16 22:02:18 -08:00
Raphael
2d347ec36d Delete an accepted friend request 2010-11-16 16:47:06 -08:00
Raphael
f3a301d314 Don't expect raises in request specs, redirect to :back on all requesting 2010-11-16 16:18:16 -08:00
Raphael
538c6ce4b9 Take handle validations out of em-webfinger 2010-11-16 16:18:16 -08:00
Raphael
7876da8fb8 Refactor raises in requesting to validations in request, move to better controller structure 2010-11-16 16:18:16 -08:00
Sarah Mei
44bd4534ce I found where we needed the one-line addition. Ruby 1.9 build now works. 
I feel pretty badass.
 2010-11-15 22:44:55 -08:00
Sarah Mei
2cf4350fab Clean up unused variable 2010-11-15 22:42:09 -08:00
Sarah Mei
686cea6595 1.9.2 doesn't like friending people when the target doesn't have any aspects. ::sigh:: And with that, I fix the cucumber feature that was failing under 1.9. 2010-11-15 21:52:02 -08:00
Sarah Mei
9fa47c9bfa Fix a failing spec under 1.9 in receive_spec 2010-11-15 21:19:21 -08:00
Raphael
248e768846 search now sockets a person 2010-11-15 19:13:45 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Raphael
70bcab3abc adding a couple specs to invitation_spec 2010-11-15 16:34:59 -08:00
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Sarah Mei
23c1ac4936 Cucumber feature for managing contact requests 2010-11-14 21:49:56 -08:00
Sarah Mei
45e47513c2 AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly 2010-11-14 21:49:36 -08:00
Sarah Mei
830a43ec2f Add destroy specs for RequestsController. 
Cucumber feature for contact requests.
 2010-11-14 09:43:28 -08:00
Raphael
2ad74d397c fix build 2010-11-13 19:05:12 -08:00
danielvincent
86470dc15b jasmine references move_contact instead of move_friend 2010-11-12 20:39:49 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
danielvincent
a21af7cac6 friend_users -> connect_users in helper_methods 2010-11-12 20:22:54 -08:00
Sarah Mei
6c439608f0 started specs for AspectEdit.deletePersonFromAspect 2010-11-12 17:04:15 -06:00
Sarah Mei
9586ebb67e specs for AspectEdit.onMovePersonSuccess 2010-11-12 16:44:22 -06:00
Sarah Mei
737c812e08 Specs for AspectEdit.onDeleteRequestSuccess 2010-11-12 16:38:02 -06:00
Sarah Mei
506d13335a Finally have complete specs for AspectEdit.onDropMove. 2010-11-12 16:05:17 -06:00
Sarah Mei
b77547e940 Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend 2010-11-12 14:51:16 -06:00
Raphael
1e842f1a88 Render mail css as a partial, fix spec 2010-11-12 12:26:34 -08:00
Raphael
a4d7b25bac Merge branch 'master' of github.com:diaspora/diaspora 2010-11-12 11:54:19 -08:00
Raphael
ae9f4ab969 Refactor mail views, add a spec to make sure CSS is rendered 2010-11-12 11:47:59 -08:00
Sarah Mei
feec6d971d More specs for aspect edit JS 2010-11-12 13:40:23 -06:00
Raphael
8232a92ca0 Update _person and person show, add specs for those pages 2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb AspectsController#manage now works if you have pending friend requests. 2010-11-10 12:05:28 -07:00
Sarah Mei
c113ee2b7c Finish specs for AspectEdit#stopDrag. 2010-11-10 10:54:12 -07:00
Sarah Mei
72bf683c87 Renaming publisher_spec to publisher-spec since js likes dashes. Fix typo in spec. 2010-11-10 10:53:23 -07:00
maxwell
4037ae9f33 fixing controller test 2010-11-09 16:55:54 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
Raphael
390fffdee6 Fix new request view 2010-11-09 15:03:56 -08:00
Raphael
98fe1d357b accept_friend_request no longer takes ids 2010-11-09 14:15:02 -08:00
Raphael
bfa0917ce4 add a couple specs 2010-11-09 14:07:26 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
Raphael
ae28a6f70c Don't pluralize in model spec name 2010-11-09 14:07:26 -08:00
Raphael
4818973643 Beginning to refactor invitations into an Invitation class 2010-11-09 14:07:26 -08:00
Raphael
71ab919ad3 Remove urls from requests, invitations are broken 2010-11-09 14:07:26 -08:00
Sarah Mei
16e2ccc614 Specs for aspect edit during and stop drag. 2010-11-09 06:53:55 -08:00
Sarah Mei
16ea7a321b specs for AspectEdit#animateImage 2010-11-08 21:19:49 -08:00
zhitomirskiyi
77fe7a1462 Revert "IZ local comment destroy" 
This reverts commit cb9fb0ad94.
 2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94 IZ local comment destroy 2010-11-08 18:19:55 -08:00
maxwell
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90 trying another thing to get the redirect working 2010-11-08 16:30:46 -08:00
maxwell
52908cec1a services controller should now go back to the referer. this might not actually work 2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -08:00
zhitomirskiyi
7d39f8ae5f Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:36:11 -08:00
zhitomirskiyi
a6dff4f78e removing the posts from the aspect on unfriending 2010-11-08 15:35:37 -08:00
Raphael
70af10ee62 user#friends is now a many-foreign_key assoc, rather than a many-in 2010-11-08 15:19:23 -08:00
zhitomirskiyi
cbabc547a2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032 the profile cannot massassign diaspora handle 2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
Sarah Mei
1a4fa2713a More specs for aspect-edit.js. Initialize now fully covered. 
Also, bundler upgraded our cucumber and rspec.
 2010-11-07 16:58:51 -08:00
Sarah Mei
32d953f457 Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor. 2010-11-06 16:50:07 -07:00
maxwell
e4f8f558a0 aspects now have a max length of 20 characters 2010-11-05 17:18:20 -07:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
Raphael
0ce37bbfa8 Remove some extra receives in tests 2010-11-05 14:15:40 -07:00
maxwell
cc92f61583 mailer queue now works 2010-11-05 11:58:25 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
Raphael
693847480b Take out notifier stubbing, it's in test mode. 2010-11-05 11:31:52 -07:00
Raphael
c69e2b8900 rename spec file 2010-11-05 11:26:49 -07:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered. 
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
 2010-11-04 22:51:30 -07:00
Raphael
4eba0595f9 Fix 328 profile images dying, thanks to theBernd 2010-11-04 18:46:15 -07:00
Raphael
f6d899f1d9 Move prep_image_url into profile image_url setter 2010-11-04 18:46:15 -07:00
danielvincent
f4dba54ff3 posting to a person with a user on the same pod will send internally, skipping the http queue and encryption. 2010-11-04 15:33:16 -07:00
danielvincent
d5cc0ed6dc separating object receiving in user#receive 2010-11-04 15:33:16 -07:00
Raphael
7e568db032 Add a couple specs to user_spec 2010-11-04 15:23:58 -07:00
zhitomirskiyi
7f5b98a6cb the photo image url is now randomized 2010-11-04 14:37:08 -07:00
danielvincent
b33aa9a0fb retracting on a non existant post does not raise a permissions error. 2010-11-04 12:43:26 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
9389d99ba8 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 23:05:47 -07:00
zhitomirskiyi
a55878f2a3 invitations controller test, tnx coyote 2010-11-03 22:58:42 -07:00
Sarah Mei
dbdd6884a7 SM MS jasmine specs for aspect edit 2010-11-03 22:19:20 -07:00
zhitomirskiyi
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04:10 -07:00
zhitomirskiyi
6a6cedbc62 oops did not save the pending 2010-11-03 16:43:10 -07:00
zhitomirskiyi
8246882067 MS IZ fixed some permissions in photo controller 2010-11-03 16:42:33 -07:00
Raphael
03b272db60 Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC 2010-11-03 15:26:58 -07:00
Raphael
2eef9f7ad1 Refactor ostatus builder spec 2010-11-03 15:26:58 -07:00
zhitomirskiyi
0ac4c5b04f IZ MS refactored invites to use user.build 2010-11-03 13:16:45 -07:00
zhitomirskiyi
3578daa14e IZ MS more photo controller specs 2010-11-03 12:21:32 -07:00
zhitomirskiyi
5e9d70f88c Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 11:00:04 -07:00
zhitomirskiyi
c6e9b94f4f IZ MS moved contact_for to querying and added tests 2010-11-03 10:59:56 -07:00
maxwell
62c25057e6 adding photocontroller spec for IZ 2010-11-03 10:43:27 -07:00
maxwell
0343e7a226 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-03 00:10:11 -07:00
maxwell
545577a950 em-webfinger ssl should work 2010-11-02 19:16:08 -07:00
Raphael
d5a4de58b3 User#post is now like a future controller, Photo#instantiate no longer saves 2010-11-02 19:16:02 -07:00
Raphael
1c67211ebc Move post dispatching to dispatch_post 2010-11-02 19:16:02 -07:00
maxwell
d482334ca2 Revert "Revert "IZ MS webfinger now trys ssl first, then http"" 
This reverts commit 153265aae8.
 2010-11-02 18:59:18 -07:00
maxwell
0ecc27a935 MS IZ posts should now update 2010-11-02 18:56:00 -07:00
maxwell
4de89df4dc MS IZ setting the diaspora handle in photo instantiate 2010-11-02 18:32:02 -07:00
Raphael
ab4e3a9f7f add a couple specs to album_spec 2010-11-02 18:16:14 -07:00
danielvincent
bf12dc6bc7 fix spec 2010-11-02 17:44:13 -07:00
maxwell
153265aae8 Revert "IZ MS webfinger now trys ssl first, then http" 
This reverts commit af3247b62f.
 2010-11-02 17:37:45 -07:00